treetop 1.4.4 → 1.4.5

data/Rakefile

@@ -1,29 +1,25 @@
-dir = File.dirname(__FILE__)
 require 'rubygems'
 require 'rake'
-$LOAD_PATH.unshift(File.join(dir, 'vendor', 'rspec', 'lib'))
-require 'spec/rake/spectask'
-
 require 'rake/gempackagetask'
+require 'spec/rake/spectask'
 
 task :default => :spec
-
 Spec::Rake::SpecTask.new do |t|
   t.pattern = 'spec/**/*spec.rb'
+  t.libs << 'spec'
 end
 
 load "./treetop.gemspec"
-
 Rake::GemPackageTask.new($gemspec) do |pkg|
   pkg.need_tar = true
 end
 
-task :spec => :regenerate_metagrammar
-task :regenerate_metagrammar => 'lib/treetop/compiler/metagrammar.treetop' do |t|
+task :spec => 'lib/treetop/compiler/metagrammar.treetop'
+file 'lib/treetop/compiler/metagrammar.treetop' do |t|
   unless $bootstrapped_gen_1_metagrammar
-    load File.join(File.dirname(__FILE__), 'lib', 'treetop', 'bootstrap_gen_1_metagrammar.rb')
+    load File.expand_path('../lib/treetop/bootstrap_gen_1_metagrammar.rb', __FILE__)
   end
-  
+
   Treetop::Compiler::GrammarCompiler.new.compile(METAGRAMMAR_PATH)
 end
 

data/bin/tt

@@ -5,10 +5,11 @@ require 'rubygems'
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'treetop'
 require 'treetop/version'
+require 'treetop/polyglot'
 
 options = {}
 parser = OptionParser.new do |opts|
-  exts = Treetop::VALID_GRAMMAR_EXT.collect { |i| '.' + i }
+  exts = Treetop::Polyglot::VALID_GRAMMAR_EXT.collect { |i| '.' + i }
 
   opts.banner = "Treetop Parsing Expression Grammar (PEG) Comand Line Compiler"
   opts.define_head "Usage: tt [options] grammar_file[#{exts.join('|')}] ..."
@@ -57,7 +58,7 @@ end
 
 def grammar_exist?(filename)
   if File.extname(filename).empty?
-    Treetop::VALID_GRAMMAR_EXT.each do |ext|
+    Treetop::Polyglot::VALID_GRAMMAR_EXT.each do |ext|
       fn_ext = "#{filename}.#{ext}"
       return true if File.exist?(fn_ext) && !File.zero?(fn_ext)
     end
@@ -67,7 +68,7 @@ end
 
 def full_grammar_filename(filename)
   return filename if !File.extname(filename).empty?
-  Treetop::VALID_GRAMMAR_EXT.each do |ext|
+  Treetop::Polyglot::VALID_GRAMMAR_EXT.each do |ext|
     fn_ext = "#{filename}.#{ext}"
     return fn_ext if File.exist?(fn_ext) && !File.zero?(fn_ext)
   end
@@ -96,7 +97,7 @@ while !file_list.empty?
 
   # try to compile
   treetop_file = full_grammar_filename(treetop_file)
-  std_output_file = treetop_file.gsub(Treetop::VALID_GRAMMAR_EXT_REGEXP, '.rb')
+  std_output_file = treetop_file.gsub(Treetop::Polyglot::VALID_GRAMMAR_EXT_REGEXP, '.rb')
 
   if options[:out_file]
     # explicit output file name option; never overwrite unless forced

data/doc/using_in_ruby.markdown

@@ -8,6 +8,13 @@ You can `.treetop` files into Ruby source code with the `tt` command line script
 ##Loading A Grammar Directly
 The Polyglot gem makes it possible to load `.treetop` or `.tt` files directly with `require`. This will invoke `Treetop.load`, which automatically compiles the grammar to Ruby and then evaluates the Ruby source. If you are getting errors in methods you define on the syntax tree, try using the command line compiler for better stack trace feedback. A better solution to this issue is in the works.
 
