cloudhead-less 1.1.2 → 1.1.3

data/Rakefile

@@ -61,19 +61,30 @@ end
 
 begin
   require 'lib/less'
+  require 'benchmark'
   
   task :compile do
+    abort "compiling isn't necessary anymore."
     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
-    print "benchmarking... "
-    less = File.read("spec/less/big.less")
-    start = Time.now.to_f
-    Less::Engine.new(less).parse
-    total = Time.now.to_f - start
-    puts "#{total}s"
+    #require 'profile'
+    puts "benchmarking... "
+    less, tree = File.read("spec/less/big.less"), nil
+    
+    parse = Benchmark.measure do
+      tree = Less::Engine.new(less).parse(false)
+    end.total.round(2)
+    
+    build = Benchmark.measure do
+      tree.build(Less::Node::Element.new)
+    end.total.round(2)
+    
+    puts "parse: #{parse}s\nbuild: #{build}s"
+    puts "------------"
+    puts "total: #{parse + build}s"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/less.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
@@ -23,11 +23,14 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/lessc",
      "less.gemspec",
+     "lib/ext.rb",
      "lib/less.rb",
      "lib/less/command.rb",
      "lib/less/engine.rb",
      "lib/less/engine/builder.rb",
-     "lib/less/engine/less.tt",
+     "lib/less/engine/grammar/common.tt",
+     "lib/less/engine/grammar/entity.tt",
+     "lib/less/engine/grammar/less.tt",
      "lib/less/engine/nodes.rb",
      "lib/less/engine/nodes/element.rb",
      "lib/less/engine/nodes/entity.rb",
@@ -36,7 +39,6 @@ Gem::Specification.new do |s|
      "lib/less/engine/nodes/property.rb",
      "lib/less/engine/nodes/ruleset.rb",
      "lib/less/engine/nodes/selector.rb",
-     "lib/less/engine/parser.rb",
      "lib/vendor/treetop/.gitignore",
      "lib/vendor/treetop/LICENSE",
      "lib/vendor/treetop/README",

data/lib/ext.rb

@@ -0,0 +1,62 @@
+module Treetop
+  module Runtime
+    class CompiledParser
+      def failure_message
+        return nil unless (tf = terminal_failures) && tf.size > 0
+        "on line #{failure_line}: expected " + (
+          tf.size == 1 ? 
+            tf[0].expected_string : 
+            "one of #{Less::YELLOW[tf.map {|f| f.expected_string }.uniq * ' ']}"
+        ) +
+        " got #{Less::YELLOW[input[failure_index]]}" +
+        " after:\n\n#{input[index...failure_index]}\n"
+      end
+    end
+  end
+end
+
+class Object
+  def verbose
+    $verbose = true
+    yield
+  ensure
+    $verbose = false
+  end
+  
+  def tap
+    yield self
+    self
+  end
+  
+  def log(s = '')  puts "* #{s}" if $verbose end
+  def log!(s = '') puts "* #{s}" end
+  def error(s) $stderr.puts s end
+  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
+  end
+end
+
+class Symbol
+  def to_proc
+    proc {|obj, *args| obj.send(self, *args) }
+  end
+end

data/lib/less/command.rb

@@ -14,7 +14,6 @@ module Less
       $verbose = options[:debug]
       @source = options[:source]
       @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, '.css'
-      @growl = Growl.new if options[:growl]
       @options = options
     end
 
@@ -95,10 +94,13 @@ module Less
     def err s = '', type = ''
       type = type.strip + ' ' unless type.empty?
       print "#{RED["! #{type}Error"]}: #{s}"
-      @growl.title = "LESS"
-      @growl.message = "#{type}Error in #@source!" if @options[:growl]
-      @growl.run
-      false
+      if @options[:growl]
+        growl = Growl.new
+        growl.title = "LESS"
+        growl.message = "#{type}Error in #@source!"
+        growl.run
+        false
+      end
     end
   end
 end

