cloudhead-less 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/bin/lessc

@@ -34,10 +34,10 @@ opts = OptionParser.new do |o|
   
   # Growl
   o.on("-g", "--growl", "growl notifications") do
-    if Less::GROWL && Growl.installed?
+    if Less::GROWL && (Growl.installed? rescue false)
       options[:growl] = true
     elsif Less::GROWL
-      abort "Growl wasn't found on your system."
+      abort "Growl or 'growlnotify' wasn't found on your system."
     else
       abort "Growl gem not found, please install with: " +
             "`sudo gem install visionmedia-growl -s http://gems.github.com`"

data/less.gemspec

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

data/lib/less/engine/less.tt

@@ -104,7 +104,6 @@ grammar Less
       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
@@ -123,12 +122,13 @@ grammar Less
   #
   # An operation or compound value
   #
+  # TODO: we can refactor this, by separating entities from operators
   rule expression
-    s '(' s expressions s ')' s {
+    s '(' s expressions s ')' {
       def build env
         Node::Expression.new(['('] + expressions.build(env).flatten + [')'])
       end
-    } / entity tail:(operator entity)* ws {
+    } / s entity tail:(operator entity)* ws {
       def build env 
         exp = all.map do |e|
           e.method(:build).arity.zero?? 
@@ -140,7 +140,7 @@ grammar Less
       def all
         [entity] + tail.elements.map {|i| [i.operator, i.entity] }.flatten.compact
       end
-    }
+    } / operator
   end
   
   #
@@ -234,11 +234,11 @@ grammar Less
   
   rule operator
     S [-+*/] S {
-      def build
+      def build env
         Node::Operator.new(text_value.strip)
       end
     } / [-+*/] {
-      def build
+      def build env
         Node::Operator.new(text_value)
       end
     }
@@ -373,11 +373,7 @@ grammar Less
   end
   
   rule argument
