cloudhead-less 1.0.13 → 1.0.16

data/Rakefile

@@ -69,7 +69,7 @@ begin
   
   task :benchmark do
     print "benchmarking... "
-    less = File.read("spec/less/big-1.0.less")
+    less = File.read("spec/less/big.less")
     start = Time.now.to_f
     Less::Engine.new(less).parse
     total = Time.now.to_f - start

data/VERSION

@@ -1 +1 @@
-1.0.13
+1.0.16

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.13"
+  s.version = "1.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-20}
+  s.date = %q{2009-07-23}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -140,6 +140,7 @@ Gem::Specification.new do |s|
      "spec/css/mixins-args.css",
      "spec/css/mixins.css",
      "spec/css/operations.css",
+     "spec/css/parens.css",
      "spec/css/rulesets.css",
      "spec/css/scope.css",
      "spec/css/selectors.css",
@@ -166,6 +167,7 @@ Gem::Specification.new do |s|
      "spec/less/mixins-args.less",
      "spec/less/mixins.less",
      "spec/less/operations.less",
+     "spec/less/parens.less",
      "spec/less/rulesets.less",
      "spec/less/scope.less",
      "spec/less/selectors.less",

data/lib/less/engine/less.tt

@@ -100,20 +100,47 @@ grammar Less
   # height: 100%;
   #
   rule declaration