data/lib/less/engine/grammar/common.tt

@@ -0,0 +1,29 @@
+module Less
+  module StyleSheet
+    grammar Common
+      #
+      # Whitespace
+      #
+      rule s
+        [ ]*
+      end
+
+      rule S
+        [ ]+
+      end
+
+      rule ws
+        [\n ]*
+      end
+
+      rule WS
+        [\n ]+
+      end
+
+      # Non-space char
+      rule ns
+        ![ ;\n] .
+      end
+    end
+  end
+end

data/lib/less/engine/grammar/entity.tt

@@ -0,0 +1,139 @@
+module Less
+  module StyleSheet
+    grammar Entity
+      #
+      # Entity: Any whitespace delimited token
+      #
+      rule entity
+        function / fonts / keyword / accessor / variable / literal / important
+      end
+
+      rule fonts
+        font family:(s ',' s font)+ {
+          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
+            Node::Keyword.new(text_value)
+          end
+        } / string {
+          def build
+            Node::String.new(text_value)
+          end
+        }
+      end
+      
+      #
+      # Tokens which don't need to be evaluated
+      #
+      rule literal
+        color / (dimension / [-a-z]+) '/' dimension {
+          def build
+            Node::Anonymous.new(text_value)
+          end
+        } / number unit {
+          def build
+            Node::Number.new(number.text_value, unit.text_value)
+          end
+        } / string {
+          def build
+            Node::String.new(text_value)
+          end
+        }
+      end
+
+      # !important
+      rule important
+        '!important' {
+          def build
+            Node::Keyword.new(text_value)
+          end
+        }
+      end
+
+      #
+      # `blue`, `small`, `normal` etc.
+      #
+      rule keyword
+        [-a-zA-Z]+ !ns {
+          def build
+            Node::Keyword.new(text_value)
+          end
+        }
+      end
+
+      #
+      # 'hello world' / "hello world"
+      #
+      rule string
+        "'" content:(!"'" . )* "'" {
+          def value
+            content.text_value
+          end
+        } / ["] content:(!["] . )* ["] {
+          def value
+            content.text_value
+          end
+        }
+      end
+
+      #
+      # Numbers & Units
+      #
+      rule dimension
+        number unit
+      end
+
+      rule number
+        '-'? [0-9]* '.' [0-9]+ / '-'? [0-9]+
+      end
+
+      rule unit
+        ('px'/'em'/'pc'/'%'/'pt'/'cm'/'mm')?
+      end
+
+      #
+      # Color
+      #
+      rule color
+        '#' rgb {
+          def build
+            Node::Color.new(*rgb.build)
+          end
+        } / fn:(('hsl'/'rgb') 'a'?) arguments {
+          def build
+            Node::Function.new(fn.text_value, arguments.build.flatten)
+          end
+        }
+      end
+
+      #
+      # 00ffdd / 0fd
+      #
+      rule rgb
+        r:(hex hex) g:(hex hex) b:(hex hex) {
+          def build
+            [r.text_value, g.text_value, b.text_value]
+          end
+        } / r:hex g:hex b:hex {
+          def build
+            [r.text_value, g.text_value, b.text_value].map {|c| c * 2 }
+          end
+        }
+      end
+
+      rule hex
+        [a-fA-F0-9]
+      end
+    end
+  end
+end

data/lib/less/engine/grammar/less.tt

