less 0.8.13 → 1.0.4

data/README.md

@@ -27,4 +27,13 @@ LESS allows you to write CSS the way (I think) it was meant to, that is: with *v
 If you have CSS nightmares, just 
 	$ lessc style.less
 
-For more information, see you at http://lesscss.org
+For more information, see you at [http://lesscss.org]
+
+People without whom this wouldn't have happened a.k.a *Credits*
+---------------------------------------------------------------
+
+- **Dmitry Fadeyev**, for pushing me to do this, and designing our awesome website
+- **August Lilleaas**, for initiating the work on the treetop grammar, as well as writing the rails plugin
+- **Nathan Sobo**, for creating treetop
+- **Jason Garber**, for his magical performance optimizations on treetop
+- And finally, the people of #ruby-lang for answering all my ruby questions. **apeiros**, **manveru** and **rue** come to mind

data/Rakefile

@@ -3,7 +3,7 @@ begin
   Jeweler::Tasks.new do |s|
     s.name        = "less"
     s.authors     = ["cloudhead"]
-    s.email       = "alexis@cloudhead.net"
+    s.email       = "self@cloudhead.net"
     s.summary     = "LESS compiler"
     s.homepage    = "http://www.lesscss.org"
     s.description = "LESS is leaner CSS"
@@ -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"]
 
@@ -58,4 +57,23 @@ begin
     t.rcov = true
     t.rcov_opts = ['--exclude', '^spec,/gems/']
   end
-end
+end
+
+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) }
+  end
+  
+  task :benchmark do
+    print "benchmarking... "
+    less = File.read("spec/less/big-1.0.less")
+    start = Time.now.to_f
+    Less::Engine.new(less).parse
+    total = Time.now.to_f - start
+    puts "#{total}s"
+  end
+end
+

data/VERSION

@@ -1 +1 @@
-0.8.13
+1.0.4

data/bin/lessc

@@ -5,14 +5,11 @@ $:.unshift File.dirname(__FILE__) + "/../lib"
 require 'optparse'
 require 'less'
 
-CSS = '.css'
-
 # Argument defaults
 options = {
   :watch => false,
   :compress => false,
   :debug => false,
-  :inheritance => :desc
 }
 
 # Get arguments
@@ -25,11 +22,6 @@ opts = OptionParser.new do |o|
     options[:watch] = true
   end
   
-  # Child-type inheritance
-  o.on("-c", "--child", "nesting uses child-type inheritance") do
-    options[:chain] = :child
-  end
-  
   # Compression needs a proper algorithm
   #
   #  o.on("-x", "--compress", "compress css file") do

