From 2443c181ef6b49cd89b39013e8ce3777e024f48a Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Sun, 15 Jun 2008 00:43:03 -0700
Subject: [PATCH 1/2] Fix a SassScript parsing bug.

---
 lib/sass/constant.rb               | 2 +-
 test/sass/results/constants.css    | 2 ++
 test/sass/templates/constants.sass | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/sass/constant.rb b/lib/sass/constant.rb
index e3233347..161cc331 100644
--- a/lib/sass/constant.rb
+++ b/lib/sass/constant.rb
@@ -129,7 +129,7 @@ module Sass
               # 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
diff --git a/test/sass/results/constants.css b/test/sass/results/constants.css
index 1aa6d919..995d799f 100644
--- a/test/sass/results/constants.css
+++ b/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; }
diff --git a/test/sass/templates/constants.sass b/test/sass/templates/constants.sass
index 6ae38b46..645da78b 100644
--- a/test/sass/templates/constants.sass
+++ b/test/sass/templates/constants.sass
@@ -95,3 +95,6 @@
     :quote = "!foo"
     :slash = \!foo
   :default = !str !important
+
+#regression
+  :a= (3 + 2) - 1

From c2ad4bd281009513f84422d6b2becfd7360e1594 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Sun, 15 Jun 2008 00:43:36 -0700
Subject: [PATCH 2/2] Get rid of a bit of useless code in SassScript parsing.

---
 lib/sass/constant.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/sass/constant.rb b/lib/sass/constant.rb
index 161cc331..f20f0feb 100644
--- a/lib/sass/constant.rb
+++ b/lib/sass/constant.rb
@@ -119,13 +119,6 @@ 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