cloudhead-less 1.0.3 → 1.0.4

data/Rakefile

@@ -17,7 +17,6 @@ end
 begin
   require 'rake/contrib/sshpublisher'
   namespace :rubyforge do
-
     desc "Release gem and RDoc documentation to RubyForge"
     task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
 
@@ -64,8 +63,8 @@ begin
   require 'lib/less'
   
   task :compile do
-    puts "compiling #{Less::GRAMMAR.split('/').last}..."
-    File.open(Less::PARSER, 'w') {|f| f.write Treetop::Compiler::GrammarCompiler.new.ruby_source(Less::GRAMMAR) }
+    puts "compiling #{LESS_GRAMMAR.split('/').last}..."
+    File.open(LESS_PARSER, 'w') {|f| f.write Treetop::Compiler::GrammarCompiler.new.ruby_source(LESS_GRAMMAR) }
   end
   
   task :benchmark do

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-10}
+  s.date = %q{2009-07-13}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}

data/lib/less.rb

@@ -1,19 +1,18 @@
-$:.unshift File.dirname(__FILE__), 
-  File.join(File.dirname(__FILE__), 'vendor', 'treetop', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), 'vendor', 'treetop', 'lib'), 
+           File.dirname(__FILE__)
 
-require 'rubygems'
 require 'cgi'
-require 'delegate'
 require 'treetop'
+require 'delegate'
+
+LESS_ROOT = File.expand_path(File.dirname(__FILE__))
+LESS_PARSER = File.join(LESS_ROOT, 'less', 'engine', 'parser.rb')
+LESS_GRAMMAR = File.join(LESS_ROOT, 'less', 'engine', 'less.tt')
 
 require 'less/command'
 require 'less/engine'
 
-module Less
-  ROOT = File.expand_path(File.dirname(__FILE__))
-  PARSER = File.join(ROOT, 'less', 'engine', 'parser.rb')
-  GRAMMAR = File.join(ROOT, 'less', 'engine', 'less.tt')
-  
+module Less  
   MixedUnitsError   = Class.new(Exception)
   PathError         = Class.new(Exception)
   VariableNameError = Class.new(NameError)

data/lib/less/engine.rb

@@ -3,6 +3,12 @@ $:.unshift File.dirname(__FILE__)
 require 'engine/builder'
 require 'engine/nodes'
 
+begin
+  require 'engine/parser'
+rescue LoadError
+  Treetop.load LESS_GRAMMAR
+end
+
 module Less
   class Engine
     attr_reader :css, :less
@@ -17,12 +23,6 @@ module Less
         raise ArgumentError, "argument must be an instance of File or String!"
       end
       
-      begin
-        require 'engine/parser'
-      rescue LoadError
-        Treetop.load Less::GRAMMAR
-      end
-            
       @parser = LessParser.new
     end
     
@@ -34,9 +34,7 @@ module Less
       else
         raise SyntaxError, @parser.failure_message
       end
-      
-      log @tree.inspect
-            
+                  
       @tree
     end
     alias :to_tree :parse
@@ -46,11 +44,7 @@ module Less
     end
     
     def prepare
-      @less.gsub(/\r\n/, "\n").                                      # m$
-            gsub(/\t/, '  ')                                        # Tabs to spaces
-            #gsub(/('|")(.*?)(\1)/) { $1 + CGI.escape( $2 ) + $1 }   # Escape string values
-           # gsub(/\/\/.*\n/, '').                                    # Comments //
-          #  gsub(/\/\*.*?\*\//m, '')                                 # Comments /*
+      @less.gsub(/\r\n/, "\n").gsub(/\t/, '  ')
     end
   end
 end

data/lib/less/engine/builder.rb

@@ -6,8 +6,3 @@ module Builder
     env
   end
 end
-
-module Empty
-  def build env
-  end
-end

data/lib/less/engine/less.tt

