treetop 1.1.4 → 1.2.0

data/lib/treetop/compiler.rb

@@ -2,6 +2,5 @@ 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])
+require File.join(dir, *%w[compiler metagrammar]) unless $exclude_metagrammar
 require File.join(dir, *%w[compiler grammar_compiler])
-require File.join(dir, *%w[compiler load_grammar])

data/lib/treetop/compiler/grammar_compiler.rb

@@ -1,7 +1,7 @@
 module Treetop
   module Compiler
     class GrammarCompiler
-      def compile(source_path, target_path = source_path.gsub(/treetop\Z/, 'rb'))
+      def compile(source_path, target_path = source_path.gsub(/\.(treetop|tt)\Z/, '.rb'))
         File.open(target_path, 'w') do |target_file|
           target_file.write(ruby_source(source_path))
         end
@@ -9,13 +9,20 @@ module Treetop
       
       def ruby_source(source_path)
         File.open(source_path) do |source_file|
-          result = MetagrammarParser.new.parse(source_file.read)
-          if result.failure?
-            raise RuntimeError.new(result.nested_failures.map {|failure| failure.to_s}.join("\n"))
+          parser = MetagrammarParser.new
+          result = parser.parse(source_file.read)
+          unless result
+            raise RuntimeError.new(parser.failure_reason)
           end
           result.compile
         end
       end
     end
   end
-end
+
+  def self.load(path)
+    adjusted_path = path =~ /\.(treetop|tt)\Z/ ? path : path + '.treetop'
+    compiler = Treetop::Compiler::GrammarCompiler.new
+    Object.class_eval(compiler.ruby_source(adjusted_path))
+  end
+end

data/lib/treetop/compiler/metagrammar.rb

@@ -35,50 +35,46 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         r2 = _nt_space
-        if r2.success?
+        if r2
           r1 = r2
         else
-          r1 = SyntaxNode.new(input, index...index, r2.nested_failures)
+          r1 = SyntaxNode.new(input, index...index)
         end
         s0 << r1
-        if r1.success?
-          i3, nr3 = index, []
+        if r1
+          i3 = index
           r4 = _nt_module_declaration
-          nr3 << r4
-          if r4.success?
+          if r4
             r3 = r4
-            r4.update_nested_results(nr3)
           else
             r5 = _nt_grammar
-            nr3 << r5
-            if r5.success?
+            if r5
               r3 = r5
-              r5.update_nested_results(nr3)
             else
               self.index = i3
-              r3 = ParseFailure.new(input, i3, nr3)
+              r3 = nil
             end
           end
           s0 << r3
-          if r3.success?
+          if r3
             r7 = _nt_space
-            if r7.success?
+            if r7
               r6 = r7
             else
-              r6 = SyntaxNode.new(input, index...index, r7.nested_failures)
+              r6 = SyntaxNode.new(input, index...index)
             end
             s0 << r6
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(TreetopFile0)
           r0.extend(TreetopFile1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:treetop_file][start_index] = r0
@@ -131,88 +127,100 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        i1, s1, nr1 = index, [], []
-        r2 = parse_terminal('module', SyntaxNode)
+        i0, s0 = index, []
+        i1, s1 = index, []
+        if input.index('module', index) == index
+          r2 = (SyntaxNode).new(input, index...(index + 6))
+          @index += 6
+        else
+          terminal_parse_failure('module')
+          r2 = nil
+        end
         s1 << r2
-        if r2.success?
+        if r2
           r3 = _nt_space
           s1 << r3
-          if r3.success?
-            r4 = parse_char_class(/[A-Z]/, 'A-Z', SyntaxNode)
+          if r3
+            if input.index(/[A-Z]/, index) == index
+              r4 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              r4 = nil
+            end
             s1 << r4
-            if r4.success?
-              s5, nr5, i5 = [], [], index
+            if r4
+              s5, i5 = [], index
               loop do
                 r6 = _nt_alphanumeric_char
-                nr5 << r6
-                if r6.success?
+                if r6
                   s5 << r6
                 else
                   break
                 end
               end
-              r5 = SyntaxNode.new(input, i5...index, s5, nr5)
+              r5 = SyntaxNode.new(input, i5...index, s5)
               s1 << r5
-              if r5.success?
+              if r5
                 r7 = _nt_space
                 s1 << r7
               end
             end
           end
         end
-        if s1.last.success?
+        if s1.last
           r1 = (SyntaxNode).new(input, i1...index, s1)
           r1.extend(ModuleDeclaration0)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
         s0 << r1
-        if r1.success?
-          i8, nr8 = index, []
+        if r1
+          i8 = index
           r9 = _nt_module_declaration
-          nr8 << r9
-          if r9.success?
+          if r9
             r8 = r9
-            r9.update_nested_results(nr8)
           else
             r10 = _nt_grammar
-            nr8 << r10
-            if r10.success?
+            if r10
               r8 = r10
-              r10.update_nested_results(nr8)
             else
               self.index = i8
-              r8 = ParseFailure.new(input, i8, nr8)
+              r8 = nil
             end
           end
           s0 << r8
-          if r8.success?
-            i11, s11, nr11 = index, [], []
+          if r8
+            i11, s11 = index, []
             r12 = _nt_space
             s11 << r12
-            if r12.success?
-              r13 = parse_terminal('end', SyntaxNode)
+            if r12
+              if input.index('end', index) == index
+                r13 = (SyntaxNode).new(input, index...(index + 3))
+                @index += 3
+              else
+                terminal_parse_failure('end')
+                r13 = nil
+              end
               s11 << r13
             end
-            if s11.last.success?
+            if s11.last
               r11 = (SyntaxNode).new(input, i11...index, s11)
               r11.extend(ModuleDeclaration1)
             else
               self.index = i11
-              r11 = ParseFailure.new(input, i11, s11)
+              r11 = nil
             end
             s0 << r11
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(ModuleDeclaration2)
           r0.extend(ModuleDeclaration3)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:module_declaration][start_index] = r0
@@ -247,31 +255,43 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('grammar', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('grammar', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 7))
+          @index += 7
+        else
+          terminal_parse_failure('grammar')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
+        if r1
           r2 = _nt_space
           s0 << r2
-          if r2.success?
+          if r2
             r3 = _nt_grammar_name
             s0 << r3
-            if r3.success?
+            if r3
               r4 = _nt_space
               s0 << r4
-              if r4.success?
+              if r4
                 r5 = _nt_declaration_sequence
                 s0 << r5
