treetop 1.0.0 → 1.0.1

data/Rakefile

@@ -15,7 +15,7 @@ end
 
 gemspec = Gem::Specification.new do |s|
   s.name = "treetop"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
   s.author = "Nathan Sobo"
   s.email = "nathansobo@gmail.com"
   s.homepage = "http://functionalform.blogspot.com"

data/lib/treetop/compiler/metagrammar.rb

@@ -8,12 +8,6 @@ module Treetop
       end
       
       module TreetopFile0
-        def compile
-          prefix.text_value + module_or_grammar.compile + suffix.text_value
-        end
-      end
-      
-      module TreetopFile1
         def prefix
           elements[0]
         end
@@ -27,6 +21,12 @@ module Treetop
         end
       end
       
+      module TreetopFile1
+        def compile
+          prefix.text_value + module_or_grammar.compile + suffix.text_value
+        end
+      end
+      
       def _nt_treetop_file
         start_index = index
         cached = node_cache[:treetop_file][index]
@@ -74,8 +74,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (SyntaxNode).new(input, i0...index, s0)
-          r0.extend(TreetopFile1)
           r0.extend(TreetopFile0)
+          r0.extend(TreetopFile1)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -104,12 +104,6 @@ module Treetop
       end
       
       module ModuleDeclaration2
-        def compile
-          prefix.text_value + module_contents.compile + suffix.text_value
-        end
-      end
-      
-      module ModuleDeclaration3
         def prefix
           elements[0]
         end
@@ -123,6 +117,12 @@ module Treetop
         end
       end
       
+      module ModuleDeclaration3
+        def compile
+          prefix.text_value + module_contents.compile + suffix.text_value
+        end
+      end
+      
       def _nt_module_declaration
         start_index = index
         cached = node_cache[:module_declaration][index]
@@ -208,8 +208,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (SyntaxNode).new(input, i0...index, s0)
-          r0.extend(ModuleDeclaration3)
           r0.extend(ModuleDeclaration2)
+          r0.extend(ModuleDeclaration3)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -344,22 +344,22 @@ module Treetop
       end
       
       module DeclarationSequence1
-        def declarations
-          [head] + tail
+        def head
+          elements[0]
         end
-    
+        
         def tail
-          super.elements.map { |elt| elt.declaration }
+          elements[1]
         end
       end
       
       module DeclarationSequence2
-        def head
-          elements[0]
+        def declarations
+          [head] + tail
         end
-        
+    
         def tail
-          elements[1]
+          super.elements.map { |elt| elt.declaration }
         end
       end
       
@@ -409,8 +409,8 @@ module Treetop
         end
         if s1.last.success?
           r1 = (DeclarationSequence).new(input, i1...index, s1)
-          r1.extend(DeclarationSequence2)
           r1.extend(DeclarationSequence1)
+          r1.extend(DeclarationSequence2)
         else
           self.index = i1
           r1 = ParseFailure.new(input, i1, s1)
@@ -468,16 +468,16 @@ module Treetop
       end
       
       module IncludeDeclaration0
-        def compile(builder)
-          builder << text_value
+        def space
+          elements[1]
         end
+        
       end
       
       module IncludeDeclaration1
-        def space
-          elements[1]
+        def compile(builder)
+          builder << text_value
         end
-        
       end
       
       def _nt_include_declaration
@@ -515,8 +515,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (SyntaxNode).new(input, i0...index, s0)
-          r0.extend(IncludeDeclaration1)
           r0.extend(IncludeDeclaration0)
+          r0.extend(IncludeDeclaration1)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -643,26 +643,26 @@ module Treetop
       end
       
       module Choice1
-        def alternatives
-          [head] + tail
+        def head
+          elements[0]
         end
         
         def tail
-          super.elements.map {|elt| elt.alternative}
-        end
-        
-        def inline_modules
-          (alternatives.map {|alt| alt.inline_modules }).flatten
+          elements[1]
         end
       end
       
       module Choice2