@@ -20,13 +20,10 @@ grammar Less
       end
     } / ws selectors ';' ws {
       def build env        
-        log "[mixin]: #{selectors.text_value}"
         selectors.build(env, :path).each do |path|
-                    
           rules = path.inject(env.root) do |current, node|
             current.descend(node.selector, node) or raise MixinNameError, path.join
           end.rules
-                    
           env.rules += rules
         end
       end
@@ -39,7 +36,6 @@ grammar Less
         path = File.join(env.root.file, url.value)
         path += '.less' unless path =~ /\.less$/
         if File.exist? path
-          log "\nimporting #{path}"
           imported = Less::Engine.new(File.new path).to_tree
           env.rules += imported.rules
         else
@@ -85,7 +81,6 @@ grammar Less
   rule selector
     (s select element s)+ {
       def tree env
-        log "\n% element: #{text_value}\n"
         elements.inject(env) do |node, e|
           node << Node::Element.new(e.element.text_value, e.select.text_value)
           node.last
@@ -170,7 +165,7 @@ grammar Less
   # div / .class / #id / input[type="text"] / lang(fr)
   #
   rule element
-    (class_id / tag) attribute* ('(' ident ')')? / '@media' / '@font-face'
+    (class_id / tag / ident) attribute* ('(' ident ')')? / '@media' / '@font-face'
   end
   
   rule class_id
@@ -249,10 +244,6 @@ grammar Less
     }
   end
   
-  rule empty
-    "" <Empty>
-  end
-  
   #
   # `blue`, `small`, `normal` etc.
   #

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

@@ -52,7 +52,7 @@ module Less
       def elements;    @rules.select {|r| r.instance_of? Element  } end
   
       # Select a child element
-      # TODO: Implement full selector syntax
+      # TODO: Implement full selector syntax & merge with descend()
       def [] key
         @rules.find {|i| i.to_s == key }
       end
@@ -119,16 +119,11 @@ module Less
           raise VariableNameError, ident unless result
         end
       end
-  
-      def each path = [], &blk
+    
       #
-      # Traverse the whole tree, returning each leaf or branch (recursive)
+      # Traverse the whole tree, returning each leaf (recursive)
       #
-      ###
-        #   Aside from the key & value, we yield the full path of the leaf,  
-        #   aswell as the branch which contains it (self).
-        #   Note that in :branch mode, we only return 'twigs', branches which contain leaves.
-        #
+      def each path = [], &blk
         elements.each do |element|                            
           path << element                         
           yield element, path if element.leaf?                

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

@@ -7,13 +7,11 @@ module Less
       
       def initialize key, value = nil
         super key
-        log "\n[new] #{self.class} `#{key}`\n"
         @value = Expression.new(value ? [value] : [])
         @eval = false # Store the first evaluation in here
       end
   
       def << token
-        log "[adding] to #{self.to_s}: '#{token.to_s}' <#{token.class}>\n"
         token = Node::Anonymous.new(*token) unless token.is_a? Entity or token.is_a? Operator
         @value << token
       end
@@ -77,11 +75,11 @@ module Less
       #
       # 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
-        log "evaluating #{self}"
-        log "#{self.select{|i| i.is_a? Entity }}"
         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 }
         
@@ -95,21 +93,15 @@ module Less
           ruby = map {|e| e.to_ruby if e.respond_to? :to_ruby }
         
           unless ruby.include? nil
-            log "ruby(#{unit}): " + ruby.join(' ') + "\n"
-      
             if entity
-              log "\n# => #{eval(ruby.join)} <#{entity.class}>\n"
               entity.class.new(eval(ruby.join), *(unit if entity.class == Node::Number))
             else
-              log "\n# => not evaluated"
               first
             end
           else
-            log "some elements dont respond to to_ruby: #{ruby}"
             self
           end
         elsif size == 1
-          log "not evaluating, size == 1"
           first
         else
           self

data/lib/less/engine/parser.rb

@@ -361,13 +361,10 @@ module Less
 
   module Ruleset3
     def build env        
-      log "[mixin]: #{selectors.text_value}"
       selectors.build(env, :path).each do |path|
-                  
         rules = path.inject(env.root) do |current, node|
           current.descend(node.selector, node) or raise MixinNameError, path.join
         end.rules
-                  
         env.rules += rules
       end
     end
@@ -497,7 +494,6 @@ module Less
       path = File.join(env.root.file, url.value)
       path += '.less' unless path =~ /\.less$/
       if File.exist? path
-        log "\nimporting #{path}"
         imported = Less::Engine.new(File.new path).to_tree
         env.rules += imported.rules
       else
@@ -930,7 +926,6 @@ module Less
 
   module Selector1
     def tree env
-      log "\n% element: #{text_value}\n"
       elements.inject(env) do |node, e|
         node << Node::Element.new(e.element.text_value, e.select.text_value)
         node.last