+In order to use Polyglot dynamic loading of `.treetop` or `.tt` files though, you need to require the Polyglot gem before you require the Treetop gem as Treetop will only create hooks into Polyglot for the treetop files if Polyglot is already loaded.  So you need to use:
+
+    require 'polyglot'
+    require 'treetop'
+
+in order to use Polyglot auto loading with Treetop in Ruby.
+
 ##Instantiating and Using Parsers
 If a grammar by the name of `Foo` is defined, the compiled Ruby source will define a `FooParser` class. To parse input, create an instance and call its `parse` method with a string. The parser will return the syntax tree of the match or `nil` if there is a failure.
 

data/lib/treetop.rb

@@ -1,16 +1,3 @@
-require 'rubygems'
-
-module Treetop
-  VALID_GRAMMAR_EXT = ['treetop', 'tt']
-  VALID_GRAMMAR_EXT_REGEXP = /\.(#{VALID_GRAMMAR_EXT.join('|')})\Z/o
-end
-
-dir = File.dirname(__FILE__)
-
-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::VALID_GRAMMAR_EXT, Treetop)
+require 'treetop/runtime'
+require 'treetop/compiler'
+require 'treetop/polyglot'

data/lib/treetop/bootstrap_gen_1_metagrammar.rb

@@ -2,28 +2,25 @@
 # into the environment by compiling the current metagrammar.treetop using a trusted version of Treetop.
 
 require 'rubygems'
-dir = File.dirname(__FILE__)
 
 TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP = '>= 1.1.5'
 
 # Loading trusted version of Treetop to compile the compiler
 gem_spec = Gem.source_index.find_name('treetop', TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP).last
 raise "Install a Treetop Gem version #{TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP} to bootstrap." unless gem_spec
-trusted_treetop_path = gem_spec.full_gem_path
-require File.join(trusted_treetop_path, 'lib', 'treetop')
+require "#{gem_spec.full_gem_path}/lib/treetop"
 
 # Relocating trusted version of Treetop to Trusted::Treetop
 Trusted = Module.new
 Trusted::Treetop = Treetop
 Object.send(:remove_const, :Treetop)
-Object.send(:remove_const, :TREETOP_ROOT)
 
 # Requiring version of Treetop that is under test
 $exclude_metagrammar = true
-require File.expand_path(File.join(dir, '..', 'treetop'))
+require File.expand_path('../treetop')
 
 # Compile and evaluate freshly generated metagrammar source
-METAGRAMMAR_PATH = File.join(TREETOP_ROOT, 'compiler', 'metagrammar.treetop')
+METAGRAMMAR_PATH = File.expand_path('../compiler/metagrammar.treetop', __FILE__)
 compiled_metagrammar_source = Trusted::Treetop::Compiler::GrammarCompiler.new.ruby_source(METAGRAMMAR_PATH)
 Object.class_eval(compiled_metagrammar_source)
 
@@ -42,4 +39,4 @@ Object.class_eval(compiled_metagrammar_source)
 #   include Trusted::Treetop::Runtime
 # end
 
-$bootstrapped_gen_1_metagrammar = true
+$bootstrapped_gen_1_metagrammar = true

data/lib/treetop/compiler.rb

@@ -1,6 +1,7 @@
-dir = File.dirname(__FILE__)
-require File.join(dir, *%w[compiler lexical_address_space])
-require File.join(dir, *%w[compiler ruby_builder])
-require File.join(dir, *%w[compiler node_classes])
-require File.join(dir, *%w[compiler metagrammar]) unless defined?($exclude_metagrammar)
-require File.join(dir, *%w[compiler grammar_compiler])
+require 'treetop/ruby_extensions'
+
+require 'treetop/compiler/lexical_address_space'
+require 'treetop/compiler/ruby_builder'
+require 'treetop/compiler/node_classes'
+require 'treetop/compiler/metagrammar' unless defined?($exclude_metagrammar)
+require 'treetop/compiler/grammar_compiler'