-                if r5.success?
+                if r5
                   r7 = _nt_space
-                  if r7.success?
+                  if r7
                     r6 = r7
                   else
-                    r6 = SyntaxNode.new(input, index...index, r7.nested_failures)
+                    r6 = SyntaxNode.new(input, index...index)
                   end
                   s0 << r6
-                  if r6.success?
-                    r8 = parse_terminal('end', SyntaxNode)
+                  if r6
+                    if input.index('end', index) == index
+                      r8 = (SyntaxNode).new(input, index...(index + 3))
+                      @index += 3
+                    else
+                      terminal_parse_failure('end')
+                      r8 = nil
+                    end
                     s0 << r8
                   end
                 end
@@ -279,12 +299,12 @@ module Treetop
             end
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (Grammar).new(input, i0...index, s0)
           r0.extend(Grammar0)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:grammar][start_index] = r0
@@ -303,29 +323,33 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_char_class(/[A-Z]/, 'A-Z', SyntaxNode)
+        i0, s0 = index, []
+        if input.index(/[A-Z]/, index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
             r3 = _nt_alphanumeric_char
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+          r2 = SyntaxNode.new(input, i2...index, s2)
           s0 << r2
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(GrammarName0)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:grammar_name][start_index] = r0
@@ -376,58 +400,60 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        i1, s1, nr1 = index, [], []
+        i0 = index
+        i1, s1 = index, []
         r2 = _nt_declaration
         s1 << r2
-        if r2.success?
-          s3, nr3, i3 = [], [], index
+        if r2
+          s3, i3 = [], index
           loop do
-            i4, s4, nr4 = index, [], []
+            i4, s4 = index, []
             r5 = _nt_space
             s4 << r5
-            if r5.success?
+            if r5
               r6 = _nt_declaration
               s4 << r6
             end
-            if s4.last.success?
+            if s4.last
               r4 = (SyntaxNode).new(input, i4...index, s4)
               r4.extend(DeclarationSequence0)
             else
               self.index = i4
-              r4 = ParseFailure.new(input, i4, s4)
+              r4 = nil
             end
-            nr3 << r4
-            if r4.success?
+            if r4
               s3 << r4
             else
               break
             end
           end
-          r3 = SyntaxNode.new(input, i3...index, s3, nr3)
+          r3 = SyntaxNode.new(input, i3...index, s3)
           s1 << r3
         end
-        if s1.last.success?
+        if s1.last
           r1 = (DeclarationSequence).new(input, i1...index, s1)
           r1.extend(DeclarationSequence1)
           r1.extend(DeclarationSequence2)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r7 = parse_terminal('', SyntaxNode, DeclarationSequence3)
-          nr0 << r7
-          if r7.success?
+          if input.index('', index) == index
+            r7 = (SyntaxNode).new(input, index...(index + 0))
+            r7.extend(DeclarationSequence3)
+            @index += 0
+          else
+            terminal_parse_failure('')
+            r7 = nil
+          end
+          if r7
             r0 = r7
-            r7.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -444,21 +470,17 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
+        i0 = index
         r1 = _nt_parsing_rule
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
           r2 = _nt_include_declaration
-          nr0 << r2
-          if r2.success?
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -488,54 +510,66 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('include', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('include', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 7))
+          @index += 7
+        else
+          terminal_parse_failure('include')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
+        if r1
           r2 = _nt_space
           s0 << r2
-          if r2.success?
-            r3 = parse_char_class(/[A-Z]/, 'A-Z', SyntaxNode)
+          if r2
+            if input.index(/[A-Z]/, index) == index
+              r3 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              r3 = nil
+            end
             s0 << r3
-            if r3.success?
-              s4, nr4, i4 = [], [], index
+            if r3
+              s4, i4 = [], index
               loop do
-                i5, nr5 = index, []
+                i5 = index
                 r6 = _nt_alphanumeric_char
-                nr5 << r6
-                if r6.success?
+                if r6
                   r5 = r6
-                  r6.update_nested_results(nr5)
                 else
-                  r7 = parse_terminal('::', SyntaxNode)
-                  nr5 << r7
-                  if r7.success?
+                  if input.index('::', index) == index
+                    r7 = (SyntaxNode).new(input, index...(index + 2))
+                    @index += 2
+                  else
+                    terminal_parse_failure('::')
+                    r7 = nil
+                  end
+                  if r7
                     r5 = r7
-                    r7.update_nested_results(nr5)
                   else
                     self.index = i5
-                    r5 = ParseFailure.new(input, i5, nr5)
+                    r5 = nil
                   end
                 end
-                nr4 << r5
-                if r5.success?
+                if r5
                   s4 << r5
                 else
                   break
                 end
               end
-              r4 = SyntaxNode.new(input, i4...index, s4, nr4)
+              r4 = SyntaxNode.new(input, i4...index, s4)
               s0 << r4
             end
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(IncludeDeclaration0)
           r0.extend(IncludeDeclaration1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:include_declaration][start_index] = r0
@@ -574,26 +608,38 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('rule', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('rule', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 4))
+          @index += 4
+        else
+          terminal_parse_failure('rule')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
+        if r1
           r2 = _nt_space
           s0 << r2
-          if r2.success?
+          if r2
             r3 = _nt_nonterminal
             s0 << r3
-            if r3.success?
+            if r3
               r4 = _nt_space
               s0 << r4
-              if r4.success?
+              if r4
                 r5 = _nt_parsing_expression
                 s0 << r5
-                if r5.success?
+                if r5
                   r6 = _nt_space
                   s0 << r6
-                  if r6.success?
-                    r7 = parse_terminal('end', SyntaxNode)
+                  if r6
+                    if input.index('end', index) == index
+                      r7 = (SyntaxNode).new(input, index...(index + 3))
+                      @index += 3
+                    else
+                      terminal_parse_failure('end')
+                      r7 = nil
+                    end
                     s0 << r7
                   end
                 end
@@ -601,12 +647,12 @@ module Treetop
             end
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (ParsingRule).new(input, i0...index, s0)
           r0.extend(ParsingRule0)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:parsing_rule][start_index] = r0
@@ -622,27 +668,21 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
+        i0 = index
         r1 = _nt_choice
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
           r2 = _nt_sequence
-          nr0 << r2
-          if r2.success?
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             r3 = _nt_primary
-            nr0 << r3
-            if r3.success?
+            if r3
               r0 = r3
-              r3.update_nested_results(nr0)
             else
               self.index = i0