@@ -0,0 +1,271 @@
+module Less
+  grammar StyleSheet
+    include Common
+    include Entity
+    
+    rule primary
+      (declaration / ruleset / import / comment)+ <Builder> / declaration* <Builder> / import* <Builder> / comment*
+    end
+
+    rule comment
+      ws '/*' (!'*/' . )* '*/' ws / ws '//' (!"\n" .)* "\n" ws
+    end
+
+    #
+    # div, .class, body > p {...}
+    #
+    rule ruleset
+      selectors "{" ws primary ws "}" ws {
+        def build env
+          # Build the ruleset for each selector
+          selectors.build(env, :ruleset).each do |sel|
+            primary.build sel
+          end
+        end
+      } / ws selectors ';' ws {
+        def build env        
+          selectors.build(env, :mixin).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
+      }
+    end
+
+    rule import
+      "@import" S url:(string / url) medias? s ';' ws {
+        def build env
+          path = File.join(env.root.file, url.value)
+          path += '.less' unless path =~ /\.(le|c)ss$/
+          if File.exist? path
+            imported = Less::Engine.new(File.new(path)).to_tree
+            env.rules += imported.rules
+          else
+            raise ImportError, path
+          end
+        end
+      }
+    end
+
+    rule url
+      'url(' path:(string / [-a-zA-Z0-9_%$/.&=:;#+?]+) ')' {
+        def build env = nil
+          Node::String.new CGI.unescape(path.text_value)
+        end
+    
+        def value
+          build
+        end
+      }
+    end
+
+    rule medias
+      [-a-z]+ (s ',' s [a-z]+)*
+    end
+
+    rule selectors
+      ws selector tail:(s ',' ws selector)* ws {
+        def build env, method 
+          all.map do |e|
+            e.send(method, env) if e.respond_to? method
+          end.compact
+        end
+    
+        def all
+          [selector] + tail.elements.map {|e| e.selector }
+        end
+      }
+    end
+
+    #
+    # div > p a {...}
+    #
+    rule selector
+      sel:(s select element s)+ arguments? {
+        def ruleset env
+          sel.elements.inject(env) do |node, e|
+            node << Node::Element.new(e.element.text_value, e.select.text_value)
+            node.last
+          end
+        end
+    
+        def mixin env
+          sel.elements.map do |e|
+            Node::Element.new(e.element.text_value, e.select.text_value)
+          end
+        end
+      }
+    end
+
+    #
+    # @my-var: 12px;
+    # height: 100%;
+    #
+    rule declaration
+      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, expressions.build(env), env)
+        end
+      # Empty rule
+      } / ws ident s ':' s ';' ws
+    end
+
+    #
+    # An operation or compound value
+    #
+    rule expressions
+      # Operation
+      expression tail:(operator expression)+ {
+        def build env 
+          all.map {|e| e.build(env) }.dissolve
+        end
+
+        def all
+          [expression] + tail.elements.map {|i| [i.operator, i.expression] }.flatten.compact
+        end
+      # Space-delimited expressions
+      } / expression tail:(WS expression)* {
+        def build env
+          all.map {|e| e.build(env) if e.respond_to? :build }.compact
+        end
+        
+        def all
+          [expression] + tail.elements.map {|f| f.expression }
+        end
+      } 
+    end
+
+    rule expression
+      '(' s expressions s ')' {
+        def build env
+          Node::Expression.new(['('] + expressions.build(env).flatten + [')'])
+        end
+      } / entity '' {
+        def build env
+          entity.method(:build).arity.zero?? entity.build : entity.build(env)
+        end
+      }
+    end
+
+    #
+    # An identifier
+    #
+    rule ident
+      '*'? '-'? [-a-z0-9_]+
+    end
+
+    rule variable
+      '@' [-a-zA-Z0-9_]+  {
+        def build
+          Node::Variable.new(text_value)
+        end
+      }
+    end
+
+    #
+    # div / .class / #id / input[type="text"] / lang(fr)
+    #
+    rule element
+      (class_id / tag / ident) attribute* ('(' ident? attribute* ')')? / attribute+ / '@media' / '@font-face'
+    end
+
+    rule class_id
+      tag? (class / id)+
+    end
+
+    #
+    # [type="text"]
+    #
+    rule attribute
+      '[' tag ([|~*$^]? '=') (tag / string) ']' / '[' (tag / string) ']'
+    end
+
+    rule class
+      '.' [_a-z] [-a-zA-Z0-9_]*
+    end
+
+    rule id
+      '#' [_a-z] [-a-zA-Z0-9_]*
+    end
+
+    rule tag
+      [a-zA-Z] [-a-zA-Z]* [0-9]? / '*'
+    end
+
+    rule select
+      (s [+>~] s / s ':' / S)?
+    end
+
+    # TODO: Merge this with attribute rule
+    rule accessor
+      ident:(class_id / tag) '[' attr:(string / variable) ']' {
+        def build env
+          env.nearest(ident.text_value)[attr.text_value.delete(%q["'])].evaluate
+        end
+      }
+    end
+
+    rule operator
+      S [-+*/] S {
+        def build env
+          Node::Operator.new(text_value.strip)
+        end
+      } / [-+*/] {
+        def build env
+          Node::Operator.new(text_value)
+        end
+      }
+    end
+    
+    #
+    # Functions and arguments
+    #
+    rule function
+      name:([-a-zA-Z_]+) arguments {
+        def build
+          Node::Function.new(name.text_value, [arguments.build].flatten)
+        end
+      }
+    end
+
+    rule arguments
+      '(' s argument s tail:(',' s argument s)* ')' {
+        def build
+          all.map do |e|
+            e.build if e.respond_to? :build
+          end.compact
+        end
+  
+        def all
+          [argument] + tail.elements.map {|e| e.argument }
+        end
+      }
+    end
+
+    rule argument
+      color / number unit {
+        def build
+          Node::Number.new number.text_value, unit.text_value
+        end
+      } / string {
+        def build
+          Node::String.new text_value
+        end
+      } / [a-zA-Z]+ '=' dimension {
+        def build
+          Node::Anonymous.new text_value
+        end
+      } / [-a-zA-Z0-9_%$/.&=:;#+?]+ {
+        def build
+          Node::String.new text_value
+        end
+      } / function / keyword other:(S keyword)* {
+        def build
+        end
+      }
+    end
+  end
+end

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

@@ -36,6 +36,10 @@ module Less
 
       rgba hue[ h + 1/3 ], hue[ h ], hue[ h - 1/3 ], a
     end
+    
+    def self.available
+      self.instance_methods.map(&:to_sym)
+    end
   end
   
   module Node
@@ -45,31 +49,30 @@ module Less
     #   it calls functions from the Functions module
     #
     class Function < ::String
-      include Functions
       include Entity
+      include Functions
     
       def initialize name, *args
         @args = args.flatten
         super name
       end
-    
+      
       def to_css
         self.evaluate.to_css
       end
       
       #
       # Call the function
-      #
-      def evaluate
-        send self.to_sym, *@args
-      end
-      
       #
       # If the function isn't found, we just print it out,
       # this is the case for url(), for example,
       #
-      def method_missing meth, *args
-        Node::Anonymous.new("#{meth}(#{args.map(&:to_css) * ', '})")
+      def evaluate
+        if Functions.available.include? self.to_sym
+          send to_sym, *@args
+        else
+          Node::Anonymous.new("#{to_sym}(#{@args.map(&:to_css) * ', '})")
+        end
       end
     end
   end

data/lib/less/engine.rb

@@ -6,7 +6,9 @@ require 'engine/nodes'
 begin
   require 'engine/parser'
 rescue LoadError
-  Treetop.load LESS_GRAMMAR
+  Treetop.load File.join(LESS_GRAMMAR, 'common.tt')
+  Treetop.load File.join(LESS_GRAMMAR, 'entity.tt')
+  Treetop.load File.join(LESS_GRAMMAR, 'less.tt')
 end
 
 module Less
@@ -23,12 +25,14 @@ module Less
         raise ArgumentError, "argument must be an instance of File or String!"
       end
       
-      @parser = LessParser.new
+      @parser = StyleSheetParser.new
     end
     
-    def parse env = Node::Element.new
+    def parse build = true, env = Node::Element.new
       root = @parser.parse(self.prepare)
       
+      return root unless build
+      
       if root
         @tree = root.build env.tap {|e| e.file = @path }
       else