data/less.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.8.13"
+  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-06-23}
+  s.date = %q{2009-07-13}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
-  s.email = %q{alexis@cloudhead.net}
+  s.email = %q{self@cloudhead.net}
   s.executables = ["lessc"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,20 +26,144 @@ Gem::Specification.new do |s|
      "lib/less.rb",
      "lib/less/command.rb",
      "lib/less/engine.rb",
-     "lib/less/tree.rb",
+     "lib/less/engine/builder.rb",
+     "lib/less/engine/less.tt",
+     "lib/less/engine/nodes.rb",
+     "lib/less/engine/nodes/element.rb",
+     "lib/less/engine/nodes/entity.rb",
+     "lib/less/engine/nodes/function.rb",
+     "lib/less/engine/nodes/literal.rb",
+     "lib/less/engine/nodes/property.rb",
+     "lib/less/engine/nodes/selector.rb",
+     "lib/less/engine/parser.rb",
+     "lib/vendor/treetop/.gitignore",
+     "lib/vendor/treetop/LICENSE",
+     "lib/vendor/treetop/README",
+     "lib/vendor/treetop/Rakefile",
+     "lib/vendor/treetop/benchmark/seqpar.gnuplot",
+     "lib/vendor/treetop/benchmark/seqpar.treetop",
+     "lib/vendor/treetop/benchmark/seqpar_benchmark.rb",
+     "lib/vendor/treetop/bin/tt",
+     "lib/vendor/treetop/lib/treetop.rb",
+     "lib/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb",
+     "lib/vendor/treetop/lib/treetop/compiler.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/metagrammar.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/metagrammar.treetop",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb",
+     "lib/vendor/treetop/lib/treetop/compiler/ruby_builder.rb",
+     "lib/vendor/treetop/lib/treetop/ruby_extensions.rb",
+     "lib/vendor/treetop/lib/treetop/ruby_extensions/string.rb",
+     "lib/vendor/treetop/lib/treetop/runtime.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/compiled_parser.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/syntax_node.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb",
+     "lib/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb",
+     "lib/vendor/treetop/lib/treetop/version.rb",
+     "lib/vendor/treetop/spec/compiler/and_predicate_spec.rb",
+     "lib/vendor/treetop/spec/compiler/anything_symbol_spec.rb",
+     "lib/vendor/treetop/spec/compiler/character_class_spec.rb",
+     "lib/vendor/treetop/spec/compiler/choice_spec.rb",
+     "lib/vendor/treetop/spec/compiler/circular_compilation_spec.rb",
+     "lib/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb",
+     "lib/vendor/treetop/spec/compiler/grammar_compiler_spec.rb",
+     "lib/vendor/treetop/spec/compiler/grammar_spec.rb",
+     "lib/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb",
+     "lib/vendor/treetop/spec/compiler/not_predicate_spec.rb",
+     "lib/vendor/treetop/spec/compiler/one_or_more_spec.rb",
+     "lib/vendor/treetop/spec/compiler/optional_spec.rb",
+     "lib/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb",
+     "lib/vendor/treetop/spec/compiler/parsing_rule_spec.rb",
+     "lib/vendor/treetop/spec/compiler/sequence_spec.rb",
+     "lib/vendor/treetop/spec/compiler/terminal_spec.rb",
+     "lib/vendor/treetop/spec/compiler/terminal_symbol_spec.rb",
+     "lib/vendor/treetop/spec/compiler/test_grammar.treetop",
+     "lib/vendor/treetop/spec/compiler/test_grammar.tt",
+     "lib/vendor/treetop/spec/compiler/test_grammar_do.treetop",
+     "lib/vendor/treetop/spec/compiler/zero_or_more_spec.rb",
+     "lib/vendor/treetop/spec/composition/a.treetop",
+     "lib/vendor/treetop/spec/composition/b.treetop",
+     "lib/vendor/treetop/spec/composition/c.treetop",
+     "lib/vendor/treetop/spec/composition/d.treetop",
+     "lib/vendor/treetop/spec/composition/f.treetop",
+     "lib/vendor/treetop/spec/composition/grammar_composition_spec.rb",
+     "lib/vendor/treetop/spec/composition/subfolder/e_includes_c.treetop",
+     "lib/vendor/treetop/spec/ruby_extensions/string_spec.rb",
+     "lib/vendor/treetop/spec/runtime/compiled_parser_spec.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb",
+     "lib/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb",
+     "lib/vendor/treetop/spec/runtime/syntax_node_spec.rb",
+     "lib/vendor/treetop/spec/spec_helper.rb",
+     "lib/vendor/treetop/spec/spec_suite.rb",
+     "lib/vendor/treetop/treetop.gemspec",
      "spec/command_spec.rb",
-     "spec/css/less-0.8.10.css",
-     "spec/css/less-0.8.11.css",
-     "spec/css/less-0.8.12.css",
-     "spec/css/less-0.8.5.css",
-     "spec/css/less-0.8.6.css",
-     "spec/css/less-0.8.7.css",
-     "spec/css/less-0.8.8.css",
+     "spec/css/accessors-1.0.css",
+     "spec/css/big-1.0.css",
+     "spec/css/comments-1.0.css",
+     "spec/css/css-1.0.css",
+     "spec/css/functions-1.0.css",
+     "spec/css/import-1.0.css",
+     "spec/css/mixins-1.0.css",
+     "spec/css/operations-1.0.css",
+     "spec/css/rulesets-1.0.css",
+     "spec/css/scope-1.0.css",
+     "spec/css/strings-1.0.css",
+     "spec/css/variables-1.0.css",
+     "spec/css/whitespace-1.0.css",
      "spec/engine_spec.rb",
+     "spec/less/accessors-1.0.less",
+     "spec/less/big-1.0.less",
+     "spec/less/colors-1.0.less",
+     "spec/less/comments-1.0.less",
+     "spec/less/css-1.0.less",
+     "spec/less/exceptions/mixed-units-error.less",
+     "spec/less/exceptions/name-error-1.0.less",
+     "spec/less/exceptions/syntax-error-1.0.less",
+     "spec/less/functions-1.0.less",
+     "spec/less/import-1.0.less",
+     "spec/less/import/import-test-a.less",
+     "spec/less/import/import-test-b.less",
+     "spec/less/import/import-test-c.less",
+     "spec/less/mixins-1.0.less",
+     "spec/less/operations-1.0.less",
+     "spec/less/rulesets-1.0.less",
+     "spec/less/scope-1.0.less",
+     "spec/less/strings-1.0.less",
+     "spec/less/variables-1.0.less",
+     "spec/less/whitespace-1.0.less",
      "spec/spec.css",
      "spec/spec.less",
-     "spec/spec_helper.rb",
-     "spec/tree_spec.rb"
+     "spec/spec_helper.rb"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://www.lesscss.org}
@@ -51,8 +175,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/command_spec.rb",
      "spec/engine_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/tree_spec.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/less.rb

@@ -1,24 +1,80 @@
-$:.unshift File.dirname(__FILE__)
+$:.unshift File.join(File.dirname(__FILE__), 'vendor', 'treetop', 'lib'), 
+           File.dirname(__FILE__)
 
 require 'cgi'
+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'
-require 'less/tree'
 
-module Less
-  MixedUnitsError = Class.new(Exception)
-  PathError = Class.new(Exception)
-  CompoundOperationError = Class.new(Exception)
+module Less  
+  MixedUnitsError   = Class.new(Exception)
+  PathError         = Class.new(Exception)
+  VariableNameError = Class.new(NameError)
+  MixinNameError    = Class.new(NameError)
+  SyntaxError       = Class.new(RuntimeError)
+  ImportError       = Class.new(Exception)
+  
+  $verbose = false
 
   def self.version
-    File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') )
+    File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') ).strip
+  end
+  
+  def self.parse 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 #{tf.map {|f| f.expected_string }.uniq * ' '}"
+        ) +
+        " got `#{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 Class
+  def to_sym
+    self.to_s.to_sym
   end
 end
 