-              r0 = ParseFailure.new(input, i0, nr0)
+              r0 = nil
             end
           end
         end
@@ -690,46 +730,51 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         r1 = _nt_alternative
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
-            i3, s3, nr3 = index, [], []
+            i3, s3 = index, []
             r5 = _nt_space
-            if r5.success?
+            if r5
               r4 = r5
             else
-              r4 = SyntaxNode.new(input, index...index, r5.nested_failures)
+              r4 = SyntaxNode.new(input, index...index)
             end
             s3 << r4
-            if r4.success?
-              r6 = parse_terminal('/', SyntaxNode)
+            if r4
+              if input.index('/', index) == index
+                r6 = (SyntaxNode).new(input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure('/')
+                r6 = nil
+              end
               s3 << r6
-              if r6.success?
+              if r6
                 r8 = _nt_space
-                if r8.success?
+                if r8
                   r7 = r8
                 else
-                  r7 = SyntaxNode.new(input, index...index, r8.nested_failures)
+                  r7 = SyntaxNode.new(input, index...index)
                 end
                 s3 << r7
-                if r7.success?
+                if r7
                   r9 = _nt_alternative
                   s3 << r9
                 end
               end
             end
-            if s3.last.success?
+            if s3.last
               r3 = (SyntaxNode).new(input, i3...index, s3)
               r3.extend(Choice0)
             else
               self.index = i3
-              r3 = ParseFailure.new(input, i3, s3)
+              r3 = nil
             end
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
@@ -737,19 +782,19 @@ module Treetop
           end
           if s2.empty?
             self.index = i2
-            r2 = ParseFailure.new(input, i2, nr2)
+            r2 = nil
           else
-            r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+            r2 = SyntaxNode.new(input, i2...index, s2)
           end
           s0 << r2
         end
-        if s0.last.success?
+        if s0.last
           r0 = (Choice).new(input, i0...index, s0)
           r0.extend(Choice1)
           r0.extend(Choice2)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:choice][start_index] = r0
@@ -809,28 +854,27 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         r1 = _nt_labeled_sequence_primary
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
-            i3, s3, nr3 = index, [], []
+            i3, s3 = index, []
             r4 = _nt_space
             s3 << r4
-            if r4.success?
+            if r4
               r5 = _nt_labeled_sequence_primary
               s3 << r5
             end
-            if s3.last.success?
+            if s3.last
               r3 = (SyntaxNode).new(input, i3...index, s3)
               r3.extend(Sequence0)
             else
               self.index = i3
-              r3 = ParseFailure.new(input, i3, s3)
+              r3 = nil
             end
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
@@ -838,23 +882,23 @@ module Treetop
           end
           if s2.empty?
             self.index = i2
-            r2 = ParseFailure.new(input, i2, nr2)
+            r2 = nil
           else
-            r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+            r2 = SyntaxNode.new(input, i2...index, s2)
           end
           s0 << r2
-          if r2.success?
+          if r2
             r6 = _nt_node_class_declarations
             s0 << r6
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (Sequence).new(input, i0...index, s0)
           r0.extend(Sequence1)
           r0.extend(Sequence2)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:sequence][start_index] = r0
@@ -870,21 +914,17 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
+        i0 = index
         r1 = _nt_sequence
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
           r2 = _nt_primary
-          nr0 << r2
-          if r2.success?
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -993,73 +1033,67 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        i1, s1, nr1 = index, [], []
+        i0 = index
+        i1, s1 = index, []
         r2 = _nt_prefix
         s1 << r2
-        if r2.success?
+        if r2
           r3 = _nt_atomic
           s1 << r3
         end
-        if s1.last.success?
+        if s1.last
           r1 = (SyntaxNode).new(input, i1...index, s1)
           r1.extend(Primary0)
           r1.extend(Primary1)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          i4, s4, nr4 = index, [], []
+          i4, s4 = index, []
           r5 = _nt_atomic
           s4 << r5
-          if r5.success?
+          if r5
             r6 = _nt_suffix
             s4 << r6
-            if r6.success?
+            if r6
               r7 = _nt_node_class_declarations
               s4 << r7
             end
           end
-          if s4.last.success?
+          if s4.last
             r4 = (SyntaxNode).new(input, i4...index, s4)
             r4.extend(Primary2)
             r4.extend(Primary3)
           else
             self.index = i4
-            r4 = ParseFailure.new(input, i4, s4)
+            r4 = nil
           end
-          nr0 << r4
-          if r4.success?
+          if r4
             r0 = r4
-            r4.update_nested_results(nr0)
           else
-            i8, s8, nr8 = index, [], []
+            i8, s8 = index, []
             r9 = _nt_atomic
             s8 << r9
-            if r9.success?
+            if r9
               r10 = _nt_node_class_declarations
               s8 << r10
             end
-            if s8.last.success?
+            if s8.last
               r8 = (SyntaxNode).new(input, i8...index, s8)
               r8.extend(Primary4)
               r8.extend(Primary5)
             else
               self.index = i8
-              r8 = ParseFailure.new(input, i8, s8)
+              r8 = nil
             end
-            nr0 << r8
-            if r8.success?
+            if r8
               r0 = r8
-              r8.update_nested_results(nr0)
             else
               self.index = i0
-              r0 = ParseFailure.new(input, i0, nr0)
+              r0 = nil
             end
           end
         end
@@ -1107,20 +1141,20 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         r1 = _nt_label
         s0 << r1
-        if r1.success?
+        if r1
           r2 = _nt_sequence_primary
           s0 << r2
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(LabeledSequencePrimary0)
           r0.extend(LabeledSequencePrimary1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:labeled_sequence_primary][start_index] = r0
@@ -1158,58 +1192,66 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        i1, s1, nr1 = index, [], []
-        i2, s2, nr2 = index, [], []
+        i0 = index
+        i1, s1 = index, []
+        i2, s2 = index, []
         r3 = _nt_alpha_char
         s2 << r3
-        if r3.success?
-          s4, nr4, i4 = [], [], index
+        if r3
+          s4, i4 = [], index
           loop do
             r5 = _nt_alphanumeric_char
-            nr4 << r5
-            if r5.success?
+            if r5
               s4 << r5
             else
               break
             end
           end
-          r4 = SyntaxNode.new(input, i4...index, s4, nr4)
+          r4 = SyntaxNode.new(input, i4...index, s4)
           s2 << r4
         end
-        if s2.last.success?
+        if s2.last
           r2 = (SyntaxNode).new(input, i2...index, s2)
           r2.extend(Label0)
         else
           self.index = i2