data/lib/treetop/compiler/metagrammar.rb

@@ -7,7 +7,7 @@ module Treetop
       include Treetop::Runtime
 
       def root
-        @root || :treetop_file
+        @root ||= :treetop_file
       end
 
       module TreetopFile0

data/lib/treetop/compiler/node_classes.rb

@@ -1,20 +1,19 @@
-dir = File.dirname(__FILE__)
-require File.join(dir, *%w[node_classes parsing_expression])
-require File.join(dir, *%w[node_classes atomic_expression])
-require File.join(dir, *%w[node_classes inline_module])
-require File.join(dir, *%w[node_classes predicate_block])
-require File.join(dir, *%w[node_classes treetop_file])
-require File.join(dir, *%w[node_classes grammar])
-require File.join(dir, *%w[node_classes declaration_sequence])
-require File.join(dir, *%w[node_classes parsing_rule])
-require File.join(dir, *%w[node_classes parenthesized_expression])
-require File.join(dir, *%w[node_classes nonterminal])
-require File.join(dir, *%w[node_classes terminal])
-require File.join(dir, *%w[node_classes anything_symbol])
-require File.join(dir, *%w[node_classes character_class])
-require File.join(dir, *%w[node_classes sequence])
-require File.join(dir, *%w[node_classes choice])
-require File.join(dir, *%w[node_classes repetition])
-require File.join(dir, *%w[node_classes optional])
-require File.join(dir, *%w[node_classes predicate])
-require File.join(dir, *%w[node_classes transient_prefix])
+require 'treetop/compiler/node_classes/parsing_expression'
+require 'treetop/compiler/node_classes/atomic_expression'
+require 'treetop/compiler/node_classes/inline_module'
+require 'treetop/compiler/node_classes/predicate_block'
+require 'treetop/compiler/node_classes/treetop_file'
+require 'treetop/compiler/node_classes/grammar'
+require 'treetop/compiler/node_classes/declaration_sequence'
+require 'treetop/compiler/node_classes/parsing_rule'
+require 'treetop/compiler/node_classes/parenthesized_expression'
+require 'treetop/compiler/node_classes/nonterminal'
+require 'treetop/compiler/node_classes/terminal'
+require 'treetop/compiler/node_classes/anything_symbol'
+require 'treetop/compiler/node_classes/character_class'
+require 'treetop/compiler/node_classes/sequence'
+require 'treetop/compiler/node_classes/choice'
+require 'treetop/compiler/node_classes/repetition'
+require 'treetop/compiler/node_classes/optional'
+require 'treetop/compiler/node_classes/predicate'
+require 'treetop/compiler/node_classes/transient_prefix'

data/lib/treetop/compiler/node_classes/declaration_sequence.rb

@@ -5,7 +5,7 @@ module Treetop
       def compile(builder)
         unless rules.empty?
           builder.method_declaration("root") do
-            builder << "@root || :#{rules.first.name}"
+            builder << "@root ||= :#{rules.first.name}"
           end
           builder.newline
         end

data/lib/treetop/compiler/ruby_builder.rb

@@ -1,3 +1,5 @@
+require 'treetop/ruby_extensions/string'
+
 module Treetop
   module Compiler
     class RubyBuilder

data/lib/treetop/polyglot.rb

