cloudhead-less 1.0.13 → 1.0.16

data/lib/less.rb

@@ -67,6 +67,21 @@ class Object
   def error!(s) raise Exception, s end
 end
 
+class Array
+  def dissolve
+    ary = flatten.compact
+    case ary.size
+      when 0 then []
+      when 1 then first
+      else ary
+    end
+  end
+  
+  def one?
+    size == 1
+  end
+end
+
 class Class
   def to_sym
     self.to_s.to_sym

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"

data/spec/css/parens.css

@@ -0,0 +1,7 @@
+.parens {
+  border: 2px solid black;
+  margin: 1px 3px 16 3;
+  width: 36;
+  padding: 2px 36px;
+}
+.more-parens { padding: 8 4 4 4px; }

data/spec/engine_spec.rb

@@ -54,6 +54,10 @@ describe Less::Engine do
       lessify(:scope).should == css(:scope)
     end
     
+    it "should parse parens" do
+      lessify(:parens).should == css(:parens)
+    end
+    
     it "should parse strings" do
       lessify(:strings).should == css(:strings)
     end

data/spec/less/operations.less

@@ -36,4 +36,4 @@
     color: 2 * #111; // #222222
     border-color: #333333 / 3 + #111; // #222222
   }
-}
+}

data/spec/less/parens.less

@@ -0,0 +1,15 @@
+.parens {
+  @var: 1px;
+  border: (@var * 2) solid black;
+  margin: (@var * 1) (@var + 2) (4 * 4) 3;
+  width: (6 * 6);
+  padding: 2px (6px * 6px);
+}
+
+.more-parens {
+  @var: (2 * 2);
+  padding: (2 * @var) 4 4 (@var * 1px);
+  //width: (@var * @var) * 6;
+  //margin: (6 * 6)px;
+  //height: (7 * 7) + (8 * 8);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.0.13
+  version: 1.0.16
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: lessc
 dependencies: []
 
@@ -147,6 +147,7 @@ files:
 - 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
@@ -173,6 +174,7 @@ files:
 - 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