-    ws name:(ident / variable) s ':' s expression s (';'/ ws &'}') ws {
+    ws name:(ident / variable) s ':' s expressions s (';'/ ws &'}') ws {
       def build env
-        env << (name.text_value =~ /^@/ ? Node::Variable : Node::Property).new(name.text_value, [])
-        expression.build env
+        env << (name.text_value =~ /^@/ ? 
+          Node::Variable : Node::Property).new(name.text_value, expressions.build(env), env)
+
       end
     # Empty rule
     } / ws ident s ':' s ';' ws
   end
   
+  rule expressions
+    expression+ {
+      def build env
+        elements.map do |e|
+          e.build(env) if e.respond_to? :build
+        end.compact
+      end
+    }
+  end
+  
   #
   # An operation or compound value
   #
   rule expression
-    entity (operator / S / WS) expression <Builder> / entity
+    s '(' s expressions s ')' s {
+      def build env
+        Node::Expression.new(['('] + expressions.build(env).flatten + [')'])
+      end
+    } / entity tail:(operator entity)* ws {
+      def build env 
+        exp = all.map do |e|
+          e.method(:build).arity.zero?? 
+            e.build : e.build(env) if e.respond_to? :build
+        end.dissolve
+        exp.is_a?(Array) ? Node::Expression.new(exp) : exp
+      end
+      
+      def all
+        [entity] + tail.elements.map {|i| [i.operator, i.entity] }.flatten.compact
+      end
+    }
   end
   
   #
@@ -125,22 +152,23 @@ grammar Less
   
   rule fonts
     font family:(s ',' s font)+ {
-      def build env
-        fonts = ([font] + family.elements.map {|f| f.font }).map do |font|
-          font.build env
-        end
-        env.identifiers.last << Node::FontFamily.new(fonts)
+      def build
+        Node::FontFamily.new(all.map(&:build))
+      end
+      
+      def all
+        [font] + family.elements.map {|f| f.font }
       end
     }
   end
   
   rule font
     [a-zA-Z] [-a-zA-Z0-9]* {
-      def build env
+      def build
         Node::Keyword.new(text_value)
       end
     } / string {
-      def build env
+      def build
         Node::String.new(text_value)
       end
     }
@@ -150,13 +178,13 @@ grammar Less
   # An identifier
   #
   rule ident
-    '-'? [-a-z0-9_]+
+    '*'? '-'? [-a-z0-9_]+
   end
   
   rule variable
     '@' [-a-zA-Z0-9_]+  {
-      def build env
-        env.identifiers.last << Node::Variable.new(text_value)
+      def build
+        Node::Variable.new(text_value)
       end
     }
   end
@@ -199,19 +227,19 @@ grammar Less
   rule accessor
     ident:(class_id / tag) '[' attr:(string / variable) ']' {
       def build env
-        env.identifiers.last << env.nearest(ident.text_value)[attr.text_value.delete(%q["'])].evaluate
+        env.nearest(ident.text_value)[attr.text_value.delete(%q["'])].evaluate
       end
     }
   end
   
   rule operator
     S [-+*/] S {
-      def build env
-        env.identifiers.last << Node::Operator.new(text_value.strip)
+      def build
+        Node::Operator.new(text_value.strip)
       end
     } / [-+*/] {
-      def build env
-        env.identifiers.last << Node::Operator.new(text_value)
+      def build
+        Node::Operator.new(text_value)
       end
     }
   end
@@ -221,16 +249,16 @@ grammar Less
   #
   rule literal
     color / (dimension / [-a-z]+) '/' dimension {
-      def build env
-        env.identifiers.last << Node::Anonymous.new(text_value)
+      def build
+        Node::Anonymous.new(text_value)
       end
     } / number unit {
-      def build env
-        env.identifiers.last << Node::Number.new(number.text_value, unit.text_value)
+      def build
+        Node::Number.new(number.text_value, unit.text_value)
       end
     } / string {
-      def build env
-        env.identifiers.last << Node::String.new(text_value)
+      def build
+        Node::String.new(text_value)
       end
     }
   end
@@ -238,8 +266,8 @@ grammar Less
   # !important
   rule important
     '!important' {
-      def build env
-        env.identifiers.last << Node::Keyword.new(text_value)
+      def build
+        Node::Keyword.new(text_value)
       end
     }
   end
@@ -249,8 +277,8 @@ grammar Less
   #
   rule keyword
     [-a-zA-Z]+ !ns {
-      def build env
-        env.identifiers.last << Node::Keyword.new(text_value)
+      def build
+        Node::Keyword.new(text_value)
       end
     }
   end
@@ -261,11 +289,11 @@ grammar Less
   rule string
     "'" content:(!"'" . )* "'" {
       def value
-        text_value[1...-1]
+        content.text_value
       end
     } / ["] content:(!["] . )* ["] {
       def value
-        text_value[1...-1]
+        content.text_value
       end
     }
   end
@@ -291,12 +319,12 @@ grammar Less
   #
   rule color
     '#' rgb {
-      def build env
-        env.identifiers.last << Node::Color.new(*rgb.build)
+      def build
+        Node::Color.new(*rgb.build)
       end
     } / fn:(('hsl'/'rgb') 'a'?) arguments {
-      def build env
-        env.identifiers.last << Node::Function.new(fn.text_value, arguments.build.flatten)
+      def build
+        Node::Function.new(fn.text_value, arguments.build.flatten)
       end
     }
   end
@@ -325,8 +353,8 @@ grammar Less
   #
   rule function
     name:([-a-zA-Z_]+) arguments {
-      def build env
-        env.identifiers.last << Node::Function.new(name.text_value, [arguments.build].flatten)
+      def build
+        Node::Function.new(name.text_value, [arguments.build].flatten)
       end
     }
   end

data/lib/less/engine/nodes/entity.rb

@@ -69,5 +69,11 @@ module Less
         self
       end
     end
+    
+    class Paren < ::String
+      def to_ruby
+        self
+      end
+    end
   end
 end

data/lib/less/engine/nodes/literal.rb

@@ -135,15 +135,15 @@ module Less
       include Literal
     end
   
-    class FontFamily < Array
+    class FontFamily
       include Literal
       
       def initialize family = []
-        super family
+        @family = family
       end
     
       def to_css
-        self.map(&:to_css) * ', '
+        @family.map(&:to_css) * ', '
       end
     end
   

data/lib/less/engine/nodes/property.rb

@@ -5,14 +5,23 @@ module Less
       
       attr_accessor :value
       
-      def initialize key, value = nil
-        super key
-        @value = Expression.new(value ? [value].flatten : [])
+      def initialize key, value = nil, parent = nil
+        super key, parent
+
+        value = if value.is_a? Array
+          value.each {|v| v.parent = self if v.respond_to? :parent }
+        elsif value.nil?
+          []
+        else
+          value
+        end
+        
+        @value = Expression.new(value, self)
         @eval = false # Store the first evaluation in here
       end
   
       def << token
-        token = Node::Anonymous.new(*token) unless token.is_a? Entity or token.is_a? Operator
+        token = Node::Anonymous.new(*token) unless token.is_a? Entity or token.respond_to? :to_ruby
         token.parent = self if token.respond_to? :parent
         @value << token
       end
@@ -45,9 +54,9 @@ module Less
     class Variable < Property
       attr_reader :declaration
         
-      def initialize key, value = nil   
+      def initialize key, value = nil, parent = nil   
         @declaration = value ? true : false 
-        super key.delete('@'), value
+        super key.delete('@'), value, parent
       end
   
       def inspect
@@ -76,55 +85,65 @@ module Less
     end
   
     class Expression < Array
-      def initialize ary
-        super [ary].flatten
+      attr_reader :parent
+      
+      def initialize ary, parent = nil
+        self.parent = parent
+        super ary
+      end
+      
+      def expressions; select {|i| i.kind_of? Expression } end
+      def operators;   select {|i| i.is_a? Operator }      end
+      def entities;    select {|i| i.kind_of? Entity }     end
+      def literals;    select {|i| i.kind_of? Literal }    end
+        
+      def parent= obj
+        @parent = obj
+        each {|e| e.parent = obj if e.respond_to? :parent }
       end
       
-      def operators; select {|i| i.is_a? Operator }   end
-      def entities;  select {|i| i.kind_of? Entity }  end
-      def literals;  select {|i| i.kind_of? Literal } end
-    
       def inspect
         '[' + map {|i| i.inspect }.join(', ') + ']'
       end
+      
+      def terminal?
+        expressions.empty?
+      end
     
       def to_css
-        map {|i| i.to_css } * ' '
+        map do |i| 
+          i.respond_to?(:to_css) ? i.to_css : i.to_s
+        end * ' '
+      end
+      
+      def to_ruby
+        map do |i|
+          i.respond_to?(:to_ruby) ? i.to_ruby : i.to_s
+        end
       end
     
       #
       # Evaluates the expression and instantiates a new Literal with the result
       # ex: [#111, +, #111] will evaluate to a Color node, with value #222
       # 
-      # TODO: refactor the conditionals
       def evaluate
-        if size > 2 && (entities.size == operators.size + 1)
-          
-          # Create a sub-expression with all the variables/properties evaluated
-          evaluated = Expression.new map {|e| e.respond_to?(:evaluate) ? e.evaluate : e }
-        
-          unit = evaluated.literals.map do |node|
+        if size > 2 or !terminal?
+          # Replace self with an evaluated sub-expression
+          replace map {|e| e.respond_to?(:evaluate) ? e.evaluate : e }
+
+          unit = literals.map do |node|
             node.unit
           end.compact.uniq.tap do |ary|
             raise MixedUnitsError, self * ' ' if ary.size > 1
           end.join
-        
-          entity = evaluated.literals.find {|e| e.unit == unit } || evaluated.first        
-          ruby = map {|e| e.to_ruby if e.respond_to? :to_ruby }
-        
-          unless ruby.include? nil
-            if entity
-              result = eval(ruby.join)
-              if result.is_a? Entity
-                result
-              else
-                entity.class.new(result, *(unit if entity.class == Node::Number))
-              end
-            else
-              first
-            end
-          else
-            self
+          
+          entity = literals.find {|e| e.unit == unit } || entities.first
+          result = operators.empty?? self : eval(to_ruby.join)
+          
+          case result
+            when Entity     then result
+            when Expression then result.one?? result.first : self.class.new(result)
+            else entity.class.new(result, *(unit if entity.class == Node::Number))
           end
         elsif size == 1
           first

data/lib/less/engine/parser.rb

@@ -622,8 +622,8 @@ module Less
       else
         s4, i4 = [], index
         loop do
-          if has_terminal?('[-a-zA-Z0-9_%$/.&=:;#+?]', true, index)
-            r5 = true
+          if has_terminal?('\G[-a-zA-Z0-9_%$/.&=:;#+?]', true, index)
+            r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r5 = nil
@@ -698,8 +698,8 @@ module Less
     i0, s0 = index, []
     s1, i1 = [], index
     loop do
-      if has_terminal?('[-a-z]', true, index)
-        r2 = true
+      if has_terminal?('\G[-a-z]', true, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r2 = nil
@@ -738,8 +738,8 @@ module Less
             if r7
               s8, i8 = [], index
               loop do
-                if has_terminal?('[a-z]', true, index)
-                  r9 = true
+                if has_terminal?('\G[a-z]', true, index)
+                  r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
                   @index += 1
                 else
                   r9 = nil
@@ -1039,7 +1039,7 @@ module Less
       elements[4]
     end
 
-    def expression
+    def expressions
       elements[5]
     end
 
@@ -1054,8 +1054,9 @@ module Less
 
   module Declaration2
     def build env
-      env << (name.text_value =~ /^@/ ? Node::Variable : Node::Property).new(name.text_value, [])
-      expression.build env
+      env << (name.text_value =~ /^@/ ? 
+        Node::Variable : Node::Property).new(name.text_value, expressions.build(env), env)
+
     end
   # Empty rule
   end
@@ -1125,7 +1126,7 @@ module Less
             r8 = _nt_s
             s1 << r8
             if r8
-              r9 = _nt_expression
+              r9 = _nt_expressions
               s1 << r9
               if r9
                 r10 = _nt_s
@@ -1258,16 +1259,110 @@ module Less
     r0
   end
 
+  module Expressions0
+    def build env
+      elements.map do |e|
+        e.build(env) if e.respond_to? :build
+      end.compact
+    end
+  end
+
+  def _nt_expressions
+    start_index = index
+    if node_cache[:expressions].has_key?(index)
+      cached = node_cache[:expressions][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      r1 = _nt_expression
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Expressions0)
+    end
+
+    node_cache[:expressions][start_index] = r0
+
+    r0
+  end
+
   module Expression0
+    def s
+      elements[0]
+    end
+
+    def s
+      elements[2]
+    end
+
+    def expressions
+      elements[3]
+    end
+
+    def s
+      elements[4]
+    end
+
+    def s
+      elements[6]
+    end
+  end
+
+  module Expression1
+    def build env
+      Node::Expression.new(['('] + expressions.build(env).flatten + [')'])
+    end
+  end
+
+  module Expression2
+    def operator
+      elements[0]
+    end
+
+    def entity
+      elements[1]
+    end
+  end
+
+  module Expression3
     def entity
       elements[0]
     end
 
-    def expression
+    def tail
+      elements[1]
+    end
+
+    def ws
       elements[2]
     end
   end
 
+  module Expression4
+    def build env 
+      exp = all.map do |e|
+        e.method(:build).arity.zero?? 
+          e.build : e.build(env) if e.respond_to? :build
+      end.dissolve
+      exp.is_a?(Array) ? Node::Expression.new(exp) : exp
+    end
+    
+    def all
+      [entity] + tail.elements.map {|i| [i.operator, i.entity] }.flatten.compact
+    end
+  end
+
   def _nt_expression
     start_index = index
     if node_cache[:expression].has_key?(index)
@@ -1278,36 +1373,48 @@ module Less
 
     i0 = index
     i1, s1 = index, []
-    r2 = _nt_entity
+    r2 = _nt_s
     s1 << r2
     if r2
-      i3 = index
-      r4 = _nt_operator
-      if r4
-        r3 = r4
+      if has_terminal?('(', false, index)
+        r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
       else
-        r5 = _nt_S
-        if r5
-          r3 = r5
-        else
-          r6 = _nt_WS
-          if r6
-            r3 = r6
-          else
-            @index = i3
-            r3 = nil
-          end
-        end
+        terminal_parse_failure('(')
+        r3 = nil
       end
       s1 << r3
       if r3
-        r7 = _nt_expression
-        s1 << r7
+        r4 = _nt_s
+        s1 << r4
+        if r4
+          r5 = _nt_expressions
+          s1 << r5
+          if r5
+            r6 = _nt_s
+            s1 << r6
+            if r6
+              if has_terminal?(')', false, index)
+                r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(')')
+                r7 = nil
+              end
+              s1 << r7
+              if r7
+                r8 = _nt_s
+                s1 << r8
+              end
+            end
+          end
+        end
       end
     end
     if s1.last
-      r1 = instantiate_node(Builder,input, i1...index, s1)
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
       r1.extend(Expression0)
+      r1.extend(Expression1)
     else
       @index = i1
       r1 = nil
@@ -1315,9 +1422,49 @@ module Less
     if r1
       r0 = r1
     else
-      r8 = _nt_entity
-      if r8
-        r0 = r8
+      i9, s9 = index, []
+      r10 = _nt_entity
+      s9 << r10
+      if r10
+        s11, i11 = [], index
+        loop do
+          i12, s12 = index, []
+          r13 = _nt_operator
+          s12 << r13
+          if r13
+            r14 = _nt_entity
+            s12 << r14
+          end
+          if s12.last
+            r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+            r12.extend(Expression2)
+          else
+            @index = i12
+            r12 = nil
+          end
+          if r12
+            s11 << r12
+          else
+            break
+          end
+        end
+        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+        s9 << r11
+        if r11
+          r15 = _nt_ws
+          s9 << r15
+        end
+      end
+      if s9.last
+        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+        r9.extend(Expression3)
+        r9.extend(Expression4)
+      else
+        @index = i9
+        r9 = nil
+      end
+      if r9
+        r0 = r9
       else
         @index = i0
         r0 = nil
@@ -1329,6 +1476,92 @@ module Less
     r0
   end
 
+  def _nt_separator
+    start_index = index
+    if node_cache[:separator].has_key?(index)
+      cached = node_cache[:separator][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_operator
+    if r1
+      r0 = r1
+    else
+      r2 = _nt_S
+      if r2
+        r0 = r2
+      else
+        r3 = _nt_WS
+        if r3
+          r0 = r3
+        else
+          @index = i0
+          r0 = nil
+        end
+      end
+    end
+
+    node_cache[:separator][start_index] = r0
+
+    r0
+  end
+
+  module Paren0
+    def s
+      elements[0]
+    end
+
+    def s
+      elements[2]
+    end
+  end
+
+  module Paren1
+    def build
+      Node::Paren.new(text_value.strip)
+    end
+  end
+
+  def _nt_paren
+    start_index = index
+    if node_cache[:paren].has_key?(index)
+      cached = node_cache[:paren][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_s
+    s0 << r1
+    if r1
+      if has_terminal?('\G[()]', true, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        r2 = nil
+      end
+      s0 << r2
+      if r2
+        r3 = _nt_s
+        s0 << r3
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Paren0)
+      r0.extend(Paren1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:paren][start_index] = r0
+
+    r0
+  end
+
   def _nt_entity
     start_index = index
     if node_cache[:entity].has_key?(index)
@@ -1406,11 +1639,15 @@ module Less
   end
 
   module Fonts2
-    def build env
-      fonts = ([font] + family.elements.map {|f| f.font }).map do |font|
-        font.build env
+    def build
+      fonts = all.map do |font|
+        font.build
       end
-      env.identifiers.last << Node::FontFamily.new(fonts)
+      Node::FontFamily.new(all.map(&:build))
+    end
+    
+    def all
+      [font] + family.elements.map {|f| f.font }
     end
   end
 
@@ -1488,13 +1725,13 @@ module Less
   end
 
   module Font1
-    def build env
+    def build
       Node::Keyword.new(text_value)
     end
   end
 
   module Font2
-    def build env
+    def build
       Node::String.new(text_value)
     end
   end
@@ -1509,8 +1746,8 @@ module Less
 
     i0 = index
     i1, s1 = index, []
-    if has_terminal?('[a-zA-Z]', true, index)
-      r2 = true
+    if has_terminal?('\G[a-zA-Z]', true, index)
+      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
       @index += 1
     else
       r2 = nil
@@ -1519,8 +1756,8 @@ module Less
     if r2
       s3, i3 = [], index
       loop do
-        if has_terminal?('[-a-zA-Z0-9]', true, index)
-          r4 = true
+        if has_terminal?('\G[-a-zA-Z0-9]', true, index)
+          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r4 = nil
@@ -1572,11 +1809,11 @@ module Less
     end
 
     i0, s0 = index, []
-    if has_terminal?('-', false, index)
+    if has_terminal?('*', false, index)
       r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
       @index += 1
     else
-      terminal_parse_failure('-')
+      terminal_parse_failure('*')
       r2 = nil
     end
     if r2
@@ -1586,27 +1823,42 @@ module Less
     end
     s0 << r1
     if r1
-      s3, i3 = [], index
-      loop do
-        if has_terminal?('[-a-z0-9_]', true, index)
-          r4 = true
-          @index += 1
-        else
-          r4 = nil
-        end
-        if r4
-          s3 << r4
-        else
-          break
-        end
+      if has_terminal?('-', false, index)
+        r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('-')
+        r4 = nil
       end
-      if s3.empty?
-        @index = i3
-        r3 = nil
+      if r4
+        r3 = r4
       else
-        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3 = instantiate_node(SyntaxNode,input, index...index)
       end
       s0 << r3
+      if r3
+        s5, i5 = [], index
+        loop do
+          if has_terminal?('\G[-a-z0-9_]', true, index)
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            r6 = nil
+          end
+          if r6
+            s5 << r6
+          else
+            break
+          end
+        end
+        if s5.empty?
+          @index = i5
+          r5 = nil
+        else
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        end
+        s0 << r5
+      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -1625,8 +1877,8 @@ module Less
   end
 
   module Variable1
-    def build env
-      env.identifiers.last << Node::Variable.new(text_value)
+    def build
+      Node::Variable.new(text_value)
     end
   end
 
@@ -1650,8 +1902,8 @@ module Less
     if r1
       s2, i2 = [], index
       loop do
-        if has_terminal?('[-a-zA-Z0-9_]', true, index)
-          r3 = true
+        if has_terminal?('\G[-a-zA-Z0-9_]', true, index)
+          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r3 = nil
@@ -1946,8 +2198,8 @@ module Less
       s1 << r3
       if r3
         i4, s4 = index, []
-        if has_terminal?('[|~*$^]', true, index)
-          r6 = true
+        if has_terminal?('\G[|~*$^]', true, index)
+          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r6 = nil
@@ -2090,8 +2342,8 @@ module Less
     end
     s0 << r1
     if r1
-      if has_terminal?('[_a-z]', true, index)
-        r2 = true
+      if has_terminal?('\G[_a-z]', true, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r2 = nil
@@ -2100,8 +2352,8 @@ module Less
       if r2
         s3, i3 = [], index
         loop do
-          if has_terminal?('[-a-zA-Z0-9_]', true, index)
-            r4 = true
+          if has_terminal?('\G[-a-zA-Z0-9_]', true, index)
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r4 = nil
@@ -2150,8 +2402,8 @@ module Less
     end
     s0 << r1
     if r1
-      if has_terminal?('[_a-z]', true, index)
-        r2 = true
+      if has_terminal?('\G[_a-z]', true, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r2 = nil
@@ -2160,8 +2412,8 @@ module Less
       if r2
         s3, i3 = [], index
         loop do
-          if has_terminal?('[-a-zA-Z0-9_]', true, index)
-            r4 = true
+          if has_terminal?('\G[-a-zA-Z0-9_]', true, index)
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r4 = nil
@@ -2202,8 +2454,8 @@ module Less
 
     i0 = index
     i1, s1 = index, []
-    if has_terminal?('[a-zA-Z]', true, index)
-      r2 = true
+    if has_terminal?('\G[a-zA-Z]', true, index)
+      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
       @index += 1
     else
       r2 = nil
@@ -2212,8 +2464,8 @@ module Less
     if r2
       s3, i3 = [], index
       loop do
-        if has_terminal?('[-a-zA-Z]', true, index)
-          r4 = true
+        if has_terminal?('\G[-a-zA-Z]', true, index)
+          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r4 = nil
@@ -2227,8 +2479,8 @@ module Less
       r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
       s1 << r3
       if r3
-        if has_terminal?('[0-9]', true, index)
-          r6 = true
+        if has_terminal?('\G[0-9]', true, index)
+          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r6 = nil
@@ -2301,8 +2553,8 @@ module Less
     r3 = _nt_s
     s2 << r3
     if r3
-      if has_terminal?('[+>~]', true, index)
-        r4 = true
+      if has_terminal?('\G[+>~]', true, index)
+        r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r4 = nil
@@ -2379,7 +2631,7 @@ module Less
 
   module Accessor1
     def build env
-      env.identifiers.last << env.nearest(ident.text_value)[attr.text_value.delete(%q["'])].evaluate
+      env.nearest(ident.text_value)[attr.text_value.delete(%q["'])].evaluate
     end
   end
 
@@ -2467,14 +2719,14 @@ module Less
   end
 
   module Operator1
-    def build env
-      env.identifiers.last << Node::Operator.new(text_value.strip)
+    def build
+      Node::Operator.new(text_value.strip)
     end
   end
 
   module Operator2
-    def build env
-      env.identifiers.last << Node::Operator.new(text_value)
+    def build
+      Node::Operator.new(text_value)
     end
   end
 
@@ -2491,8 +2743,8 @@ module Less
     r2 = _nt_S
     s1 << r2
     if r2
-      if has_terminal?('[-+*/]', true, index)
-        r3 = true
+      if has_terminal?('\G[-+*/]', true, index)
+        r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r3 = nil
@@ -2514,7 +2766,7 @@ module Less
     if r1
       r0 = r1
     else
-      if has_terminal?('[-+*/]', true, index)
+      if has_terminal?('\G[-+*/]', true, index)
         r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
         r5.extend(Operator2)
         @index += 1
@@ -2541,8 +2793,8 @@ module Less
   end
 
   module Literal1
-    def build env
-      env.identifiers.last << Node::Anonymous.new(text_value)
+    def build
+      Node::Anonymous.new(text_value)
     end
   end
 
@@ -2557,14 +2809,14 @@ module Less
   end
 
   module Literal3
-    def build env
-      env.identifiers.last << Node::Number.new(number.text_value, unit.text_value)
+    def build
+      Node::Number.new(number.text_value, unit.text_value)
     end
   end
 
   module Literal4
-    def build env
-      env.identifiers.last << Node::String.new(text_value)
+    def build
+      Node::String.new(text_value)
     end
   end
 
@@ -2589,8 +2841,8 @@ module Less
       else
         s5, i5 = [], index
         loop do
-          if has_terminal?('[-a-z]', true, index)
-            r6 = true
+          if has_terminal?('\G[-a-z]', true, index)
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r6 = nil
@@ -2676,8 +2928,8 @@ module Less
   end
 
   module Important0
-    def build env
-      env.identifiers.last << Node::Keyword.new(text_value)
+    def build
+      Node::Keyword.new(text_value)
     end
   end
 
@@ -2707,8 +2959,8 @@ module Less
   end
 
   module Keyword1
-    def build env
-      env.identifiers.last << Node::Keyword.new(text_value)
+    def build
+      Node::Keyword.new(text_value)
     end
   end
 
@@ -2723,8 +2975,8 @@ module Less
     i0, s0 = index, []
     s1, i1 = [], index
     loop do
-      if has_terminal?('[-a-zA-Z]', true, index)
-        r2 = true
+      if has_terminal?('\G[-a-zA-Z]', true, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r2 = nil
@@ -2779,7 +3031,7 @@ module Less
 
   module String2
     def value
-      text_value[1...-1]
+      content.text_value
     end
   end
 
@@ -2795,7 +3047,7 @@ module Less
 
   module String5
     def value
-      text_value[1...-1]
+      content.text_value
     end
   end
 
@@ -2884,8 +3136,8 @@ module Less
       r0 = r1
     else
       i9, s9 = index, []
-      if has_terminal?('["]', true, index)
-        r10 = true
+      if has_terminal?('\G["]', true, index)
+        r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r10 = nil
@@ -2896,8 +3148,8 @@ module Less
         loop do
           i12, s12 = index, []
           i13 = index
-          if has_terminal?('["]', true, index)
-            r14 = true
+          if has_terminal?('\G["]', true, index)
+            r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r14 = nil
@@ -2935,8 +3187,8 @@ module Less
         r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
         s9 << r11
         if r11
-          if has_terminal?('["]', true, index)
-            r16 = true
+          if has_terminal?('\G["]', true, index)
+            r16 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r16 = nil
@@ -3035,8 +3287,8 @@ module Less
     if r2
       s4, i4 = [], index
       loop do
-        if has_terminal?('[0-9]', true, index)
-          r5 = true
+        if has_terminal?('\G[0-9]', true, index)
+          r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r5 = nil
@@ -3061,8 +3313,8 @@ module Less
         if r6
           s7, i7 = [], index
           loop do
-            if has_terminal?('[0-9]', true, index)
-              r8 = true
+            if has_terminal?('\G[0-9]', true, index)
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               r8 = nil
@@ -3110,8 +3362,8 @@ module Less
       if r10
         s12, i12 = [], index
         loop do
-          if has_terminal?('[0-9]', true, index)
-            r13 = true
+          if has_terminal?('\G[0-9]', true, index)
+            r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r13 = nil
@@ -3256,8 +3508,8 @@ module Less
   end
 
   module Color1
-    def build env
-      env.identifiers.last << Node::Color.new(*rgb.build)
+    def build
+      Node::Color.new(*rgb.build)
     end
   end
 
@@ -3275,8 +3527,8 @@ module Less
   end
 
   module Color4
-    def build env
-      env.identifiers.last << Node::Function.new(fn.text_value, arguments.build.flatten)
+    def build
+      Node::Function.new(fn.text_value, arguments.build.flatten)
     end
   end
 
@@ -3569,7 +3821,7 @@ module Less
       return cached
     end
 
-    if has_terminal?('[a-fA-F0-9]', true, index)
+    if has_terminal?('\G[a-fA-F0-9]', true, index)
       r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
       @index += 1
     else
@@ -3592,8 +3844,8 @@ module Less
   end
 
   module Function1
-    def build env
-      env.identifiers.last << Node::Function.new(name.text_value, [arguments.build].flatten)
+    def build
+      Node::Function.new(name.text_value, [arguments.build].flatten)
     end
   end
 
@@ -3608,8 +3860,8 @@ module Less
     i0, s0 = index, []
     s1, i1 = [], index
     loop do
-      if has_terminal?('[-a-zA-Z_]', true, index)
-        r2 = true
+      if has_terminal?('\G[-a-zA-Z_]', true, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r2 = nil
@@ -3869,8 +4121,8 @@ module Less
           i6, s6 = index, []
           s7, i7 = [], index
           loop do
-            if has_terminal?('[a-zA-Z]', true, index)
-              r8 = true
+            if has_terminal?('\G[a-zA-Z]', true, index)
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               r8 = nil
@@ -3915,8 +4167,8 @@ module Less
           else
             s11, i11 = [], index
             loop do
-              if has_terminal?('[-a-zA-Z0-9_%$/.&=:;#+?]', true, index)
-                r12 = true
+              if has_terminal?('\G[-a-zA-Z0-9_%$/.&=:;#+?]', true, index)
+                r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
                 r12 = nil
@@ -3960,8 +4212,8 @@ module Less
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('[ ]', true, index)
-        r1 = true
+      if has_terminal?('\G[ ]', true, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r1 = nil
@@ -3989,8 +4241,8 @@ module Less
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('[ ]', true, index)
-        r1 = true
+      if has_terminal?('\G[ ]', true, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r1 = nil
@@ -4023,8 +4275,8 @@ module Less
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('[\\n ]', true, index)
-        r1 = true
+      if has_terminal?('\G[\\n ]', true, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r1 = nil
@@ -4052,8 +4304,8 @@ module Less
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('[\\n ]', true, index)
-        r1 = true
+      if has_terminal?('\G[\\n ]', true, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r1 = nil
@@ -4089,8 +4341,8 @@ module Less
 
     i0, s0 = index, []
     i1 = index
-    if has_terminal?('[ ;\\n]', true, index)
-      r2 = true
+    if has_terminal?('\G[ ;\\n]', true, index)
+      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
       @index += 1
     else
       r2 = nil