-          r2 = ParseFailure.new(input, i2, s2)
+          r2 = nil
         end
         s1 << r2
-        if r2.success?
-          r6 = parse_terminal(':', SyntaxNode)
+        if r2
+          if input.index(':', index) == index
+            r6 = (SyntaxNode).new(input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure(':')
+            r6 = nil
+          end
           s1 << r6
         end
-        if s1.last.success?
+        if s1.last
           r1 = (SyntaxNode).new(input, i1...index, s1)
           r1.extend(Label1)
           r1.extend(Label2)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r7 = parse_terminal('', SyntaxNode, Label3)
-          nr0 << r7
-          if r7.success?
+          if input.index('', index) == index
+            r7 = (SyntaxNode).new(input, index...(index + 0))
+            r7.extend(Label3)
+            @index += 0
+          else
+            terminal_parse_failure('')
+            r7 = nil
+          end
+          if r7
             r0 = r7
-            r7.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -1282,55 +1324,49 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        i1, s1, nr1 = index, [], []
+        i0 = index
+        i1, s1 = index, []
         r2 = _nt_prefix
         s1 << r2
-        if r2.success?
+        if r2
           r3 = _nt_atomic
           s1 << r3
         end
-        if s1.last.success?
+        if s1.last
           r1 = (SyntaxNode).new(input, i1...index, s1)
           r1.extend(SequencePrimary0)
           r1.extend(SequencePrimary1)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          i4, s4, nr4 = index, [], []
+          i4, s4 = index, []
           r5 = _nt_atomic
           s4 << r5
-          if r5.success?
+          if r5
             r6 = _nt_suffix
             s4 << r6
           end
-          if s4.last.success?
+          if s4.last
             r4 = (SyntaxNode).new(input, i4...index, s4)
             r4.extend(SequencePrimary2)
             r4.extend(SequencePrimary3)
           else
             self.index = i4
-            r4 = ParseFailure.new(input, i4, s4)
+            r4 = nil
           end
-          nr0 << r4
-          if r4.success?
+          if r4
             r0 = r4
-            r4.update_nested_results(nr0)
           else
             r7 = _nt_atomic
-            nr0 << r7
-            if r7.success?
+            if r7
               r0 = r7
-              r7.update_nested_results(nr0)
             else
               self.index = i0
-              r0 = ParseFailure.new(input, i0, nr0)
+              r0 = nil
             end
           end
         end
@@ -1348,21 +1384,17 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
+        i0 = index
         r1 = _nt_repetition_suffix
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
           r2 = _nt_optional_suffix
-          nr0 << r2
-          if r2.success?
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -1379,7 +1411,13 @@ module Treetop
           return cached
         end
         
-        r0 = parse_terminal('?', Optional)
+        if input.index('?', index) == index
+          r0 = (Optional).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('?')
+          r0 = nil
+        end
         
         node_cache[:optional_suffix][start_index] = r0
         
@@ -1422,20 +1460,20 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         r1 = _nt_node_class_expression
         s0 << r1
-        if r1.success?
+        if r1
           r2 = _nt_trailing_inline_module
           s0 << r2
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(NodeClassDeclarations0)
           r0.extend(NodeClassDeclarations1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:node_class_declarations][start_index] = r0
@@ -1451,21 +1489,29 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        r1 = parse_terminal('+', OneOrMore)
-        nr0 << r1
-        if r1.success?
+        i0 = index
+        if input.index('+', index) == index
+          r1 = (OneOrMore).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('+')
+          r1 = nil
+        end
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r2 = parse_terminal('*', ZeroOrMore)
-          nr0 << r2
-          if r2.success?
+          if input.index('*', index) == index
+            r2 = (ZeroOrMore).new(input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('*')
+            r2 = nil
+          end
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -1482,21 +1528,29 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        r1 = parse_terminal('&', AndPredicate)
-        nr0 << r1
-        if r1.success?
+        i0 = index
+        if input.index('&', index) == index
+          r1 = (AndPredicate).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('&')
+          r1 = nil
+        end
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r2 = parse_terminal('!', NotPredicate)
-          nr0 << r2
-          if r2.success?
+          if input.index('!', index) == index
+            r2 = (NotPredicate).new(input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('!')
+            r2 = nil
+          end
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -1513,27 +1567,21 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
+        i0 = index
         r1 = _nt_terminal
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
           r2 = _nt_nonterminal
-          nr0 << r2
-          if r2.success?
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             r3 = _nt_parenthesized_expression
-            nr0 << r3
-            if r3.success?
+            if r3
               r0 = r3
-              r3.update_nested_results(nr0)
             else
               self.index = i0
-              r0 = ParseFailure.new(input, i0, nr0)
+              r0 = nil
             end
           end
         end
@@ -1564,42 +1612,54 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('(', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('(', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('(')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
+        if r1
           r3 = _nt_space
-          if r3.success?
+          if r3
             r2 = r3
           else
-            r2 = SyntaxNode.new(input, index...index, r3.nested_failures)
+            r2 = SyntaxNode.new(input, index...index)
           end
           s0 << r2
-          if r2.success?
+          if r2
             r4 = _nt_parsing_expression
             s0 << r4
-            if r4.success?
+            if r4
               r6 = _nt_space
-              if r6.success?
+              if r6
                 r5 = r6
               else
-                r5 = SyntaxNode.new(input, index...index, r6.nested_failures)
+                r5 = SyntaxNode.new(input, index...index)
               end
               s0 << r5
-              if r5.success?
-                r7 = parse_terminal(')', SyntaxNode)
+              if r5
+                if input.index(')', index) == index
+                  r7 = (SyntaxNode).new(input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure(')')
+                  r7 = nil
+                end
                 s0 << r7
               end
             end
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (ParenthesizedExpression).new(input, i0...index, s0)
           r0.extend(ParenthesizedExpression0)
           r0.extend(ParenthesizedExpression1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:parenthesized_expression][start_index] = r0
@@ -1625,49 +1685,48 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         i1 = index
         r2 = _nt_keyword_inside_grammar
-        if r2.success?
-          r1 = ParseFailure.new(input, i1, r2.nested_failures)
+        if r2
+          r1 = nil
         else
           self.index = i1
-          r1 = SyntaxNode.new(input, index...index, r2.nested_failures)
+          r1 = SyntaxNode.new(input, index...index)
         end
         s0 << r1
-        if r1.success?
-          i3, s3, nr3 = index, [], []
+        if r1
+          i3, s3 = index, []
           r4 = _nt_alpha_char
           s3 << r4
-          if r4.success?
-            s5, nr5, i5 = [], [], index
+          if r4
+            s5, i5 = [], index
             loop do
               r6 = _nt_alphanumeric_char
-              nr5 << r6
-              if r6.success?
+              if r6
                 s5 << r6
               else
                 break
               end
             end
-            r5 = SyntaxNode.new(input, i5...index, s5, nr5)
+            r5 = SyntaxNode.new(input, i5...index, s5)
             s3 << r5
           end
-          if s3.last.success?
+          if s3.last
             r3 = (SyntaxNode).new(input, i3...index, s3)
             r3.extend(Nonterminal0)
           else
             self.index = i3
-            r3 = ParseFailure.new(input, i3, s3)
+            r3 = nil
           end
           s0 << r3
         end
-        if s0.last.success?
+        if s0.last
           r0 = (Nonterminal).new(input, i0...index, s0)
           r0.extend(Nonterminal1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:nonterminal][start_index] = r0
@@ -1683,34 +1742,21 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        r1 = _nt_single_quoted_string
-        nr0 << r1
-        if r1.success?
+        i0 = index
+        r1 = _nt_quoted_string
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r2 = _nt_double_quoted_string
-          nr0 << r2
-          if r2.success?
+          r2 = _nt_character_class
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
-            r3 = _nt_character_class
-            nr0 << r3
-            if r3.success?
+            r3 = _nt_anything_symbol
+            if r3
               r0 = r3
-              r3.update_nested_results(nr0)
             else
-              r4 = _nt_anything_symbol
-              nr0 << r4
-              if r4.success?
-                r0 = r4
-                r4.update_nested_results(nr0)
-              else
-                self.index = i0
-                r0 = ParseFailure.new(input, i0, nr0)
-              end
+              self.index = i0
+              r0 = nil
             end
           end
         end
@@ -1720,10 +1766,49 @@ module Treetop
         return r0
       end
       
+      module QuotedString0
+        def string
+          super.text_value
+        end
+      end
+      
+      def _nt_quoted_string
+        start_index = index
+        cached = node_cache[:quoted_string][index]
+        if cached
+          @index = cached.interval.end
+          return cached
+        end
+        
+        i0 = index
+        r1 = _nt_single_quoted_string
+        if r1
+          r0 = r1
+          r0.extend(QuotedString0)
+        else
+          r2 = _nt_double_quoted_string
+          if r2
+            r0 = r2
+            r0.extend(QuotedString0)
+          else
+            self.index = i0
+            r0 = nil
+          end
+        end
+        
+        node_cache[:quoted_string][start_index] = r0
+        
+        return r0
+      end
+      
       module DoubleQuotedString0
       end
       
       module DoubleQuotedString1
+        def string
+          elements[1]
+        end
+        
       end
       
       def _nt_double_quoted_string
@@ -1734,76 +1819,105 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('"', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('"', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('"')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
-            i3, s3, nr3 = index, [], []
+            i3, s3 = index, []
             i4 = index
-            r5 = parse_terminal('"', SyntaxNode)
-            if r5.success?
-              r4 = ParseFailure.new(input, i4, r5.nested_failures)
+            if input.index('"', index) == index
+              r5 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('"')
+              r5 = nil
+            end
+            if r5
+              r4 = nil
             else
               self.index = i4
-              r4 = SyntaxNode.new(input, index...index, r5.nested_failures)
+              r4 = SyntaxNode.new(input, index...index)
             end
             s3 << r4
-            if r4.success?
-              i6, nr6 = index, []
-              r7 = parse_terminal("\\\\", SyntaxNode)
-              nr6 << r7
-              if r7.success?
+            if r4
+              i6 = index
+              if input.index("\\\\", index) == index
+                r7 = (SyntaxNode).new(input, index...(index + 2))
+                @index += 2
+              else
+                terminal_parse_failure("\\\\")
+                r7 = nil
+              end
+              if r7
                 r6 = r7
-                r7.update_nested_results(nr6)
               else
-                r8 = parse_terminal('\"', SyntaxNode)
-                nr6 << r8
-                if r8.success?
+                if input.index('\"', index) == index
+                  r8 = (SyntaxNode).new(input, index...(index + 2))
+                  @index += 2
+                else
+                  terminal_parse_failure('\"')
+                  r8 = nil
+                end
+                if r8
                   r6 = r8
-                  r8.update_nested_results(nr6)
                 else
-                  r9 = parse_anything(SyntaxNode)
-                  nr6 << r9
-                  if r9.success?
+                  if index < input_length
+                    r9 = (SyntaxNode).new(input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure("any character")
+                    r9 = nil
+                  end
+                  if r9
                     r6 = r9
-                    r9.update_nested_results(nr6)
                   else
                     self.index = i6
-                    r6 = ParseFailure.new(input, i6, nr6)
+                    r6 = nil
                   end
                 end
               end
               s3 << r6
             end
-            if s3.last.success?
+            if s3.last
               r3 = (SyntaxNode).new(input, i3...index, s3)
               r3.extend(DoubleQuotedString0)
             else
               self.index = i3
-              r3 = ParseFailure.new(input, i3, s3)
+              r3 = nil
             end
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+          r2 = SyntaxNode.new(input, i2...index, s2)
           s0 << r2
-          if r2.success?
-            r10 = parse_terminal('"', SyntaxNode)
+          if r2
+            if input.index('"', index) == index
+              r10 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('"')
+              r10 = nil
+            end
             s0 << r10
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (Terminal).new(input, i0...index, s0)
           r0.extend(DoubleQuotedString1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:double_quoted_string][start_index] = r0
@@ -1815,6 +1929,10 @@ module Treetop
       end
       
       module SingleQuotedString1
+        def string
+          elements[1]
+        end
+        
       end
       
       def _nt_single_quoted_string
@@ -1825,76 +1943,105 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal("'", SyntaxNode)
+        i0, s0 = index, []
+        if input.index("'", index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure("'")
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
-            i3, s3, nr3 = index, [], []
+            i3, s3 = index, []
             i4 = index
-            r5 = parse_terminal("'", SyntaxNode)
-            if r5.success?
-              r4 = ParseFailure.new(input, i4, r5.nested_failures)
+            if input.index("'", index) == index
+              r5 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure("'")
+              r5 = nil
+            end
+            if r5
+              r4 = nil
             else
               self.index = i4
-              r4 = SyntaxNode.new(input, index...index, r5.nested_failures)
+              r4 = SyntaxNode.new(input, index...index)
             end
             s3 << r4
-            if r4.success?
-              i6, nr6 = index, []
-              r7 = parse_terminal("\\\\", SyntaxNode)
-              nr6 << r7
-              if r7.success?
+            if r4
+              i6 = index
+              if input.index("\\\\", index) == index
+                r7 = (SyntaxNode).new(input, index...(index + 2))
+                @index += 2
+              else
+                terminal_parse_failure("\\\\")
+                r7 = nil
+              end
+              if r7
                 r6 = r7
-                r7.update_nested_results(nr6)
               else
-                r8 = parse_terminal("\\'", SyntaxNode)
-                nr6 << r8
-                if r8.success?
+                if input.index("\\'", index) == index
+                  r8 = (SyntaxNode).new(input, index...(index + 2))
+                  @index += 2
+                else
+                  terminal_parse_failure("\\'")
+                  r8 = nil
+                end
+                if r8
                   r6 = r8
-                  r8.update_nested_results(nr6)
                 else
-                  r9 = parse_anything(SyntaxNode)
-                  nr6 << r9
-                  if r9.success?
+                  if index < input_length
+                    r9 = (SyntaxNode).new(input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure("any character")
+                    r9 = nil
+                  end
+                  if r9
                     r6 = r9
-                    r9.update_nested_results(nr6)
                   else
                     self.index = i6
-                    r6 = ParseFailure.new(input, i6, nr6)
+                    r6 = nil
                   end
                 end
               end
               s3 << r6
             end
-            if s3.last.success?
+            if s3.last
               r3 = (SyntaxNode).new(input, i3...index, s3)
               r3.extend(SingleQuotedString0)
             else
               self.index = i3
-              r3 = ParseFailure.new(input, i3, s3)
+              r3 = nil
             end
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+          r2 = SyntaxNode.new(input, i2...index, s2)
           s0 << r2
-          if r2.success?
-            r10 = parse_terminal("'", SyntaxNode)
+          if r2
+            if input.index("'", index) == index
+              r10 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure("'")
+              r10 = nil
+            end
             s0 << r10
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (Terminal).new(input, i0...index, s0)
           r0.extend(SingleQuotedString1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:single_quoted_string][start_index] = r0
@@ -1906,6 +2053,16 @@ module Treetop
       end
       
       module CharacterClass1
+        def characters
+          elements[1]
+        end
+        
+      end
+      
+      module CharacterClass2
+        def characters
+          super.text_value
+        end
       end
       
       def _nt_character_class
@@ -1916,51 +2073,70 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('[', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('[', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('[')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
-            i3, s3, nr3 = index, [], []
+            i3, s3 = index, []
             i4 = index
-            r5 = parse_terminal(']', SyntaxNode)
-            if r5.success?
-              r4 = ParseFailure.new(input, i4, r5.nested_failures)
+            if input.index(']', index) == index
+              r5 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure(']')
+              r5 = nil
+            end
+            if r5
+              r4 = nil
             else
               self.index = i4
-              r4 = SyntaxNode.new(input, index...index, r5.nested_failures)
+              r4 = SyntaxNode.new(input, index...index)
             end
             s3 << r4
-            if r4.success?
-              i6, nr6 = index, []
-              r7 = parse_terminal('\]', SyntaxNode)
-              nr6 << r7
-              if r7.success?
+            if r4
+              i6 = index
+              if input.index('\]', index) == index
+                r7 = (SyntaxNode).new(input, index...(index + 2))
+                @index += 2
+              else
+                terminal_parse_failure('\]')
+                r7 = nil
+              end
+              if r7
                 r6 = r7
-                r7.update_nested_results(nr6)
               else
-                r8 = parse_anything(SyntaxNode)
-                nr6 << r8
-                if r8.success?
+                if index < input_length
+                  r8 = (SyntaxNode).new(input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure("any character")
+                  r8 = nil
+                end
+                if r8
                   r6 = r8
-                  r8.update_nested_results(nr6)
                 else
                   self.index = i6
-                  r6 = ParseFailure.new(input, i6, nr6)
+                  r6 = nil
                 end
               end
               s3 << r6
             end
-            if s3.last.success?
+            if s3.last
               r3 = (SyntaxNode).new(input, i3...index, s3)
               r3.extend(CharacterClass0)
             else
               self.index = i3
-              r3 = ParseFailure.new(input, i3, s3)
+              r3 = nil
             end
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
@@ -1968,22 +2144,29 @@ module Treetop
           end
           if s2.empty?
             self.index = i2
-            r2 = ParseFailure.new(input, i2, nr2)
+            r2 = nil
           else
-            r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+            r2 = SyntaxNode.new(input, i2...index, s2)
           end
           s0 << r2
-          if r2.success?
-            r9 = parse_terminal(']', SyntaxNode)
+          if r2
+            if input.index(']', index) == index
+              r9 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure(']')
+              r9 = nil
+            end
             s0 << r9
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (CharacterClass).new(input, i0...index, s0)
           r0.extend(CharacterClass1)
+          r0.extend(CharacterClass2)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:character_class][start_index] = r0
@@ -1999,7 +2182,13 @@ module Treetop
           return cached
         end
         
-        r0 = parse_terminal('.', AnythingSymbol)
+        if input.index('.', index) == index
+          r0 = (AnythingSymbol).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('.')
+          r0 = nil
+        end
         
         node_cache[:anything_symbol][start_index] = r0
         
@@ -2036,39 +2225,56 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        i1, s1, nr1 = index, [], []
+        i0 = index
+        i1, s1 = index, []
         r2 = _nt_space
         s1 << r2
-        if r2.success?
-          r3 = parse_terminal('<', SyntaxNode)
+        if r2
+          if input.index('<', index) == index
+            r3 = (SyntaxNode).new(input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('<')
+            r3 = nil
+          end
           s1 << r3
-          if r3.success?
-            s4, nr4, i4 = [], [], index
+          if r3
+            s4, i4 = [], index
             loop do
-              i5, s5, nr5 = index, [], []
+              i5, s5 = index, []
               i6 = index
-              r7 = parse_terminal('>', SyntaxNode)
-              if r7.success?
-                r6 = ParseFailure.new(input, i6, r7.nested_failures)
+              if input.index('>', index) == index
+                r7 = (SyntaxNode).new(input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure('>')
+                r7 = nil
+              end
+              if r7
+                r6 = nil
               else
                 self.index = i6
-                r6 = SyntaxNode.new(input, index...index, r7.nested_failures)
+                r6 = SyntaxNode.new(input, index...index)
               end
               s5 << r6
-              if r6.success?
-                r8 = parse_anything(SyntaxNode)
+              if r6
+                if index < input_length
+                  r8 = (SyntaxNode).new(input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure("any character")
+                  r8 = nil
+                end
                 s5 << r8
               end
-              if s5.last.success?
+              if s5.last
                 r5 = (SyntaxNode).new(input, i5...index, s5)
                 r5.extend(NodeClassExpression0)
               else
                 self.index = i5
-                r5 = ParseFailure.new(input, i5, s5)
+                r5 = nil
               end
-              nr4 << r5
-              if r5.success?
+              if r5
                 s4 << r5
               else
                 break
@@ -2076,38 +2282,47 @@ module Treetop
             end
             if s4.empty?
               self.index = i4
-              r4 = ParseFailure.new(input, i4, nr4)
+              r4 = nil
             else
-              r4 = SyntaxNode.new(input, i4...index, s4, nr4)
+              r4 = SyntaxNode.new(input, i4...index, s4)
             end
             s1 << r4
-            if r4.success?
-              r9 = parse_terminal('>', SyntaxNode)
+            if r4
+              if input.index('>', index) == index
+                r9 = (SyntaxNode).new(input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure('>')
+                r9 = nil
+              end
               s1 << r9
             end
           end
         end
-        if s1.last.success?
+        if s1.last
           r1 = (SyntaxNode).new(input, i1...index, s1)
           r1.extend(NodeClassExpression1)
           r1.extend(NodeClassExpression2)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r10 = parse_terminal('', SyntaxNode, NodeClassExpression3)
-          nr0 << r10
-          if r10.success?
+          if input.index('', index) == index
+            r10 = (SyntaxNode).new(input, index...(index + 0))
+            r10.extend(NodeClassExpression3)
+            @index += 0
+          else
+            terminal_parse_failure('')
+            r10 = nil
+          end
+          if r10
             r0 = r10
-            r10.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -2158,35 +2373,38 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
-        i1, s1, nr1 = index, [], []
+        i0 = index
+        i1, s1 = index, []
         r2 = _nt_space
         s1 << r2
-        if r2.success?
+        if r2
           r3 = _nt_inline_module
           s1 << r3
         end
-        if s1.last.success?
+        if s1.last
           r1 = (SyntaxNode).new(input, i1...index, s1)
           r1.extend(TrailingInlineModule0)
           r1.extend(TrailingInlineModule1)
         else
           self.index = i1
-          r1 = ParseFailure.new(input, i1, s1)
+          r1 = nil
         end
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r4 = parse_terminal('', SyntaxNode, TrailingInlineModule2)
-          nr0 << r4
-          if r4.success?
+          if input.index('', index) == index
+            r4 = (SyntaxNode).new(input, index...(index + 0))
+            r4.extend(TrailingInlineModule2)
+            @index += 0
+          else
+            terminal_parse_failure('')
+            r4 = nil
+          end
+          if r4
             r0 = r4
-            r4.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -2209,69 +2427,87 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        r1 = parse_terminal('{', SyntaxNode)
+        i0, s0 = index, []
+        if input.index('{', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('{')
+          r1 = nil
+        end
         s0 << r1
-        if r1.success?
-          s2, nr2, i2 = [], [], index
+        if r1
+          s2, i2 = [], index
           loop do
-            i3, nr3 = index, []
+            i3 = index
             r4 = _nt_inline_module
-            nr3 << r4
-            if r4.success?
+            if r4
               r3 = r4
-              r4.update_nested_results(nr3)
             else
-              i5, s5, nr5 = index, [], []
+              i5, s5 = index, []
               i6 = index
-              r7 = parse_char_class(/[{}]/, '{}', SyntaxNode)
-              if r7.success?
-                r6 = ParseFailure.new(input, i6, r7.nested_failures)
+              if input.index(/[{}]/, index) == index
+                r7 = (SyntaxNode).new(input, index...(index + 1))
+                @index += 1
+              else
+                r7 = nil
+              end
+              if r7
+                r6 = nil
               else
                 self.index = i6
-                r6 = SyntaxNode.new(input, index...index, r7.nested_failures)
+                r6 = SyntaxNode.new(input, index...index)
               end
               s5 << r6
-              if r6.success?
-                r8 = parse_anything(SyntaxNode)
+              if r6
+                if index < input_length
+                  r8 = (SyntaxNode).new(input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure("any character")
+                  r8 = nil
+                end
                 s5 << r8
               end
-              if s5.last.success?
+              if s5.last
                 r5 = (SyntaxNode).new(input, i5...index, s5)
                 r5.extend(InlineModule0)
               else
                 self.index = i5
-                r5 = ParseFailure.new(input, i5, s5)
+                r5 = nil
               end
-              nr3 << r5
-              if r5.success?
+              if r5
                 r3 = r5
-                r5.update_nested_results(nr3)
               else
                 self.index = i3
-                r3 = ParseFailure.new(input, i3, nr3)
+                r3 = nil
               end
             end
-            nr2 << r3
-            if r3.success?
+            if r3
               s2 << r3
             else
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2, nr2)
+          r2 = SyntaxNode.new(input, i2...index, s2)
           s0 << r2
-          if r2.success?
-            r9 = parse_terminal('}', SyntaxNode)
+          if r2
+            if input.index('}', index) == index
+              r9 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('}')
+              r9 = nil
+            end
             s0 << r9
           end
         end
-        if s0.last.success?
+        if s0.last
           r0 = (InlineModule).new(input, i0...index, s0)
           r0.extend(InlineModule1)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:inline_module][start_index] = r0
@@ -2290,42 +2526,50 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
-        i1, nr1 = index, []
-        r2 = parse_terminal('rule', SyntaxNode)
-        nr1 << r2
-        if r2.success?
+        i0, s0 = index, []
+        i1 = index
+        if input.index('rule', index) == index
+          r2 = (SyntaxNode).new(input, index...(index + 4))
+          @index += 4
+        else
+          terminal_parse_failure('rule')
+          r2 = nil
+        end
+        if r2
           r1 = r2
-          r2.update_nested_results(nr1)
         else
-          r3 = parse_terminal('end', SyntaxNode)
-          nr1 << r3
-          if r3.success?
+          if input.index('end', index) == index
+            r3 = (SyntaxNode).new(input, index...(index + 3))
+            @index += 3
+          else
+            terminal_parse_failure('end')
+            r3 = nil
+          end
+          if r3
             r1 = r3
-            r3.update_nested_results(nr1)
           else
             self.index = i1
-            r1 = ParseFailure.new(input, i1, nr1)
+            r1 = nil
           end
         end
         s0 << r1
-        if r1.success?
+        if r1
           i4 = index
           r5 = _nt_non_space_char
-          if r5.success?
-            r4 = ParseFailure.new(input, i4, r5.nested_failures)
+          if r5
+            r4 = nil
           else
             self.index = i4
-            r4 = SyntaxNode.new(input, index...index, r5.nested_failures)
+            r4 = SyntaxNode.new(input, index...index)
           end
           s0 << r4
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(KeywordInsideGrammar0)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:keyword_inside_grammar][start_index] = r0
@@ -2344,26 +2588,32 @@ module Treetop
           return cached
         end
         
-        i0, s0, nr0 = index, [], []
+        i0, s0 = index, []
         i1 = index
         r2 = _nt_space
-        if r2.success?
-          r1 = ParseFailure.new(input, i1, r2.nested_failures)
+        if r2
+          r1 = nil
         else
           self.index = i1
-          r1 = SyntaxNode.new(input, index...index, r2.nested_failures)
+          r1 = SyntaxNode.new(input, index...index)
         end
         s0 << r1
-        if r1.success?
-          r3 = parse_anything(SyntaxNode)
+        if r1
+          if index < input_length
+            r3 = (SyntaxNode).new(input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure("any character")
+            r3 = nil
+          end
           s0 << r3
         end
-        if s0.last.success?
+        if s0.last
           r0 = (SyntaxNode).new(input, i0...index, s0)
           r0.extend(NonSpaceChar0)
         else
           self.index = i0
-          r0 = ParseFailure.new(input, i0, s0)
+          r0 = nil
         end
         
         node_cache[:non_space_char][start_index] = r0
@@ -2379,7 +2629,12 @@ module Treetop
           return cached
         end
         
-        r0 = parse_char_class(/[A-Za-z_]/, 'A-Za-z_', SyntaxNode)
+        if input.index(/[A-Za-z_]/, index) == index
+          r0 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          r0 = nil
+        end
         
         node_cache[:alpha_char][start_index] = r0
         
@@ -2394,21 +2649,22 @@ module Treetop
           return cached
         end
         
-        i0, nr0 = index, []
+        i0 = index
         r1 = _nt_alpha_char
-        nr0 << r1
-        if r1.success?
+        if r1
           r0 = r1
-          r1.update_nested_results(nr0)
         else
-          r2 = parse_char_class(/[0-9]/, '0-9', SyntaxNode)
-          nr0 << r2
-          if r2.success?
+          if input.index(/[0-9]/, index) == index
+            r2 = (SyntaxNode).new(input, index...(index + 1))
+            @index += 1
+          else
+            r2 = nil
+          end
+          if r2
             r0 = r2
-            r2.update_nested_results(nr0)
           else
             self.index = i0
-            r0 = ParseFailure.new(input, i0, nr0)
+            r0 = nil
           end
         end
         
@@ -2425,11 +2681,22 @@ module Treetop
           return cached
         end
         
-        s0, nr0, i0 = [], [], index
+        s0, i0 = [], index
         loop do
-          r1 = parse_char_class(/[ \t\n\r]/, ' \t\n\r', SyntaxNode)
-          nr0 << r1
-          if r1.success?
+          i1 = index
+          r2 = _nt_white
+          if r2
+            r1 = r2
+          else
+            r3 = _nt_comment_to_eol
+            if r3
+              r1 = r3
+            else
+              self.index = i1
+              r1 = nil
+            end
+          end
+          if r1
             s0 << r1
           else
             break
@@ -2437,9 +2704,9 @@ module Treetop
         end
         if s0.empty?
           self.index = i0
-          r0 = ParseFailure.new(input, i0, nr0)
+          r0 = nil
         else
-          r0 = SyntaxNode.new(input, i0...index, s0, nr0)
+          r0 = SyntaxNode.new(input, i0...index, s0)
         end
         
         node_cache[:space][start_index] = r0
@@ -2447,6 +2714,112 @@ module Treetop
         return r0
       end
       
+      module CommentToEol0
+      end
+      
+      module CommentToEol1
+      end
+      
+      def _nt_comment_to_eol
+        start_index = index
+        cached = node_cache[:comment_to_eol][index]
+        if cached
+          @index = cached.interval.end
+          return cached
+        end
+        
+        i0, s0 = index, []
+        if input.index('#', index) == index
+          r1 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('#')
+          r1 = nil
+        end
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            i3, s3 = index, []
+            i4 = index
+            if input.index("\n", index) == index
+              r5 = (SyntaxNode).new(input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure("\n")
+              r5 = nil
+            end
+            if r5
+              r4 = nil
+            else
+              self.index = i4
+              r4 = SyntaxNode.new(input, index...index)
+            end
+            s3 << r4
+            if r4
+              if index < input_length
+                r6 = (SyntaxNode).new(input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure("any character")
+                r6 = nil
+              end
+              s3 << r6
+            end
+            if s3.last
+              r3 = (SyntaxNode).new(input, i3...index, s3)
+              r3.extend(CommentToEol0)
+            else
+              self.index = i3
+              r3 = nil
+            end
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          if s2.empty?
+            self.index = i2
+            r2 = nil
+          else
+            r2 = SyntaxNode.new(input, i2...index, s2)
+          end
+          s0 << r2
+        end
+        if s0.last
+          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0.extend(CommentToEol1)
+        else
+          self.index = i0
+          r0 = nil
+        end
+        
+        node_cache[:comment_to_eol][start_index] = r0
+        
+        return r0
+      end
+      
+      def _nt_white
+        start_index = index
+        cached = node_cache[:white][index]
+        if cached
+          @index = cached.interval.end
+          return cached
+        end
+        
+        if input.index(/[ \t\n\r]/, index) == index
+          r0 = (SyntaxNode).new(input, index...(index + 1))
+          @index += 1
+        else
+          r0 = nil
+        end
+        
+        node_cache[:white][start_index] = r0
+        
+        return r0
+      end
+      
     end
     
     class MetagrammarParser < Treetop::Runtime::CompiledParser
@@ -2454,4 +2827,4 @@ module Treetop
     end
 
   end
-end
+end