-        def head
-          elements[0]
+        def alternatives
+          [head] + tail
         end
         
         def tail
-          elements[1]
+          super.elements.map {|elt| elt.alternative}
+        end
+        
+        def inline_modules
+          (alternatives.map {|alt| alt.inline_modules }).flatten
         end
       end
       
@@ -729,8 +729,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (Choice).new(input, i0...index, s0)
-          r0.extend(Choice2)
           r0.extend(Choice1)
+          r0.extend(Choice2)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -752,6 +752,20 @@ module Treetop
       end
       
       module Sequence1
+        def head
+          elements[0]
+        end
+        
+        def tail
+          elements[1]
+        end
+        
+        def node_class_declarations
+          elements[2]
+        end
+      end
+      
+      module Sequence2
         def sequence_elements
           [head] + tail
         end
@@ -771,20 +785,6 @@ module Treetop
         end
       end
       
-      module Sequence2
-        def head
-          elements[0]
-        end
-        
-        def tail
-          elements[1]
-        end
-        
-        def node_class_declarations
-          elements[2]
-        end
-      end
-      
       def _nt_sequence
         start_index = index
         cached = node_cache[:sequence][index]
@@ -834,8 +834,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (Sequence).new(input, i0...index, s0)
-          r0.extend(Sequence2)
           r0.extend(Sequence1)
+          r0.extend(Sequence2)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -878,6 +878,16 @@ module Treetop
       end
       
       module Primary0
+        def prefix
+          elements[0]
+        end
+        
+        def atomic
+          elements[1]
+        end
+      end
+      
+      module Primary1
         def compile(address, builder)
           prefix.compile(address, builder, self)
         end
@@ -895,17 +905,21 @@ module Treetop
         end
       end
       
-      module Primary1
-        def prefix
+      module Primary2
+        def atomic
           elements[0]
         end
         
-        def atomic
+        def suffix
           elements[1]
         end
+        
+        def node_class_declarations
+          elements[2]
+        end
       end
       
-      module Primary2
+      module Primary3
         def compile(address, builder)
           suffix.compile(address, builder, self)
         end
@@ -927,21 +941,17 @@ module Treetop
         end
       end
       
-      module Primary3
+      module Primary4
         def atomic
           elements[0]
         end
         
-        def suffix
-          elements[1]
-        end
-        
         def node_class_declarations
-          elements[2]
+          elements[1]
         end
       end
       
-      module Primary4
+      module Primary5
         def compile(address, builder)
           atomic.compile(address, builder, self)
         end
@@ -959,16 +969,6 @@ module Treetop
         end
       end
       
-      module Primary5
-        def atomic
-          elements[0]
-        end
-        
-        def node_class_declarations
-          elements[1]
-        end
-      end
-      
       def _nt_primary
         start_index = index
         cached = node_cache[:primary][index]
@@ -987,8 +987,8 @@ module Treetop
         end
         if s1.last.success?
           r1 = (SyntaxNode).new(input, i1...index, s1)
-          r1.extend(Primary1)
           r1.extend(Primary0)
+          r1.extend(Primary1)
         else
           self.index = i1
           r1 = ParseFailure.new(input, i1, s1)
@@ -1011,8 +1011,8 @@ module Treetop
           end
           if s4.last.success?
             r4 = (SyntaxNode).new(input, i4...index, s4)
-            r4.extend(Primary3)
             r4.extend(Primary2)
+            r4.extend(Primary3)
           else
             self.index = i4
             r4 = ParseFailure.new(input, i4, s4)
@@ -1031,8 +1031,8 @@ module Treetop
             end
             if s8.last.success?
               r8 = (SyntaxNode).new(input, i8...index, s8)
-              r8.extend(Primary5)
               r8.extend(Primary4)
+              r8.extend(Primary5)
             else
               self.index = i8
               r8 = ParseFailure.new(input, i8, s8)
@@ -1054,6 +1054,16 @@ module Treetop
       end
       
       module LabeledSequencePrimary0