@@ -0,0 +1,9 @@
+module Treetop
+  module Polyglot
+    VALID_GRAMMAR_EXT = ['treetop', 'tt']
+    VALID_GRAMMAR_EXT_REGEXP = /\.(#{VALID_GRAMMAR_EXT.join('|')})\Z/o
+  end
+end
+
+require 'polyglot'
+Polyglot.register(Treetop::Polyglot::VALID_GRAMMAR_EXT, Treetop)

data/lib/treetop/ruby_extensions.rb

@@ -1,2 +1 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/ruby_extensions/string"
+require 'treetop/ruby_extensions/string'

data/lib/treetop/runtime.rb

@@ -1,5 +1,6 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/runtime/compiled_parser"
-require "#{dir}/runtime/syntax_node"
-require "#{dir}/runtime/terminal_parse_failure"
-require "#{dir}/runtime/interval_skip_list"
+require 'treetop/ruby_extensions'
+
+require 'treetop/runtime/compiled_parser'
+require 'treetop/runtime/syntax_node'
+require 'treetop/runtime/terminal_parse_failure'
+require 'treetop/runtime/interval_skip_list'

data/lib/treetop/runtime/compiled_parser.rb

@@ -2,12 +2,12 @@ module Treetop
   module Runtime
     class CompiledParser
       include Treetop::Runtime
-      
+
       attr_reader :input, :index, :max_terminal_failure_index
       attr_writer :root
       attr_accessor :consume_all_input
       alias :consume_all_input? :consume_all_input
-      
+
       def initialize
         self.consume_all_input = true
       end
@@ -43,17 +43,21 @@ module Treetop
                 " at line #{failure_line}, column #{failure_column} (byte #{failure_index+1})" +
                 " after #{input[index...failure_index]}"
       end
-      
+
       def terminal_failures
-        @terminal_failures.map! {|tf_ary| TerminalParseFailure.new(*tf_ary) }
+        if @terminal_failures.empty? || @terminal_failures[0].is_a?(TerminalParseFailure)
+          @terminal_failures
+        else
+          @terminal_failures.map! {|tf_ary| TerminalParseFailure.new(*tf_ary) }
+        end
       end
 
 
       protected
-      
+
       attr_reader :node_cache, :input_length
       attr_writer :index
-              
+
       def prepare_to_parse(input)
         @input = input
         @input_length = input.length
@@ -63,11 +67,11 @@ module Treetop
         @terminal_failures = []
         @max_terminal_failure_index = 0
       end
-      
+
       def reset_index
         @index = 0
       end
-      
+
       def parse_anything(node_class = SyntaxNode, inline_module = nil)
         if index < input.length
           result = instantiate_node(node_class,input, index...(index + 1))
@@ -78,15 +82,15 @@ module Treetop
           terminal_parse_failure("any character")
         end
       end
-    
+
       def instantiate_node(node_type,*args)
-        if node_type.respond_to? :new 
+        if node_type.respond_to? :new
           node_type.new(*args)
         else
           SyntaxNode.new(*args).extend(node_type)
         end
       end
-    
+
       def has_terminal?(terminal, regex, index)
         if regex
           rx = @regexps[terminal] ||= Regexp.new(terminal)
@@ -95,7 +99,7 @@ module Treetop
           input[index, terminal.size] == terminal
         end
       end
-    
+
       def terminal_parse_failure(expected_string)
         return nil if index < max_terminal_failure_index
         if index > max_terminal_failure_index

data/lib/treetop/runtime/interval_skip_list.rb

@@ -1,4 +1,3 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/interval_skip_list/interval_skip_list.rb"
-require "#{dir}/interval_skip_list/head_node.rb"
-require "#{dir}/interval_skip_list/node.rb"
+require 'treetop/runtime/interval_skip_list/interval_skip_list'
+require 'treetop/runtime/interval_skip_list/head_node'
+require 'treetop/runtime/interval_skip_list/node'

data/lib/treetop/version.rb

@@ -2,7 +2,7 @@ module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 4
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors: 
 - Nathan Sobo
@@ -9,7 +9,7 @@ autorequire: treetop
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +11:00
+date: 2010-03-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.3.1
     version: 
 description: 
 email: nathansobo@gmail.com
@@ -61,6 +61,7 @@ files:
 - lib/treetop/compiler/node_classes.rb
 - lib/treetop/compiler/ruby_builder.rb
 - lib/treetop/compiler.rb
+- lib/treetop/polyglot.rb
 - lib/treetop/ruby_extensions/string.rb
 - lib/treetop/ruby_extensions.rb
 - lib/treetop/runtime/compiled_parser.rb