treetop 1.2.4 → 1.2.5

data/Rakefile

@@ -13,23 +13,8 @@ Spec::Rake::SpecTask.new do |t|
   t.pattern = 'spec/**/*spec.rb'
 end
 
-gemspec = Gem::Specification.new do |s|
-  s.name = "treetop"
-  s.version = "1.2.4"
-  s.author = "Nathan Sobo"
-  s.email = "nathansobo@gmail.com"
-  s.homepage = "http://functionalform.blogspot.com"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "A Ruby-based text parsing and interpretation DSL"
-  s.files = FileList["README", "Rakefile", "{test,lib,bin,doc,examples}/**/*"].to_a
-  s.bindir = "bin"
-  s.executables = ["tt"]
-  s.require_path = "lib"
-  s.autorequire = "treetop"
-  s.has_rdoc = false
-  s.add_dependency "polyglot"
-end
+load "./treetop.gemspec"
 
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Rake::GemPackageTask.new($gemspec) do |pkg|
   pkg.need_tar = true
 end

data/bin/tt

@@ -12,14 +12,17 @@ end
 
 compiler = Treetop::Compiler::GrammarCompiler.new
 
-# explicit output file name option
-if ARGV.size == 3 && ARGV[1] == '-o'
-  compiler.compile(ARGV[0], ARGV[2])
-  exit
-end
-
-# list of input files option
-treetop_files = ARGV
-treetop_files.each do |treetop_file_path|
-  compiler.compile(treetop_file_path)
+while !ARGV.empty?
+  treetop_file = ARGV.shift
+  if !File.exist?(treetop_file)
+    puts "Error: file '#{treetop_file}' doesn't exist\n\n"
+    exit(2) 
+  end
+  if ARGV.size >= 2 && ARGV[1] == '-o'
+    ARGV.shift	  # explicit output file name option
+    compiler.compile(treetop_file, ARGV.shift)
+  else
+    # list of input files option
+    compiler.compile(treetop_file)
+  end
 end

data/lib/treetop/compiler/metagrammar.rb

@@ -232,6 +232,12 @@ module Treetop
         def space
           elements[1]
         end
+      end
+
+      module Grammar1
+        def space
+          elements[1]
+        end
 
         def grammar_name
           elements[2]
@@ -242,7 +248,7 @@ module Treetop
         end
 
         def declaration_sequence
-          elements[4]
+          elements[5]
         end
 
       end
@@ -274,25 +280,53 @@ module Treetop
               r4 = _nt_space
               s0 << r4
               if r4
-                r5 = _nt_declaration_sequence
+                i6, s6 = index, []
+                if input.index('do', index) == index
+                  r7 = (SyntaxNode).new(input, index...(index + 2))
+                  @index += 2
+                else
+                  terminal_parse_failure('do')
+                  r7 = nil
+                end
+                s6 << r7
+                if r7
+                  r8 = _nt_space
+                  s6 << r8
+                end
+                if s6.last
+                  r6 = (SyntaxNode).new(input, i6...index, s6)
+                  r6.extend(Grammar0)
+                else
+                  self.index = i6
+                  r6 = nil
+                end
+                if r6
+                  r5 = r6
+                else
+                  r5 = SyntaxNode.new(input, index...index)
+                end
                 s0 << r5
                 if r5
-                  r7 = _nt_space
-                  if r7
-                    r6 = r7
-                  else
-                    r6 = SyntaxNode.new(input, index...index)
-                  end
-                  s0 << r6
-                  if r6
-                    if input.index('end', index) == index
-                      r8 = (SyntaxNode).new(input, index...(index + 3))
-                      @index += 3
+                  r9 = _nt_declaration_sequence
+                  s0 << r9
+                  if r9
+                    r11 = _nt_space
+                    if r11
+                      r10 = r11
                     else
-                      terminal_parse_failure('end')
-                      r8 = nil
+                      r10 = SyntaxNode.new(input, index...index)
+                    end
+                    s0 << r10
+                    if r10
+                      if input.index('end', index) == index
+                        r12 = (SyntaxNode).new(input, index...(index + 3))
+                        @index += 3
+                      else
+                        terminal_parse_failure('end')
+                        r12 = nil
+                      end
+                      s0 << r12
                     end
-                    s0 << r8
                   end
                 end
               end
@@ -301,7 +335,7 @@ module Treetop
         end
         if s0.last
           r0 = (Grammar).new(input, i0...index, s0)
-          r0.extend(Grammar0)
+          r0.extend(Grammar1)
         else
           self.index = i0
           r0 = nil
@@ -581,6 +615,12 @@ module Treetop
         def space
           elements[1]
         end
+      end
+
+      module ParsingRule1
+        def space
+          elements[1]
+        end
 
         def nonterminal
           elements[2]
@@ -591,11 +631,11 @@ module Treetop
         end
 
         def parsing_expression
-          elements[4]
+          elements[5]
         end
 
         def space
-          elements[5]
+          elements[6]
         end
 
       end
@@ -627,20 +667,48 @@ module Treetop
               r4 = _nt_space
               s0 << r4
               if r4
-                r5 = _nt_parsing_expression
+                i6, s6 = index, []
+                if input.index('do', index) == index
+                  r7 = (SyntaxNode).new(input, index...(index + 2))
+                  @index += 2
+                else
+                  terminal_parse_failure('do')
+                  r7 = nil
+                end
+                s6 << r7
+                if r7
+                  r8 = _nt_space
+                  s6 << r8
+                end
+                if s6.last
+                  r6 = (SyntaxNode).new(input, i6...index, s6)
+                  r6.extend(ParsingRule0)
+                else
+                  self.index = i6
+                  r6 = nil
+                end
+                if r6
+                  r5 = r6
+                else
+                  r5 = SyntaxNode.new(input, index...index)
+                end
                 s0 << r5
                 if r5
-                  r6 = _nt_space
-                  s0 << r6
-                  if r6
-                    if input.index('end', index) == index
-                      r7 = (SyntaxNode).new(input, index...(index + 3))
-                      @index += 3
-                    else
-                      terminal_parse_failure('end')
-                      r7 = nil
+                  r9 = _nt_parsing_expression
+                  s0 << r9
+                  if r9
+                    r10 = _nt_space
+                    s0 << r10
+                    if r10
+                      if input.index('end', index) == index
+                        r11 = (SyntaxNode).new(input, index...(index + 3))
+                        @index += 3
+                      else
+                        terminal_parse_failure('end')
+                        r11 = nil
+                      end
+                      s0 << r11
                     end
-                    s0 << r7
                   end
                 end
               end
@@ -649,7 +717,7 @@ module Treetop
         end
         if s0.last
           r0 = (ParsingRule).new(input, i0...index, s0)
-          r0.extend(ParsingRule0)
+          r0.extend(ParsingRule1)
         else
           self.index = i0
           r0 = nil

data/lib/treetop/compiler/metagrammar.treetop

@@ -18,7 +18,7 @@ module Treetop
       end
 
       rule grammar
-        'grammar' space grammar_name space declaration_sequence space? 'end' <Grammar>
+        'grammar' space grammar_name space ('do' space)? declaration_sequence space? 'end' <Grammar>
       end
 
       rule grammar_name
@@ -55,7 +55,7 @@ module Treetop
       end
 
       rule parsing_rule
-        'rule' space nonterminal space parsing_expression space 'end' <ParsingRule>
+        'rule' space nonterminal space ('do' space)? parsing_expression space 'end' <ParsingRule>
       end
 
       rule parsing_expression

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

@@ -4,7 +4,7 @@ module Treetop
       def compile(address, builder, parent_expression = nil)
         super
         builder.if__ "index < input_length" do
-          assign_result "(#{node_class_name}).new(input, index...(index + 1))"
+          assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
           extend_result_with_inline_module
           builder << "@index += 1"
         end

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

@@ -5,7 +5,7 @@ module Treetop
         super
         
         builder.if__ "input.index(Regexp.new(#{single_quote(text_value)}), index) == index" do
-          assign_result "(#{node_class_name}).new(input, index...(index + 1))"
+          assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
           extend_result_with_inline_module
           builder << "@index += 1"
         end

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

@@ -3,7 +3,7 @@ module Treetop
     module InlineModuleMixin
       attr_reader :module_name
       
-      def compile(index, rule, builder)
+      def compile(index, builder, rule)
         @module_name = "#{rule.name.treetop_camelize}#{index}"
       end
     end
@@ -12,7 +12,7 @@ module Treetop
 
       include InlineModuleMixin
       
-      def compile(index, rule, builder)
+      def compile(index, builder, rule)
         super
         builder.module_declaration(module_name) do
           builder << ruby_code.gsub(/\A\n/, '').rstrip
@@ -24,4 +24,4 @@ module Treetop
       end
     end
   end
-end
+end

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

@@ -83,7 +83,7 @@ module Treetop
       end
       
       def epsilon_node
-        "SyntaxNode.new(input, index...index)"
+        "instantiate_node(SyntaxNode,input, index...index)"
       end
       
       def assign_failure(start_index_var)

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

@@ -9,7 +9,7 @@ module Treetop
       
       def compile_inline_module_declarations(builder)
         parsing_expression.inline_modules.each_with_index do |inline_module, i|
-          inline_module.compile(i, self, builder)
+          inline_module.compile(i, builder, self)
           builder.newline
         end
       end
@@ -52,4 +52,4 @@ module Treetop
       end
     end
   end
-end
+end

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

@@ -24,7 +24,7 @@ module Treetop
       end
       
       def assign_and_extend_result
-        assign_result "#{node_class_name}.new(input, #{start_index_var}...index, #{accumulator_var})"
+        assign_result "instantiate_node(#{node_class_name},input, #{start_index_var}...index, #{accumulator_var})"
         extend_result_with_inline_module
       end
     end

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

@@ -7,7 +7,7 @@ module Treetop
         use_vars :result, :start_index, :accumulator
         compile_sequence_elements(sequence_elements)
         builder.if__ "#{accumulator_var}.last" do
-          assign_result "(#{node_class_name}).new(input, #{start_index_var}...index, #{accumulator_var})"
+          assign_result "instantiate_node(#{node_class_name},input, #{start_index_var}...index, #{accumulator_var})"
           extend_result sequence_element_accessor_module_name if sequence_element_accessor_module_name
           extend_result_with_inline_module
         end
@@ -50,7 +50,7 @@ module Treetop
         @sequence_elements = sequence_elements
       end
       
-      def compile(index, rule, builder)
+      def compile(index, builder, rule)
         super
         builder.module_declaration(module_name) do
           sequence_elements.each_with_index do |element, index|

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

@@ -6,7 +6,7 @@ module Treetop
         string_length = eval(text_value).length
         
         builder.if__ "input.index(#{text_value}, index) == index" do
-          assign_result "(#{node_class_name}).new(input, index...(index + #{string_length}))"
+          assign_result "instantiate_node(#{node_class_name},input, index...(index + #{string_length}))"
           extend_result_with_inline_module
           builder << "@index += #{string_length}"
         end

data/lib/treetop/runtime/compiled_parser.rb

@@ -64,7 +64,7 @@ module Treetop
       
       def parse_anything(node_class = SyntaxNode, inline_module = nil)
         if index < input.length
-          result = node_class.new(input, index...(index + 1))
+          result = instantiate_node(node_class,input, index...(index + 1))
           result.extend(inline_module) if inline_module
           @index += 1
           result
@@ -73,6 +73,14 @@ module Treetop
         end
       end
     
+      def instantiate_node(node_type,*args)
+        if node_type.respond_to? :new 
+          node_type.new(*args)
+        else
+          SyntaxNode.new(*args).extend(node_type)
+        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/syntax_node.rb

@@ -27,7 +27,7 @@ module Treetop
       end
 
       def empty?
-	      interval.first == interval.last && interval.exclude_end?
+        interval.first == interval.last && interval.exclude_end?
       end
 
       def extension_modules
@@ -69,4 +69,4 @@ module Treetop
       end
     end
   end
-end
+end

data/lib/treetop/runtime/terminal_parse_failure_debug.rb

@@ -0,0 +1,21 @@
+module Treetop
+  module Runtime
+    class TerminalParseFailure
+      attr_reader :index
+
+      def initialize(index, expected_string)
+        @index = index
+        @caller = caller
+        @expected_string = expected_string
+      end
+
+      def expected_string
+        "#{@expected_string} from #{@caller.map{|s| s.sub(/\A.*:([0-9]+):in `([^']*)'.*/,'\2:\1')}*" from "}\n\t"
+      end
+
+      def to_s
+        "String matching #{expected_string} expected."
+      end
+    end
+  end
+end

data/lib/treetop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Nathan Sobo
@@ -9,11 +9,12 @@ autorequire: treetop
 bindir: bin
 cert_chain: []
 
-date: 2008-06-02 00:00:00 +10:00
+date: 2009-03-19 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: polyglot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,7 +33,6 @@ extra_rdoc_files: []
 files: 
 - README
 - Rakefile
-- lib/metagrammar.rb
 - lib/treetop
 - lib/treetop/bootstrap_gen_1_metagrammar.rb
 - lib/treetop/compiler
@@ -74,8 +74,10 @@ files:
 - lib/treetop/runtime/interval_skip_list.rb
 - lib/treetop/runtime/syntax_node.rb
 - lib/treetop/runtime/terminal_parse_failure.rb
+- lib/treetop/runtime/terminal_parse_failure_debug.rb
 - lib/treetop/runtime/terminal_syntax_node.rb
 - lib/treetop/runtime.rb
+- lib/treetop/version.rb
 - lib/treetop.rb
 - bin/tt
 - doc/contributing_and_planned_features.markdown
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.1.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A Ruby-based text parsing and interpretation DSL