sass 3.3.0.rc.2 → 3.3.0.rc.3

data/lib/sass/script/lexer.rb

@@ -72,8 +72,7 @@ module Sass
 
       TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge(
           :const => "variable (e.g. $foo)",
-          :ident => "identifier (e.g. middle)",
-          :bool => "boolean (e.g. true, false)")
+          :ident => "identifier (e.g. middle)")
 
       # A list of operator strings ordered with longer names first
       # so that `>` and `<` don't clobber `>=` and `<=`.
@@ -90,11 +89,9 @@ module Sass
         :single_line_comment => SINGLE_LINE_COMMENT,
         :variable => /(\$)(#{IDENT})/,
         :ident => /(#{IDENT})(\()?/,
-        :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
+        :number => /(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
+        :unary_minus_number => /-(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
-        :bool => /(true|false)\b/,
-        :null => /null\b/,
-        :selector => /&/,
         :ident_op => /(#{Regexp.union(*IDENT_OP_NAMES.map do |s|
           Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")
         end)})/,
@@ -102,7 +99,6 @@ module Sass
       }
 
       class << self
-
         private
 
         def string_re(open, close)
@@ -254,9 +250,9 @@ module Sass
           return string(interp_type, true)
         end
 
-        variable || string(:double, false) || string(:single, false) || number ||
-          color || bool || null || selector || string(:uri, false) ||
-          raw(UNICODERANGE) || special_fun || special_val || ident_op || ident || op
+        variable || string(:double, false) || string(:single, false) || number || color ||
+          string(:uri, false) || raw(UNICODERANGE) || special_fun || special_val || ident_op ||
+          ident || op
       end
 
       def variable
@@ -292,10 +288,29 @@ module Sass
       end
 
       def number
-        return unless scan(REGULAR_EXPRESSIONS[:number])
-        value = @scanner[2] ? @scanner[2].to_f : @scanner[3].to_i
-        value = -value if @scanner[1]
-        script_number = Script::Value::Number.new(value, Array(@scanner[4]))
+        # Handling unary minus is complicated by the fact that whitespace is an
+        # operator in SassScript. We want "1-2" to be parsed as "1 - 2", but we
+        # want "1 -2" to be parsed as "1 (-2)". To accomplish this, we only
+        # parse a unary minus as part of a number literal if there's whitespace
+        # before and not after it. Cases like "(-2)" are handled by the unary
+        # minus logic in the parser instead.
+        if @scanner.peek(1) == '-'
+          return if @scanner.pos == 0
+          @scanner.pos -= 1
+          # Don't use @scanner.scan so we don't mess up the match data.
+          unary_minus_allowed = @scanner.peek(1) =~ /\s/
+          @scanner.pos += 1
+
+          return unless unary_minus_allowed
+          return unless scan(REGULAR_EXPRESSIONS[:unary_minus_number])
+          minus = true
+        else
+          return unless scan(REGULAR_EXPRESSIONS[:number])
+          minus = false
+        end
+
+        value = (@scanner[1] ? @scanner[1].to_f : @scanner[2].to_i) * (minus ? -1 : 1)
+        script_number = Script::Value::Number.new(value, Array(@scanner[3]))
         [:number, script_number]
       end
 
@@ -309,27 +324,6 @@ MESSAGE
         [:color, script_color]
       end
 
-      def bool
-        s = scan(REGULAR_EXPRESSIONS[:bool])
-        return unless s
-        script_bool = Script::Value::Bool.new(s == 'true')
-        [:bool, script_bool]
-      end
-
-      def null
-        return unless scan(REGULAR_EXPRESSIONS[:null])
-        script_null = Script::Value::Null.new
-        [:null, script_null]
-      end
-
-      def selector
-        start_pos = source_position
-        return unless scan(REGULAR_EXPRESSIONS[:selector])
-        script_selector = Script::Tree::Selector.new
-        script_selector.source_range = range(start_pos)
-        [:selector, script_selector]
-      end
-
       def special_fun
         str1 = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
         return unless str1

data/lib/sass/script/parser.rb

@@ -382,9 +382,16 @@ RUBY
 
         name = @lexer.next
         if (color = Sass::Script::Value::Color::COLOR_NAMES[name.value.downcase])
-          return literal_node(Sass::Script::Value::Color.new(color), name.source_range)
+          literal_node(Sass::Script::Value::Color.new(color), name.source_range)
+        elsif name.value == "true"
+          literal_node(Sass::Script::Value::Bool.new(true), name.source_range)
+        elsif name.value == "false"
+          literal_node(Sass::Script::Value::Bool.new(false), name.source_range)
+        elsif name.value == "null"
+          literal_node(Sass::Script::Value::Null.new, name.source_range)
+        else
+          literal_node(Sass::Script::Value::String.new(name.value, :identifier), name.source_range)
         end
-        literal_node(Script::Value::String.new(name.value, :identifier), name.source_range)
       end
 
       def funcall
@@ -543,7 +550,7 @@ RUBY
       end
 
       def literal
-        t = try_toks(:color, :bool, :null)
+        t = try_tok(:color)
         return literal_node(t.value, t.source_range) if t
       end
 

data/lib/sass/script/tree.rb

@@ -13,4 +13,3 @@ require 'sass/script/tree/string_interpolation'
 require 'sass/script/tree/literal'
 require 'sass/script/tree/list_literal'
 require 'sass/script/tree/map_literal'
-require 'sass/script/tree/selector'

data/lib/sass/script/tree/funcall.rb

@@ -20,7 +20,7 @@ module Sass::Script::Tree
 
     # The keyword arguments to the function.
     #
-    # @return [{String => Node}]
+    # @return [Sass::Util::NormalizedMap<Node>]
     attr_reader :keywords
 
     # The first splat argument for this function, if one exists.
@@ -128,7 +128,7 @@ module Sass::Script::Tree
       splat = Sass::Tree::Visitors::Perform.perform_splat(
         @splat, keywords, @kwarg_splat, environment)
       if (fn = environment.function(@name))
-        return perform_sass_fn(fn, args, splat, environment)
+        return without_original(perform_sass_fn(fn, args, splat, environment))
       end
 
       args = construct_ruby_args(ruby_name, args, splat, environment)
@@ -136,8 +136,9 @@ module Sass::Script::Tree
       if Sass::Script::Functions.callable?(ruby_name)
         local_environment = Sass::Environment.new(environment.global_env, environment.options)
         local_environment.caller = Sass::ReadOnlyEnvironment.new(environment, environment.options)
-        opts(Sass::Script::Functions::EvaluationContext.new(
+        result = opts(Sass::Script::Functions::EvaluationContext.new(
           local_environment).send(ruby_name, *args))
+        without_original(result)
       else
         opts(to_literal(args))
       end
@@ -173,6 +174,13 @@ module Sass::Script::Tree
       @signature ||= Sass::Script::Functions.signature(name.to_sym, @args.size, @keywords.size)
     end
 
+    def without_original(value)
+      return value unless value.is_a?(Sass::Script::Value::Number)
+      value = value.dup
+      value.original = nil
+      value
+    end
+
     def construct_ruby_args(name, args, splat, environment)
       args += splat.to_a if splat
 
@@ -198,9 +206,16 @@ module Sass::Script::Tree
         return args
       end
 
-      args = args + (signature.args[args.size..-1] || []).map do |argname|
+      argnames = signature.args[args.size..-1] || []
+      deprecated_argnames = (signature.deprecated && signature.deprecated[args.size..-1]) || []
+      args = args + argnames.zip(deprecated_argnames).map do |(argname, deprecated_argname)|
         if keywords.has_key?(argname)
           keywords.delete(argname)
+        elsif deprecated_argname && keywords.has_key?(deprecated_argname)
+          deprecated_argname = keywords.denormalize(deprecated_argname)
+          Sass::Util.sass_warn("DEPRECATION WARNING: The `$#{deprecated_argname}' argument for " +
+            "`#{name}()' has been renamed to `$#{argname}'.")
+          keywords.delete(deprecated_argname)
         else
           raise Sass::SyntaxError.new("Function #{name} requires an argument named $#{argname}")
         end
@@ -208,7 +223,8 @@ module Sass::Script::Tree
 
       if keywords.size > 0
         if signature.var_kwargs
-          args << keywords
+          # Don't pass a NormalizedMap to a Ruby function.
+          args << keywords.to_hash
         else
           argname = keywords.keys.sort.first
           if signature.args.include?(argname)

data/lib/sass/script/tree/list_literal.rb

@@ -44,7 +44,6 @@ module Sass::Script::Tree
       members.join(sep_str(nil))
     end
 
-
     # @see Node#deep_copy
     def deep_copy
       node = dup

data/lib/sass/script/value/arg_list.rb

@@ -14,16 +14,20 @@ module Sass::Script::Value
     # Creates a new argument list.
     #
     # @param value [Array<Value>] See \{List#value}.
-    # @param keywords [Hash<String, Value>] See \{#keywords}
+    # @param keywords [Hash<String, Value>, NormalizedMap<Value>] See \{#keywords}
     # @param separator [String] See \{List#separator}.
     def initialize(value, keywords, separator)
       super(value, separator)
-      @keywords = keywords
+      if keywords.is_a?(Sass::Util::NormalizedMap)
+        @keywords = keywords
+      else
+        @keywords = Sass::Util::NormalizedMap.new(keywords)
+      end
     end
 
     # The keyword arguments attached to this list.
     #
-    # @return [Hash<String, Value>]
+    # @return [NormalizedMap<Value>]
     def keywords
       @keywords_accessed = true
       @keywords

data/lib/sass/script/value/bool.rb

@@ -1,7 +1,6 @@
 module Sass::Script::Value
   # A SassScript object representing a boolean (true or false) value.
   class Bool < Base
-
     # The true value in SassScript.
     #
     # This is assigned before new is overridden below so that we use the default implementation.

data/lib/sass/script/value/null.rb

@@ -1,7 +1,6 @@
 module Sass::Script::Value
   # A SassScript object representing a null value.
   class Null < Base
-
     # The null value in SassScript.
     #
     # This is assigned before new is overridden below so that we use the default implementation.

data/lib/sass/script/value/number.rb

@@ -175,13 +175,9 @@ module Sass::Script::Value
     # @param other [Number] The right-hand side of the operator
     # @return [Number] This number modulo the other
     # @raise [NoMethodError] if `other` is an invalid type
-    # @raise [Sass::UnitConversionError] if `other` has any units
+    # @raise [Sass::UnitConversionError] if `other` has incompatible units
     def mod(other)
       if other.is_a?(Number)
-        unless other.unitless?
-          raise Sass::UnitConversionError.new(
-            "Cannot modulo by a number with units: #{other.inspect}.")
-        end
         operate(other, :%)
       else
         raise NoMethodError.new(nil, :mod)
@@ -388,7 +384,7 @@ module Sass::Script::Value
       end
     end
 
-    OPERATIONS = [:+, :-, :<=, :<, :>, :>=]
+    OPERATIONS = [:+, :-, :<=, :<, :>, :>=, :%]
 
     def operate(other, operation)
       this = self

data/lib/sass/scss/css_parser.rb

@@ -7,7 +7,6 @@ module Sass
     # parent references, nested selectors, and so forth.
     # It does support all the same CSS hacks as the SCSS parser, though.
     class CssParser < StaticParser
-
       private
 
       def placeholder_selector; nil; end

data/lib/sass/scss/parser.rb

@@ -5,7 +5,6 @@ module Sass
     # The parser for SCSS.
     # It parses a string of code into a tree of {Sass::Tree::Node}s.
     class Parser
-
       # Expose for the SASS parser.
       attr_accessor :offset
 
@@ -147,12 +146,12 @@ module Sass
       end
 
       def process_comment(text, node)
-        silent = text =~ %r{^//}
-        loud = !silent && text =~ %r{^/[/*]!}
+        silent = text =~ %r{\A//}
+        loud = !silent && text =~ %r{\A/[/*]!}
         line = @line - text.count("\n")
 
         if silent
-          value = [text.sub(%r{^\s*//}, '/*').gsub(%r{^\s*//}, ' *') + ' */']
+          value = [text.sub(%r{\A\s*//}, '/*').gsub(%r{^\s*//}, ' *') + ' */']
         else
           value = Sass::Engine.parse_interp(
             text, line, @scanner.pos - text.size, :filename => @filename)
@@ -375,6 +374,7 @@ module Sass
         return unless (str = tok(STRING)) || (uri = tok?(/url\(/i))
         if uri
           str = sass_script(:parse_string)
+          ss
           media = media_query_list
           ss
           return node(Tree::CssImportNode.new(str, media.to_a), start_pos)
@@ -812,7 +812,7 @@ module Sass
 
       def parent_selector
         return unless tok(/&/)
-        Selector::Parent.new
+        Selector::Parent.new(interp_ident(NAME) || [])
       end
 
       def class_selector

data/lib/sass/scss/script_lexer.rb

@@ -4,7 +4,6 @@ module Sass
     # that makes them usable by {SCSS::Parser} to parse SassScript.
     # In particular, the lexer doesn't support `!` for a variable prefix.
     module ScriptLexer
-
       private
 
       def variable

data/lib/sass/scss/script_parser.rb

@@ -6,7 +6,6 @@ module Sass
     # when there's more content in the lexer once lexing is done.
     # In addition, the parser doesn't support `!` for a variable prefix.
     module ScriptParser
-
       private
 
       # @private

data/lib/sass/selector.rb

@@ -27,9 +27,19 @@ module Sass
     # The function of this is to be replaced by the parent selector
     # in the nested hierarchy.
     class Parent < Simple
+      # The identifier following the `&`. Often empty.
+      #
+      # @return [Array<String, Sass::Script::Tree::Node>]
+      attr_reader :suffix
+
+      # @param name [Array<String, Sass::Script::Tree::Node>] See \{#suffix}
+      def initialize(suffix = [])
+        @suffix = suffix
+      end
+
       # @see Selector#to_a
       def to_a
-        ["&"]
+        ["&", *@suffix]
       end
 
       # Always raises an exception.

data/lib/sass/selector/comma_sequence.rb

@@ -37,10 +37,9 @@ module Sass
           return self
         end
 
-        CommaSequence.new(
-          super_cseq.members.map do |super_seq|
-            @members.map {|seq| seq.resolve_parent_refs(super_seq, implicit_parent)}
-          end.flatten)
+        CommaSequence.new(Sass::Util.flatten_vertically(@members.map do |seq|
+          seq.resolve_parent_refs(super_cseq, implicit_parent).members
+        end))
       end
 
       # Non-destrucively extends this selector with the extensions specified in a hash

data/lib/sass/selector/sequence.rb

@@ -43,13 +43,13 @@ module Sass
       # by replacing them with the given parent selector,
       # handling commas appropriately.
       #
-      # @param super_seq [Sequence] The parent selector sequence
+      # @param super_cseq [CommaSequence] The parent selector
       # @param implicit_parent [Boolean] Whether the the parent
       #   selector should automatically be prepended to the resolved
       #   selector if it contains no parent refs.
-      # @return [Sequence] This selector, with parent references resolved
+      # @return [CommaSequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
-      def resolve_parent_refs(super_seq, implicit_parent)
+      def resolve_parent_refs(super_cseq, implicit_parent)
         members = @members.dup
         nl = (members.first == "\n" && members.shift)
         contains_parent_ref = members.any? do |seq_or_op|
@@ -64,11 +64,15 @@ module Sass
           members += old_members
         end
 
-        Sequence.new(
-          members.map do |seq_or_op|
-            next seq_or_op unless seq_or_op.is_a?(SimpleSequence)
-            seq_or_op.resolve_parent_refs(super_seq)
+        CommaSequence.new(Sass::Util.paths(members.map do |sseq_or_op|
+          next [sseq_or_op] unless sseq_or_op.is_a?(SimpleSequence)
+          sseq_or_op.resolve_parent_refs(super_cseq).members
+        end).map do |path|
+          Sequence.new(path.map do |seq_or_op|
+            next seq_or_op unless seq_or_op.is_a?(Sequence)
+            seq_or_op.members
           end.flatten)
+        end)
       end
 
       # Non-destructively extends this selector with the extensions specified in a hash

data/lib/sass/selector/simple_sequence.rb

@@ -77,21 +77,52 @@ module Sass
       # by replacing them with the given parent selector,
       # handling commas appropriately.
       #
-      # @param super_seq [Sequence] The parent selector sequence
-      # @return [Array<SimpleSequence>] This selector, with parent references resolved.
-      #   This is an array because the parent selector is itself a {Sequence}
+      # @param super_cseq [CommaSequence] The parent selector
+      # @return [CommaSequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
-      def resolve_parent_refs(super_seq)
+      def resolve_parent_refs(super_cseq)
         # Parent selector only appears as the first selector in the sequence
-        return [self] unless @members.first.is_a?(Parent)
-
-        return super_seq.members if @members.size == 1
-        unless super_seq.members.last.is_a?(SimpleSequence)
-          raise Sass::SyntaxError.new("Invalid parent selector: " + super_seq.to_a.join)
+        unless (parent = @members.first).is_a?(Parent)
+          return CommaSequence.new([Sequence.new([self])])
         end
 
-        super_seq.members[0...-1] +
-          [SimpleSequence.new(super_seq.members.last.members + @members[1..-1], subject?)]
+        return super_cseq if @members.size == 1 && parent.suffix.empty?
+
+        CommaSequence.new(super_cseq.members.map do |super_seq|
+          unless super_seq.members.last.is_a?(SimpleSequence)
+            raise Sass::SyntaxError.new("Invalid parent selector for \"#{self}\": \"" +
+              super_seq.to_a.join + '"')
+          end
+
+          parent_sub = super_seq.members.last.members
+          unless parent.suffix.empty?
+            parent_sub = parent_sub.dup
+            parent_sub[-1] = parent_sub.last.dup
+            case parent_sub.last
+            when Sass::Selector::Class, Sass::Selector::Id, Sass::Selector::Placeholder
+              parent_sub[-1] = parent_sub.last.class.new(parent_sub.last.name + parent.suffix)
+            when Sass::Selector::Element
+              parent_sub[-1] = parent_sub.last.class.new(
+                parent_sub.last.name + parent.suffix,
+                parent_sub.last.namespace)
+            when Sass::Selector::Pseudo
+              if parent_sub.last.arg
+                raise Sass::SyntaxError.new("Invalid parent selector for \"#{self}\": \"" +
+                  super_seq.to_a.join + '"')
+              end
+              parent_sub[-1] = parent_sub.last.class.new(
+                parent_sub.last.type,
+                parent_sub.last.name + parent.suffix,
+                nil)
+            else
+              raise Sass::SyntaxError.new("Invalid parent selector for \"#{self}\": \"" +
+                super_seq.to_a.join + '"')
+            end
+          end
+
+          Sequence.new(super_seq.members[0...-1] +
+            [SimpleSequence.new(parent_sub + @members[1..-1], subject?)])
+        end)
       end
 
       # Non-destrucively extends this selector with the extensions specified in a hash