+        def label
+          elements[0]
+        end
+        
+        def sequence_primary
+          elements[1]
+        end
+      end
+      
+      module LabeledSequencePrimary1
         def compile(lexical_address, builder)
           sequence_primary.compile(lexical_address, builder)
         end
@@ -1073,16 +1083,6 @@ module Treetop
         end
       end
       
-      module LabeledSequencePrimary1
-        def label
-          elements[0]
-        end
-        
-        def sequence_primary
-          elements[1]
-        end
-      end
-      
       def _nt_labeled_sequence_primary
         start_index = index
         cached = node_cache[:labeled_sequence_primary][index]
@@ -1100,8 +1100,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (SyntaxNode).new(input, i0...index, s0)
-          r0.extend(LabeledSequencePrimary1)
           r0.extend(LabeledSequencePrimary0)
+          r0.extend(LabeledSequencePrimary1)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -1120,12 +1120,12 @@ module Treetop
       end
       
       module Label1
-        def name
-          elements[0].text_value
-        end
       end
       
       module Label2
+        def name
+          elements[0].text_value
+        end
       end
       
       module Label3
@@ -1175,8 +1175,8 @@ module Treetop
         end
         if s1.last.success?
           r1 = (SyntaxNode).new(input, i1...index, s1)
-          r1.extend(Label2)
           r1.extend(Label1)
+          r1.extend(Label2)
         else
           self.index = i1
           r1 = ParseFailure.new(input, i1, s1)
@@ -1203,6 +1203,16 @@ module Treetop
       end
       
       module SequencePrimary0
+        def prefix
+          elements[0]
+        end
+        
+        def atomic
+          elements[1]
+        end
+      end
+      
+      module SequencePrimary1
         def compile(lexical_address, builder)
           prefix.compile(lexical_address, builder, self)
         end
@@ -1220,17 +1230,17 @@ module Treetop
         end
       end
       
-      module SequencePrimary1
-        def prefix
+      module SequencePrimary2
+        def atomic
           elements[0]
         end
         
-        def atomic
+        def suffix
           elements[1]
         end
       end
       
-      module SequencePrimary2
+      module SequencePrimary3
         def compile(lexical_address, builder)
           suffix.compile(lexical_address, builder, self)
         end
@@ -1248,16 +1258,6 @@ module Treetop
         end
       end
       
-      module SequencePrimary3
-        def atomic
-          elements[0]
-        end
-        
-        def suffix
-          elements[1]
-        end
-      end
-      
       def _nt_sequence_primary
         start_index = index
         cached = node_cache[:sequence_primary][index]
@@ -1276,8 +1276,8 @@ module Treetop
         end
         if s1.last.success?
           r1 = (SyntaxNode).new(input, i1...index, s1)
-          r1.extend(SequencePrimary1)
           r1.extend(SequencePrimary0)
+          r1.extend(SequencePrimary1)
         else
           self.index = i1
           r1 = ParseFailure.new(input, i1, s1)
@@ -1296,8 +1296,8 @@ module Treetop
           end
           if s4.last.success?
             r4 = (SyntaxNode).new(input, i4...index, s4)
-            r4.extend(SequencePrimary3)
             r4.extend(SequencePrimary2)
+            r4.extend(SequencePrimary3)
           else
             self.index = i4
             r4 = ParseFailure.new(input, i4, s4)
@@ -1371,6 +1371,16 @@ module Treetop
       end
       
       module NodeClassDeclarations0
+        def node_class_expression
+          elements[0]
+        end
+        
+        def trailing_inline_module
+          elements[1]
+        end
+      end
+      
+      module NodeClassDeclarations1
         def node_class
           node_class_expression.node_class
         end
@@ -1388,16 +1398,6 @@ module Treetop
         end
       end
       
-      module NodeClassDeclarations1
-        def node_class_expression
-          elements[0]
-        end
-        
-        def trailing_inline_module
-          elements[1]
-        end
-      end
-      
       def _nt_node_class_declarations
         start_index = index
         cached = node_cache[:node_class_declarations][index]
@@ -1415,8 +1415,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (SyntaxNode).new(input, i0...index, s0)
-          r0.extend(NodeClassDeclarations1)
           r0.extend(NodeClassDeclarations0)
+          r0.extend(NodeClassDeclarations1)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -1528,16 +1528,16 @@ module Treetop
       end
       
       module ParenthesizedExpression0
-        def inline_modules
-          parsing_expression.inline_modules
+        def parsing_expression
+          elements[2]
         end
+        
       end
       
       module ParenthesizedExpression1
-        def parsing_expression
-          elements[2]
+        def inline_modules
+          parsing_expression.inline_modules
         end
-        
       end
       
       def _nt_parenthesized_expression
@@ -1579,8 +1579,8 @@ module Treetop
         end
         if s0.last.success?
           r0 = (ParenthesizedExpression).new(input, i0...index, s0)
-          r0.extend(ParenthesizedExpression1)
           r0.extend(ParenthesizedExpression0)
+          r0.extend(ParenthesizedExpression1)
         else
           self.index = i0
           r0 = ParseFailure.new(input, i0, s0)
@@ -1994,16 +1994,16 @@ module Treetop
       end
       
       module NodeClassExpression1
-        def node_class
-          elements[2].text_value
+        def space
+          elements[0]
         end
+        
       end
       
       module NodeClassExpression2
-        def space
-          elements[0]
+        def node_class
+          elements[2].text_value
         end
-        
       end
       
       module NodeClassExpression3
@@ -2073,8 +2073,8 @@ module Treetop
         end
         if s1.last.success?
           r1 = (SyntaxNode).new(input, i1...index, s1)
-          r1.extend(NodeClassExpression2)
           r1.extend(NodeClassExpression1)
+          r1.extend(NodeClassExpression2)
         else
           self.index = i1
           r1 = ParseFailure.new(input, i1, s1)
@@ -2101,16 +2101,6 @@ module Treetop
       end
       
       module TrailingInlineModule0
-        def inline_modules
-          [inline_module]
-        end
-              
-        def inline_module_name
-          inline_module.module_name
-        end
-      end
-      
-      module TrailingInlineModule1
         def space
           elements[0]
         end
@@ -2120,6 +2110,16 @@ module Treetop
         end
       end
       
+      module TrailingInlineModule1
+        def inline_modules
+          [inline_module]
+        end
+              
+        def inline_module_name
+          inline_module.module_name
+        end
+      end
+      
       module TrailingInlineModule2
         def inline_modules
           []
@@ -2152,8 +2152,8 @@ module Treetop
         end
         if s1.last.success?
           r1 = (SyntaxNode).new(input, i1...index, s1)
-          r1.extend(TrailingInlineModule1)
           r1.extend(TrailingInlineModule0)
+          r1.extend(TrailingInlineModule1)
         else
           self.index = i1
           r1 = ParseFailure.new(input, i1, s1)

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

@@ -5,7 +5,13 @@ module Treetop
       def compile(builder)
         unless rules.empty?
           builder.method_declaration("root") do
-            builder << rules.first.method_name
+            builder.assign 'result', rules.first.method_name
+            builder.if__ 'index == input.size' do
+              builder << 'return result'
+            end
+            builder.else_ do
+              builder << 'return ParseFailure.new(input, index, result.nested_failures)'
+            end
           end
           builder.newline
         end

data/test/compiler/grammar_test.rb

@@ -27,6 +27,10 @@ class GrammarTest < CompilerTestCase
     parse('bazbaz').should be_success
   end
   
+  it "fails if it does not parse all input" do
+    parse('barbarbazbaz').should be_failure
+  end
+  
   it "mixes in included modules" do
     Foo.ancestors.should include(Bar)
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 date: 2007-09-14 00:00:00 -07:00
 summary: A Ruby-based text parsing and interpretation DSL
 require_paths: