less 1.0.14 → 1.0.15

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.14
+1.0.15

data/less.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.14"
+  s.version = "1.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

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
@@ -1509,8 +1509,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 +1519,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
@@ -1602,8 +1602,8 @@ module Less
       if r3
         s5, i5 = [], index
         loop do
-          if has_terminal?('[-a-z0-9_]', true, index)
-            r6 = true
+          if has_terminal?('\G[-a-z0-9_]', true, index)
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r6 = nil
@@ -1665,8 +1665,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
@@ -1961,8 +1961,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
@@ -2105,8 +2105,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
@@ -2115,8 +2115,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
@@ -2165,8 +2165,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
@@ -2175,8 +2175,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
@@ -2217,8 +2217,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
@@ -2227,8 +2227,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
@@ -2242,8 +2242,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
@@ -2316,8 +2316,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
@@ -2506,8 +2506,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
@@ -2529,7 +2529,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
@@ -2604,8 +2604,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
@@ -2738,8 +2738,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
@@ -2899,8 +2899,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
@@ -2911,8 +2911,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
@@ -2950,8 +2950,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
@@ -3050,8 +3050,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
@@ -3076,8 +3076,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
@@ -3125,8 +3125,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
@@ -3584,7 +3584,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
@@ -3623,8 +3623,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
@@ -3884,8 +3884,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
@@ -3930,8 +3930,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
@@ -3975,8 +3975,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
@@ -4004,8 +4004,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
@@ -4038,8 +4038,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
@@ -4067,8 +4067,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
@@ -4104,8 +4104,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

data/lib/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb

@@ -4,13 +4,9 @@ module Treetop
       def compile(address, builder, parent_expression = nil)
         super
         
-        builder.if__ "has_terminal?(#{single_quote(text_value)}, true, index)" do
-          if address == 0 || decorated?
-            assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
-            extend_result_with_inline_module
-          else
-            assign_lazily_instantiated_node
-          end
+        builder.if__ "has_terminal?(#{grounded_regexp(text_value)}, true, index)" do
+          assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
+          extend_result_with_inline_module
           builder << "@index += 1"
         end
         builder.else_ do
@@ -18,6 +14,11 @@ module Treetop
           assign_result 'nil'
         end
       end
+
+      def grounded_regexp(string)
+        # Double any backslashes, then backslash any single-quotes:
+        "'\\G#{string.gsub(/\\/) { '\\\\' }.gsub(/'/) { "\\'"}}'"
+      end
     end
   end
 end

data/lib/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb

@@ -21,10 +21,6 @@ module Treetop
         parent_expression && parent_expression.inline_module_name
       end
       
-      def decorated?
-        parent_expression && (parent_expression.node_class_name || parent_expression.node_class_name || parent_expression.inline_module_name)
-      end
-      
       def optional_arg(arg)
         if arg
           ", #{arg}"
@@ -93,10 +89,6 @@ module Treetop
       def assign_failure(start_index_var)
         assign_result("nil")
       end
-      
-      def assign_lazily_instantiated_node
-        assign_result("true")
-      end
     
       def var_initialization
         left, right = [], []

data/lib/vendor/treetop/lib/treetop/runtime/compiled_parser.rb

@@ -3,7 +3,7 @@ module Treetop
     class CompiledParser
       include Treetop::Runtime
       
-      attr_reader :input, :index, :max_terminal_failure_index
+      attr_reader :input, :index, :terminal_failures, :max_terminal_failure_index
       attr_writer :root
       attr_accessor :consume_all_input
       alias :consume_all_input? :consume_all_input
@@ -25,26 +25,22 @@ module Treetop
       end
 
       def failure_line
-        @terminal_failures && input.line_of(failure_index)
+        terminal_failures && input.line_of(failure_index)
       end
 
       def failure_column
-        @terminal_failures && input.column_of(failure_index)
+        terminal_failures && input.column_of(failure_index)
       end
 
       def failure_reason
         return nil unless (tf = terminal_failures) && tf.size > 0
-        "Expected " +
-          (tf.size == 1 ?
-           tf[0].expected_string :
-                 "one of #{tf.map{|f| f.expected_string}.uniq*', '}"
-          ) +
-                " at line #{failure_line}, column #{failure_column} (byte #{failure_index+1})" +
-                " after #{input[index...failure_index]}"
-      end
-      
-      def terminal_failures
-        @terminal_failures.map! {|tf_ary| TerminalParseFailure.new(*tf_ary) }
+	"Expected " +
+	  (tf.size == 1 ?
+	   tf[0].expected_string :
+           "one of #{tf.map{|f| f.expected_string}.uniq*', '}"
+	  ) +
+          " at line #{failure_line}, column #{failure_column} (byte #{failure_index+1})" +
+          " after #{input[index...failure_index]}"
       end
 
 
@@ -91,7 +87,7 @@ module Treetop
           rx = @regexps[terminal] ||= Regexp.new(terminal)
           input.index(rx, index) == index
         else
-          input[index] == terminal[0] && input.index(terminal, index) == index
+          input[index, terminal.size] == terminal
         end
       end
     
@@ -101,7 +97,7 @@ module Treetop
           @max_terminal_failure_index = index
           @terminal_failures = []
         end
-        @terminal_failures << [index, expected_string]
+        terminal_failures << TerminalParseFailure.new(index, expected_string)
         return nil
       end
     end

data/lib/vendor/treetop/lib/treetop/runtime/syntax_node.rb

@@ -1,33 +1,19 @@
 module Treetop
   module Runtime
     class SyntaxNode
-      attr_reader :input, :interval
+      attr_reader :input, :interval, :elements
       attr_accessor :parent
 
       def initialize(input, interval, elements = nil)
         @input = input
         @interval = interval
         if @elements = elements
-          @comprehensive_elements = @elements unless @elements.delete(true)
-          @elements.each do |element|
+          elements.each do |element|
             element.parent = self
           end
         end
       end
 
-      def elements
-        return @elements if terminal?
-        # fill in any gaps in the sequence (lazy instantiation) if needed
-        @comprehensive_elements ||= interval.inject(@elements) do |elements, index|
-          unless @elements.any? {|element| element.interval.include?(index) }
-            node = SyntaxNode.new(input, index...(index + 1))
-            node.parent = self
-            elements << node
-          end
-          elements
-        end.sort
-      end
-
       def terminal?
         @elements.nil?
       end
@@ -43,10 +29,6 @@ module Treetop
       def empty?
         interval.first == interval.last && interval.exclude_end?
       end
-      
-      def <=>(other)
-        self.interval.first <=> other.interval.first
-      end
 
       def extension_modules
         local_extensions =

data/lib/vendor/treetop/lib/treetop/version.rb

@@ -1,8 +1,8 @@
 module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 2
-    TINY  = 6
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/vendor/treetop/spec/compiler/character_class_spec.rb

@@ -69,18 +69,6 @@ module CharacterClassSpec
       parse(' 1', :index => 1).should be_nil
     end
   end
-  
-  describe "a character class followed by a node class declaration and a block" do
-
-    testing_expression "[A-Z] <CharacterClassSpec::Foo>"
-    
-    it "actively generates nodes for the character when it is the primary node" do
-      result = parse('A')
-      result.should be_a(Treetop::Runtime::SyntaxNode)
-      result.elements.should be_nil
-    end
-    
-  end
 
   describe "A character class containing quotes" do
     testing_expression "[\"']"
@@ -190,58 +178,5 @@ module CharacterClassSpec
       parse("0").should be_nil
     end
   end
-  
-  describe "a character class" do
-    testing_expression "[A-Z]"
-    it "actively generates a node for the character because it is the primary node" do
-      result = parse('A')
-      result.should be_a(Treetop::Runtime::SyntaxNode)
-      result.elements.should be_nil
-    end
-  end
-  
-  describe "a character class mixed with other expressions" do
-    testing_expression '[A-Z] "a"'
-    it "lazily instantiates a node for the character" do
-      result = parse('Aa')
-      result.instance_variable_get("@elements").size.should == 1
-      result.elements.size.should == 2
-    end
-  end
-  
-  describe "a character class with a node class declaration mixed with other expressions" do
-    testing_expression '([A-Z] <CharacterClassSpec::Foo>) "a"'
-    it "actively generates a node for the character because it has a node class declared" do
-      result = parse('Aa')
-      result.instance_variable_get("@elements").size.should == 2
-      result.elements.size.should == 2
-    end
-  end
-  
-  describe "a character class with a node module declaration mixed with other expressions" do
-    testing_expression '([A-Z] <CharacterClassSpec::ModFoo>) "a"'
-    it "actively generates a node for the character because it has a node module declared" do
-      result = parse('Aa')
-      result.instance_variable_get("@elements").size.should == 2
-      result.elements.size.should == 2
-    end
-  end
-  
-  describe "a character class with an inline block mixed with other expressions" do
-    testing_expression '([A-Z] { def a_method; end }) "a"'
-    it "actively generates a node for the character because it has an inline block" do
-      result = parse('Aa')
-      result.instance_variable_get("@elements").size.should == 2
-      result.elements.size.should == 2
-    end
-  end
-  
-  describe "a character class with a label mixed with other expressions" do
-    testing_expression 'upper:([A-Z]) "b"'
-    it "returns the correct element for the labeled expression" do
-      result = parse('Ab')
-      result.upper.text_value.should == "A"
-    end
-  end
 
 end

data/lib/vendor/treetop/spec/runtime/syntax_node_spec.rb

@@ -50,19 +50,4 @@ module SyntaxNodeSpec
       end
     end
   end
-  
-  describe "A new nonterminal syntax node with all children lazily instantiated" do
-    attr_reader :node
-
-    before do
-      @input = 'test input'
-      @node = Runtime::SyntaxNode.new('input', 0...3, [true, true, true])
-    end
-    
-    it "should lazily instantiate its child nodes" do
-      node.elements.size.should == 3
-      node.elements.first.interval.should == (0...1)
-      node.elements.first.parent.should == @node
-    end
-  end
 end

data/lib/vendor/treetop/treetop.gemspec

@@ -7,7 +7,7 @@ $gemspec = Gem::Specification.new do |s|
   s.homepage = "http://functionalform.blogspot.com"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Ruby-based text parsing and interpretation DSL"
-  s.files = ["README", "Rakefile", "{test,lib,bin,doc,examples}/**/*"].map{|p| Dir[p]}.flatten
+  s.files = ["LICENSE", "README", "Rakefile", "{test,lib,bin,doc,examples}/**/*"].map{|p| Dir[p]}.flatten
   s.bindir = "bin"
   s.executables = ["tt"]
   s.require_path = "lib"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors: 
 - cloudhead