-    color {
-      def build
-        Node::Color.new text_value
-      end
-    } / number unit {
+    color / number unit {
       def build
         Node::Number.new number.text_value, unit.text_value
       end
@@ -393,6 +389,9 @@ grammar Less
       def build
         Node::String.new text_value
       end
+    } / function / keyword other:(S keyword)* {
+      def build
+      end
     }
   end
   

data/lib/less/engine/parser.rb

@@ -1056,7 +1056,6 @@ module Less
     def build env
       env << (name.text_value =~ /^@/ ? 
         Node::Variable : Node::Property).new(name.text_value, expressions.build(env), env)
-
     end
   # Empty rule
   end
@@ -1314,9 +1313,6 @@ module Less
       elements[4]
     end
 
-    def s
-      elements[6]
-    end
   end
 
   module Expression1
@@ -1336,17 +1332,21 @@ module Less
   end
 
   module Expression3
-    def entity
+    def s
       elements[0]
     end
 
-    def tail
+    def entity
       elements[1]
     end
 
-    def ws
+    def tail
       elements[2]
     end
+
+    def ws
+      elements[3]
+    end
   end
 
   module Expression4
@@ -1402,10 +1402,6 @@ module Less
                 r7 = nil
               end
               s1 << r7
-              if r7
-                r8 = _nt_s
-                s1 << r8
-              end
             end
           end
         end
@@ -1422,52 +1418,61 @@ module Less
     if r1
       r0 = r1
     else
-      i9, s9 = index, []
-      r10 = _nt_entity
-      s9 << r10
-      if r10
-        s11, i11 = [], index
-        loop do
-          i12, s12 = index, []
-          r13 = _nt_operator
-          s12 << r13
-          if r13
-            r14 = _nt_entity
-            s12 << r14
-          end
-          if s12.last
-            r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-            r12.extend(Expression2)
-          else
-            @index = i12
-            r12 = nil
+      i8, s8 = index, []
+      r9 = _nt_s
+      s8 << r9
+      if r9
+        r10 = _nt_entity
+        s8 << r10
+        if r10
+          s11, i11 = [], index
+          loop do
+            i12, s12 = index, []
+            r13 = _nt_operator
+            s12 << r13
+            if r13
+              r14 = _nt_entity
+              s12 << r14
+            end
+            if s12.last
+              r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+              r12.extend(Expression2)
+            else
+              @index = i12
+              r12 = nil
+            end
+            if r12
+              s11 << r12
+            else
+              break
+            end
           end
-          if r12
-            s11 << r12
-          else
-            break
+          r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+          s8 << r11
+          if r11
+            r15 = _nt_ws
+            s8 << r15
           end
         end
-        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-        s9 << r11
-        if r11
-          r15 = _nt_ws
-          s9 << r15
-        end
       end
-      if s9.last
-        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-        r9.extend(Expression3)
-        r9.extend(Expression4)
+      if s8.last
+        r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+        r8.extend(Expression3)
+        r8.extend(Expression4)
       else
-        @index = i9
-        r9 = nil
+        @index = i8
+        r8 = nil
       end
-      if r9
-        r0 = r9
+      if r8
+        r0 = r8
       else
-        @index = i0
-        r0 = nil
+        r16 = _nt_operator
+        if r16
+          r0 = r16
+        else
+          @index = i0
+          r0 = nil
+        end
       end
     end
 
@@ -2630,13 +2635,13 @@ module Less
   end
 
   module Operator1
-    def build
+    def build env
       Node::Operator.new(text_value.strip)
     end
   end
 
   module Operator2
-    def build
+    def build env
       Node::Operator.new(text_value)
     end
   end
@@ -3947,12 +3952,6 @@ module Less
   end
 
   module Argument0
-    def build
-      Node::Color.new text_value
-    end
-  end
-
-  module Argument1
     def number
       elements[0]
     end
@@ -3962,36 +3961,61 @@ module Less
     end
   end
 
-  module Argument2
+  module Argument1
     def build
       Node::Number.new number.text_value, unit.text_value
     end
   end
 
-  module Argument3
+  module Argument2
     def build
       Node::String.new text_value
     end
   end
 
-  module Argument4
+  module Argument3
     def dimension
       elements[2]
     end
   end
 
-  module Argument5
+  module Argument4
     def build
       Node::Anonymous.new text_value
     end
   end
 
-  module Argument6
+  module Argument5
     def build
       Node::String.new text_value
     end
   end
 
+  module Argument6
+    def S
+      elements[0]
+    end
+
+    def keyword
+      elements[1]
+    end
+  end
+
+  module Argument7
+    def keyword
+      elements[0]
+    end
+
+    def other
+      elements[1]
+    end
+  end
+
+  module Argument8
+    def build
+    end
+  end
+
   def _nt_argument
     start_index = index
     if node_cache[:argument].has_key?(index)
@@ -4002,7 +4026,6 @@ module Less
 
     i0 = index
     r1 = _nt_color
-    r1.extend(Argument0)
     if r1
       r0 = r1
     else
@@ -4015,8 +4038,8 @@ module Less
       end
       if s2.last
         r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        r2.extend(Argument0)
         r2.extend(Argument1)
-        r2.extend(Argument2)
       else
         @index = i2
         r2 = nil
@@ -4025,7 +4048,7 @@ module Less
         r0 = r2
       else
         r5 = _nt_string
-        r5.extend(Argument3)
+        r5.extend(Argument2)
         if r5
           r0 = r5
         else
@@ -4067,8 +4090,8 @@ module Less
           end
           if s6.last
             r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            r6.extend(Argument3)
             r6.extend(Argument4)
-            r6.extend(Argument5)
           else
             @index = i6
             r6 = nil
@@ -4095,13 +4118,59 @@ module Less
               r11 = nil
             else
               r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-              r11.extend(Argument6)
+              r11.extend(Argument5)
             end
             if r11
               r0 = r11
             else
-              @index = i0
-              r0 = nil
+              r13 = _nt_function
+              if r13
+                r0 = r13
+              else
+                i14, s14 = index, []
+                r15 = _nt_keyword
+                s14 << r15
+                if r15
+                  s16, i16 = [], index
+                  loop do
+                    i17, s17 = index, []
+                    r18 = _nt_S
+                    s17 << r18
+                    if r18
+                      r19 = _nt_keyword
+                      s17 << r19
+                    end
+                    if s17.last
+                      r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
+                      r17.extend(Argument6)
+                    else
+                      @index = i17
+                      r17 = nil
+                    end
+                    if r17
+                      s16 << r17
+                    else
+                      break
+                    end
+                  end
+                  r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+                  s14 << r16
+                end
+                if s14.last
+                  r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+                  r14.extend(Argument7)
+                  r14.extend(Argument8)
+                else
+                  @index = i14
+                  r14 = nil
+                end
+                if r14
+                  r0 = r14
+                else
+                  @index = i0
+                  r0 = nil
+                end
+              end
             end
           end
         end

data/spec/css/parens.css

@@ -4,4 +4,13 @@
   width: 36;
   padding: 2px 36px;
 }
-.more-parens { padding: 8 4 4 4px; }
+.more-parens {
+  padding: 8 4 4 4px;
+  width: 96;
+  height: 113;
+  margin: 12;
+}
+.nested-parens {
+  width: 71;
+  height: 6;
+}

data/spec/less/parens.less

@@ -9,7 +9,13 @@
 .more-parens {
   @var: (2 * 2);
   padding: (2 * @var) 4 4 (@var * 1px);
-  //width: (@var * @var) * 6;
+  width: (@var * @var) * 6;
+  height: (7 * 7) + (8 * 8);
+  margin: 4 * (5 + 5) / 2 - (@var * 2);
   //margin: (6 * 6)px;
-  //height: (7 * 7) + (8 * 8);
 }
+
+.nested-parens {
+  width: 2 * (4 * (2 + (1 + 6))) - 1;
+  height: ((2+3)*(2+3) / (9-4)) + 1;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: lessc
 dependencies: []
 
@@ -186,6 +186,7 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.lesscss.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: less
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: LESS compiler