sass 3.1.0.alpha.17 → 3.1.0.alpha.18

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.17
+3.1.0.alpha.18

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.17
+3.1.0.alpha.18

data/lib/sass/script/operation.rb

@@ -36,8 +36,8 @@ module Sass::Script
     # @see Node#to_sass
     def to_sass(opts = {})
       pred = Sass::Script::Parser.precedence_of(@operator)
-      o1 = operand_to_sass pred, @operand1, opts
-      o2 = operand_to_sass pred, @operand2, opts
+      o1 = operand_to_sass @operand1, :left, opts
+      o2 = operand_to_sass @operand2, :right, opts
       sep =
         case @operator
         when :comma; ", "
@@ -81,9 +81,14 @@ module Sass::Script
 
     private
 
-    def operand_to_sass(pred, op, opts = {})
-      return "(#{op.to_sass(opts)})" if op.is_a?(Operation) &&
-        Sass::Script::Parser.precedence_of(op.operator) < pred
+    def operand_to_sass(op, side, opts)
+      return op.to_sass(opts) unless op.is_a?(Operation)
+
+      pred = Sass::Script::Parser.precedence_of(@operator)
+      sub_pred = Sass::Script::Parser.precedence_of(op.operator)
+      assoc = Sass::Script::Parser.associative?(@operator)
+      return "(#{op.to_sass(opts)})" if sub_pred < pred ||
+        (side == :right && sub_pred == pred && !assoc)
       op.to_sass(opts)
     end
   end

data/lib/sass/script/parser.rb

@@ -130,6 +130,8 @@ module Sass
         [:times, :div, :mod],
       ]
 
+      ASSOCIATIVE = [:plus, :times]
+
       class << self
         # Returns an integer representing the precedence
         # of the given operator.
@@ -143,6 +145,13 @@ module Sass
           raise "[BUG] Unknown operator #{op}"
         end
 
+        # Returns whether or not the given operation is associative.
+        #
+        # @private
+        def associative?(op)
+          ASSOCIATIVE.include?(op)
+        end
+
         private
 
         # Defines a simple left-associative production.

data/test/sass/script_conversion_test.rb

@@ -123,6 +123,44 @@ WARN
 RUBY
   end
 
+  def self.assert_associative(op_name, sibling_name)
+    op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
+    sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
+    class_eval <<RUBY
+      def test_associative_#{op_name}_#{sibling_name} 
+        assert_renders "$foo #{op} $bar #{op} $baz"
+
+        assert_equal "$foo #{op} $bar #{op} $baz",
+          render("$foo #{op} ($bar #{op} $baz)")
+        assert_equal "$foo #{op} $bar #{op} $baz",
+          render("($foo #{op} $bar) #{op} $baz")
+
+        assert_equal "$foo #{op} $bar #{sibling} $baz",
+          render("$foo #{op} ($bar #{sibling} $baz)")
+        assert_equal "$foo #{sibling} $bar #{op} $baz",
+          render("($foo #{sibling} $bar) #{op} $baz")
+      end
+RUBY
+  end
+
+  def self.assert_non_associative(op_name, sibling_name)
+    op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
+    sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
+    class_eval <<RUBY
+      def test_non_associative_#{op_name}_#{sibling_name} 
+        assert_renders "$foo #{op} $bar #{op} $baz"
+
+        assert_renders "$foo #{op} ($bar #{op} $baz)"
+        assert_equal "$foo #{op} $bar #{op} $baz",
+          render("($foo #{op} $bar) #{op} $baz")
+
+        assert_renders "$foo #{op} ($bar #{sibling} $baz)"
+        assert_equal "$foo #{sibling} $bar #{op} $baz",
+          render("($foo #{sibling} $bar) #{op} $baz")
+      end
+RUBY
+  end
+
   test_precedence :or, :and
   test_precedence :and, :eq
   test_precedence :and, :neq
@@ -136,6 +174,18 @@ RUBY
   test_precedence :plus, :div
   test_precedence :plus, :mod
 
+  assert_associative :plus, :minus
+  assert_associative :times, :div
+  assert_associative :times, :mod
+
+  assert_non_associative :minus, :plus
+  assert_non_associative :div, :times
+  assert_non_associative :mod, :times
+  assert_non_associative :gt, :gte
+  assert_non_associative :gte, :lt
+  assert_non_associative :lt, :lte
+  assert_non_associative :lte, :gt
+
   def test_unary_op
     assert_renders "-12px"
     assert_renders '/"foo"'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.17
+  version: 3.1.0.alpha.18
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency