cloudhead-less 1.1.2 → 1.1.3

data/lib/less.rb

@@ -7,8 +7,9 @@ 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')
+LESS_GRAMMAR = File.join(LESS_ROOT, 'less', 'engine', 'grammar')
 
+require 'ext'
 require 'less/command'
 require 'less/engine'
 
@@ -30,66 +31,3 @@ module Less
     Engine.new(less).to_css
   end
 end
-
-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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - cloudhead
@@ -30,11 +30,14 @@ files:
 - 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
@@ -43,7 +46,6 @@ files:
 - 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/less/engine/less.tt

@@ -1,421 +0,0 @@
-grammar Less
-  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
-  
-  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
-  #
-  # TODO: we can refactor this, by separating entities from operators
-  rule expression
-    s '(' s expressions s ')' {
-      def build env
-        Node::Expression.new(['('] + expressions.build(env).flatten + [')'])
-      end
-    } / s 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
-    } / operator
-  end
-  
-  #
-  # 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
-  
-  #
-  # 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
-  
-  #
-  # 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
-      
-  #
-  # 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
-  
-  #
-  # Whitespace
-  #
-  rule s
-    [ ]*
-  end
-  
-  rule S
-    [ ]+
-  end
-  
-  rule ws
-    [\n ]*
-  end
-  
-  rule WS
-    [\n ]+
-  end
-  
-  # Non-space char
-  rule ns
-    ![ ;\n] .
-  end
-end