Merge branch 'stable'

lib/sass/constant.rb

@@ -132,17 +132,10 @@ module Sass
                 next
               end
 
-              # Is this a constant?
-              if beginning_of_token && symbol == :const
-                beginning_of_token = true
-                to_return << :const
-                next
-              end
-
               # Are we looking at an operator?
               if symbol && (symbol != :mod || str.empty?)
                 str = reset_str.call
-                beginning_of_token = true
+                beginning_of_token = symbol != :close
                 to_return << symbol
                 next
               end

test/sass/results/constants.css

@@ -12,3 +12,5 @@
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
 #const { escaped-quote: !foo; escaped-slash: !foo; default: Hello! !important; }
+
+#regression { a: 4; }

test/sass/templates/constants.sass

@@ -95,3 +95,6 @@
     :quote = "!foo"
     :slash = \!foo
   :default = !str !important
+
+#regression
+  :a= (3 + 2) - 1