@@ -1688,60 +1683,65 @@ module Less
       if r4
         r2 = r4
       else
-        @index = i2
-        r2 = nil
+        r5 = _nt_ident
+        if r5
+          r2 = r5
+        else
+          @index = i2
+          r2 = nil
+        end
       end
     end
     s1 << r2
     if r2
-      s5, i5 = [], index
+      s6, i6 = [], index
       loop do
-        r6 = _nt_attribute
-        if r6
-          s5 << r6
+        r7 = _nt_attribute
+        if r7
+          s6 << r7
         else
           break
         end
       end
-      r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-      s1 << r5
-      if r5
-        i8, s8 = index, []
+      r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+      s1 << r6
+      if r6
+        i9, s9 = index, []
         if has_terminal?('(', false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure('(')
-          r9 = nil
+          r10 = nil
         end
-        s8 << r9
-        if r9
-          r10 = _nt_ident
-          s8 << r10
-          if r10
+        s9 << r10
+        if r10
+          r11 = _nt_ident
+          s9 << r11
+          if r11
             if has_terminal?(')', false, index)
-              r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure(')')
-              r11 = nil
+              r12 = nil
             end
-            s8 << r11
+            s9 << r12
           end
         end
-        if s8.last
-          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-          r8.extend(Element0)
+        if s9.last
+          r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+          r9.extend(Element0)
         else
-          @index = i8
-          r8 = nil
+          @index = i9
+          r9 = nil
         end
-        if r8
-          r7 = r8
+        if r9
+          r8 = r9
         else
-          r7 = instantiate_node(SyntaxNode,input, index...index)
+          r8 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s1 << r7
+        s1 << r8
       end
     end
     if s1.last
@@ -1755,24 +1755,24 @@ module Less
       r0 = r1
     else
       if has_terminal?('@media', false, index)
-        r12 = instantiate_node(SyntaxNode,input, index...(index + 6))
+        r13 = instantiate_node(SyntaxNode,input, index...(index + 6))
         @index += 6
       else
         terminal_parse_failure('@media')
-        r12 = nil
+        r13 = nil
       end
-      if r12
-        r0 = r12
+      if r13
+        r0 = r13
       else
         if has_terminal?('@font-face', false, index)
-          r13 = instantiate_node(SyntaxNode,input, index...(index + 10))
+          r14 = instantiate_node(SyntaxNode,input, index...(index + 10))
           @index += 10
         else
           terminal_parse_failure('@font-face')
-          r13 = nil
+          r14 = nil
         end
-        if r13
-          r0 = r13
+        if r14
+          r0 = r14
         else
           @index = i0
           r0 = nil
@@ -2597,27 +2597,6 @@ module Less
     r0
   end
 
-  def _nt_empty
-    start_index = index
-    if node_cache[:empty].has_key?(index)
-      cached = node_cache[:empty][index]
-      @index = cached.interval.end if cached
-      return cached
-    end
-
-    if has_terminal?("", false, index)
-      r0 = instantiate_node(Empty,input, index...(index + 0))
-      @index += 0
-    else
-      terminal_parse_failure("")
-      r0 = nil
-    end
-
-    node_cache[:empty][start_index] = r0
-
-    r0
-  end
-
   module Keyword0
   end
 

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

@@ -6,6 +6,3 @@ TREETOP_ROOT = File.join(dir, 'treetop')
 require File.join(TREETOP_ROOT, "ruby_extensions")
 require File.join(TREETOP_ROOT, "runtime")
 require File.join(TREETOP_ROOT, "compiler")
-
-require 'polyglot'
-Polyglot.register(["treetop", "tt"], Treetop)

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

@@ -25,7 +25,7 @@ module Treetop
             elements << node
           end
           elements
-        end
+        end.sort
       end
 
       def terminal?
@@ -43,6 +43,10 @@ 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/spec/compiler/character_class_spec.rb

@@ -235,5 +235,13 @@ module CharacterClassSpec
       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/treetop.gemspec

@@ -13,6 +13,5 @@ $gemspec = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.autorequire = "treetop"
   s.has_rdoc = false
-  s.add_dependency "polyglot", ">= 0.2.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -07:00
+date: 2009-07-13 00:00:00 -07:00
 default_executable: lessc
 dependencies: []