-class Hash
-  # Convert a hash into a Tree
-  def to_tree
-    Less::Tree.new self
+class Symbol
+  def to_proc
+    proc {|obj, *args| obj.send(self, *args) }
   end
 end

data/lib/less/command.rb

@@ -1,12 +1,11 @@
 module Less
   class Command
-    CSS = '.css'
-
     attr_accessor :source, :destination, :options
 
     def initialize options
+      $verbose = options[:debug]
       @source = options[:source]
-      @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, CSS
+      @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, '.css'
       @options = options
     end
 
@@ -16,9 +15,9 @@ module Less
 
     # little function which allows us to
     # Ctrl-C exit inside the passed block
-    def watch &block
+    def watch
       begin
-        block.call
+        yield
       rescue Interrupt
         puts
         exit 0
@@ -26,10 +25,10 @@ module Less
     end
 
     def run!
-      compile(true) unless File.exist? @destination
+      parse(true) unless File.exist? @destination
 
       if watch?
-        log "Watching for changes in #@source ...Ctrl-C to abort.\n"
+        log "Watching for changes in #@source... Ctrl-C to abort.\n: "
 
         # Main watch loop
         loop do
@@ -37,55 +36,55 @@ module Less
 
           # File has changed
           if File.stat( @source ).mtime > File.stat( @destination ).mtime
-            log "Change detected... "
+            print "Change detected... "
 
             # Loop until error is fixed
-            until compile
-              log "Press [enter] to continue..."
+            until parse
+              log "Press [return] to continue..."
               watch { $stdin.gets }
             end
           end
         end
       else
-        compile
+        parse
       end
     end
 
-    def compile new = false
+    def parse new = false
       begin
         # Create a new Less object with the contents of a file
-        css = Less::Engine.new( File.read( @source ) ).to_css @options[:inheritance]
+        css = Less::Engine.new(File.new @source).to_css
         css = css.delete " \n" if compress?
 
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        puts "#{new ? '* [Created]' : ' [Updated]'} #{@destination.split('/').last}" if watch?
+        print "#{new ? '* [Created]' : '* [Updated]'} #{@destination.split('/').last}\n: " if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
-      rescue SyntaxError
-        error = debug?? $! : $!.message.split("\n")[1..-1].collect {|e|
-          e.gsub(/\(eval\)\:(\d+)\:\s/, 'line \1: ')
-        } * "\n"
-        err "errors were found in the .less file! \n#{error}\n"
+      rescue SyntaxError => e
+        err "#{e}\n", "Parse"
       rescue MixedUnitsError => e
         err "`#{e}` you're  mixing units together! What do you expect?\n"
-      rescue CompoundOperationError => e
-        err "`#{e}` operations in compound declarations aren't allowed, sorry!\n"
       rescue PathError => e
-        err "`#{e}` was not found.\n"
+        err "`#{e}` was not found.\n", "Path"
+      rescue VariableNameError => e
+        err "`#{e}` is undefined.\n", "Name"
+      rescue MixinNameError => e
+        err "`#{e}` is undefined.\n", "Name"
       else
         true
       end
     end
 
-    # Just a logging function to avoid typing '}'
+    # Just a logging function to avoid typing '*'
     def log s = ''
       print '* ' + s.to_s
     end
 
-    def err s = ''
-      print "!! #{s}"
+    def err s = '', type = ''
+      type = type.strip + ' ' unless type.empty?
+      print "! [#{type}Error] #{s}"
     end
   end
 end