[Sass] [SCSS] Add support for @for.

lib/sass/script/lexer.rb

@@ -44,6 +44,8 @@ module Sass
         '#{' => :begin_interpolation,
         '}' => :end_interpolation,
         ';' => :semicolon,
+        '{' => :lcurly,
+        '}' => :rcurly,
       }
 
       # A list of operator strings ordered with longer names first

lib/sass/script/parser.rb

@@ -42,6 +42,20 @@ module Sass
         expr
       end
 
+      # Parses a SassScript expression,
+      # ending it when it encounters one of the givne identifier tokens.
+      #
+      # @param [#include?(String)] A set of strings that delimit the expression.
+      # @return [Script::Node] The root node of the parse tree
+      # @raise [Sass::SyntaxError] if the expression isn't valid SassScript
+      def parse_until(tokens)
+        @stop_at = tokens
+        expr = assert_expr :expr
+        assert_done
+        expr.options = @options
+        expr
+      end
+
       # Parses the argument list for a mixin include.
       #
       # @return [Array<Script::Node>] The root nodes of the arguments.
@@ -142,7 +156,10 @@ RUBY
       unary :not, :funcall
 
       def funcall
-        return paren unless name = try_tok(:ident)
+        return paren unless @lexer.peek.type == :ident
+        return if @stop_at && @stop_at.include?(@lexer.peek.value)
+
+        name = @lexer.next
         # An identifier without arguments is just a string
         unless try_tok(:lparen)
           filename = @options[:filename]

lib/sass/scss/parser.rb

@@ -36,7 +36,7 @@ module Sass
         true
       end
 
-      DIRECTIVES = Set[:mixin, :include, :debug]
+      DIRECTIVES = Set[:mixin, :include, :debug, :for]
 
       def directive
         return unless name = tok(ATRULE)
@@ -80,6 +80,23 @@ module Sass
         node(Sass::Tree::DebugNode.new(sass_script_parser.parse))
       end
 
+      def for
+        raw! '!'
+        var = tok! IDENT
+        ss
+
+        raw! 'from'
+        from = sass_script_parser.parse_until Set["to", "through"]
+        ss
+
+        @expected = '"to" or "through"'
+        exclusive = (raw('to') || raw!('through')) == 'to'
+        to = sass_script_parser.parse
+        ss
+
+        block(node(Sass::Tree::ForNode.new(var, from, to, exclusive)))
+      end
+
       def variable
         return unless raw '!'
         name = tok! IDENT