treetop 1.5.3 → 1.6.12

data/lib/treetop/compiler/metagrammar.rb

@@ -21,7 +21,7 @@ module Treetop
           elements[0]
         end
 
-        def prefix
+        def spacing
           elements[1]
         end
 
@@ -36,7 +36,7 @@ module Treetop
 
       module TreetopFile2
         def compile
-          requires.text_value + prefix.text_value + module_or_grammar.compile + suffix.text_value
+          requires.text_value + spacing.text_value + module_or_grammar.compile + suffix.text_value
         end
       end
 
@@ -118,7 +118,7 @@ module Treetop
       end
 
       module RequireStatement0
-        def prefix
+        def spacing
           elements[0]
         end
 
@@ -148,7 +148,7 @@ module Treetop
             r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure("require")
+            terminal_parse_failure('"require"')
             r3 = nil
           end
           s0 << r3
@@ -159,6 +159,7 @@ module Treetop
                 r5 = true
                 @index += 1
               else
+                terminal_parse_failure('[ \\t]')
                 r5 = nil
               end
               if r5
@@ -181,6 +182,7 @@ module Treetop
                   r7 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[^\\n\\r]')
                   r7 = nil
                 end
                 if r7
@@ -201,6 +203,7 @@ module Treetop
                   r8 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[\\n\\r]')
                   r8 = nil
                 end
                 s0 << r8
@@ -281,7 +284,7 @@ module Treetop
       end
 
       module ModuleDeclaration4
-        def prefix
+        def module_prefix
           elements[0]
         end
 
@@ -296,11 +299,11 @@ module Treetop
 
       module ModuleDeclaration5
         def compile
-          prefix.text_value + module_contents.compile + suffix.text_value
+          module_prefix.text_value + module_contents.compile + suffix.text_value
         end
 
 	  def parser_name
-	    prefix.name.text_value+'::'+module_contents.parser_name
+	    module_prefix.name.text_value+'::'+module_contents.parser_name
 	  end
       end
 
@@ -317,100 +320,122 @@ module Treetop
 
         i0, s0 = index, []
         i1, s1 = index, []
+        i2 = index
         if (match_len = has_terminal?('module', false, index))
-          r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('module')
-          r2 = nil
+          terminal_parse_failure('\'module\'')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r2 = r3
+        else
+          if (match_len = has_terminal?('class', false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('\'class\'')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r2 = r4
+          else
+            @index = i2
+            r2 = nil
+          end
         end
         s1 << r2
         if r2
-          r3 = _nt_space
-          s1 << r3
-          if r3
-            i4, s4 = index, []
+          r5 = _nt_space
+          s1 << r5
+          if r5
+            i6, s6 = index, []
             if has_terminal?(@regexps[gr = '\A[A-Z]'] ||= Regexp.new(gr), :regexp, index)
-              r5 = true
+              r7 = true
               @index += 1
             else
-              r5 = nil
+              terminal_parse_failure('[A-Z]')
+              r7 = nil
             end
-            s4 << r5
-            if r5
-              s6, i6 = [], index
+            s6 << r7
+            if r7
+              s8, i8 = [], index
               loop do
-                r7 = _nt_alphanumeric_char
-                if r7
-                  s6 << r7
+                r9 = _nt_alphanumeric_char
+                if r9
+                  s8 << r9
                 else
                   break
                 end
               end
-              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-              s4 << r6
-              if r6
-                s8, i8 = [], index
+              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+              s6 << r8
+              if r8
+                s10, i10 = [], index
                 loop do
-                  i9, s9 = index, []
+                  i11, s11 = index, []
                   if (match_len = has_terminal?('::', false, index))
-                    r10 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                    r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('::')
-                    r10 = nil
+                    terminal_parse_failure('\'::\'')
+                    r12 = nil
                   end
-                  s9 << r10
-                  if r10
+                  s11 << r12
+                  if r12
                     if has_terminal?(@regexps[gr = '\A[A-Z]'] ||= Regexp.new(gr), :regexp, index)
-                      r11 = true
+                      r13 = true
                       @index += 1
                     else
-                      r11 = nil
+                      terminal_parse_failure('[A-Z]')
+                      r13 = nil
                     end
-                    s9 << r11
-                    if r11
-                      s12, i12 = [], index
+                    s11 << r13
+                    if r13
+                      s14, i14 = [], index
                       loop do
-                        r13 = _nt_alphanumeric_char
-                        if r13
-                          s12 << r13
+                        r15 = _nt_alphanumeric_char
+                        if r15
+                          s14 << r15
                         else
                           break
                         end
                       end
-                      r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-                      s9 << r12
+                      r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+                      s11 << r14
                     end
                   end
-                  if s9.last
-                    r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-                    r9.extend(ModuleDeclaration0)
+                  if s11.last
+                    r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+                    r11.extend(ModuleDeclaration0)
                   else
-                    @index = i9
-                    r9 = nil
+                    @index = i11
+                    r11 = nil
                   end
-                  if r9
-                    s8 << r9
+                  if r11
+                    s10 << r11
                   else
                     break
                   end
                 end
-                r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-                s4 << r8
+                r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+                s6 << r10
               end
             end
-            if s4.last
-              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-              r4.extend(ModuleDeclaration1)
+            if s6.last
+              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+              r6.extend(ModuleDeclaration1)
             else
-              @index = i4
-              r4 = nil
+              @index = i6
+              r6 = nil
             end
-            s1 << r4
-            if r4
-              r14 = _nt_space
-              s1 << r14
+            s1 << r6
+            if r6
+              r16 = _nt_space
+              s1 << r16
             end
           end
         end
@@ -423,44 +448,44 @@ module Treetop
         end
         s0 << r1
         if r1
-          i15 = index
-          r16 = _nt_module_declaration
-          if r16
-            r16 = SyntaxNode.new(input, (index-1)...index) if r16 == true
-            r15 = r16
+          i17 = index
+          r18 = _nt_module_declaration
+          if r18
+            r18 = SyntaxNode.new(input, (index-1)...index) if r18 == true
+            r17 = r18
           else
-            r17 = _nt_grammar
-            if r17
-              r17 = SyntaxNode.new(input, (index-1)...index) if r17 == true
-              r15 = r17
+            r19 = _nt_grammar
+            if r19
+              r19 = SyntaxNode.new(input, (index-1)...index) if r19 == true
+              r17 = r19
             else
-              @index = i15
-              r15 = nil
+              @index = i17
+              r17 = nil
             end
           end
-          s0 << r15
-          if r15
-            i18, s18 = index, []
-            r19 = _nt_space
-            s18 << r19
-            if r19
+          s0 << r17
+          if r17
+            i20, s20 = index, []
+            r21 = _nt_space
+            s20 << r21
+            if r21
               if (match_len = has_terminal?('end', false, index))
-                r20 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure('end')
-                r20 = nil
+                terminal_parse_failure('\'end\'')
+                r22 = nil
               end
-              s18 << r20
+              s20 << r22
             end
-            if s18.last
-              r18 = instantiate_node(SyntaxNode,input, i18...index, s18)
-              r18.extend(ModuleDeclaration3)
+            if s20.last
+              r20 = instantiate_node(SyntaxNode,input, i20...index, s20)
+              r20.extend(ModuleDeclaration3)
             else
-              @index = i18
-              r18 = nil
+              @index = i20
+              r20 = nil
             end
-            s0 << r18
+            s0 << r20
           end
         end
         if s0.last
@@ -518,7 +543,7 @@ module Treetop
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('grammar')
+          terminal_parse_failure('\'grammar\'')
           r1 = nil
         end
         s0 << r1
@@ -537,7 +562,7 @@ module Treetop
                   r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure('do')
+                  terminal_parse_failure('\'do\'')
                   r7 = nil
                 end
                 s6 << r7
@@ -574,7 +599,7 @@ module Treetop
                         r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                         @index += match_len
                       else
-                        terminal_parse_failure('end')
+                        terminal_parse_failure('\'end\'')
                         r12 = nil
                       end
                       s0 << r12
@@ -617,6 +642,7 @@ module Treetop
           r1 = true
           @index += 1
         else
+          terminal_parse_failure('[A-Z]')
           r1 = nil
         end
         s0 << r1
@@ -739,7 +765,7 @@ module Treetop
             r7.extend(DeclarationSequence3)
             @index += match_len
           else
-            terminal_parse_failure('')
+            terminal_parse_failure('\'\'')
             r7 = nil
           end
           if r7
@@ -817,7 +843,7 @@ module Treetop
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('include')
+          terminal_parse_failure('\'include\'')
           r1 = nil
         end
         s0 << r1
@@ -829,6 +855,7 @@ module Treetop
               r3 = true
               @index += 1
             else
+              terminal_parse_failure('[A-Z]')
               r3 = nil
             end
             s0 << r3
@@ -845,7 +872,7 @@ module Treetop
                     r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('::')
+                    terminal_parse_failure('\'::\'')
                     r7 = nil
                   end
                   if r7
@@ -926,7 +953,7 @@ module Treetop
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('rule')
+          terminal_parse_failure('\'rule\'')
           r1 = nil
         end
         s0 << r1
@@ -945,7 +972,7 @@ module Treetop
                   r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure('do')
+                  terminal_parse_failure('\'do\'')
                   r7 = nil
                 end
                 s6 << r7
@@ -977,7 +1004,7 @@ module Treetop
                         r11 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                         @index += match_len
                       else
-                        terminal_parse_failure('end')
+                        terminal_parse_failure('\'end\'')
                         r11 = nil
                       end
                       s0 << r11
@@ -1064,9 +1091,17 @@ module Treetop
           super.elements.map {|elt| elt.alternative}
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           (alternatives.map {|alt| alt.inline_modules }).flatten
         end
+
+        def inline_module
+	    nil
+	  end
       end
 
       def _nt_choice
@@ -1099,7 +1134,7 @@ module Treetop
                 r6 = true
                 @index += match_len
               else
-                terminal_parse_failure('/')
+                terminal_parse_failure('\'/\'')
                 r6 = nil
               end
               s3 << r6
@@ -1171,12 +1206,20 @@ module Treetop
           sequence_body.tail
         end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
         def inline_modules
           (sequence_elements.map {|elt| elt.inline_modules}).flatten +
           [sequence_element_accessor_module] +
-          node_class_declarations.inline_modules
+          parent_modules
         end
 
+        def inline_module
+	    node_class_declarations.inline_module
+	  end
+
         def inline_module_name
           node_class_declarations.inline_module_name
         end
@@ -1354,6 +1397,7 @@ module Treetop
 
         r0 = _nt_labeled_sequence_primary
         r0.extend(LabeledExpressionSequenceBody0)
+        r0.extend(LabeledExpressionSequenceBody0)
 
         node_cache[:labeled_expression_sequence_body][start_index] = r0
 
@@ -1411,10 +1455,18 @@ module Treetop
           atomic
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           atomic.inline_modules
         end
 
+        def inline_module
+	    atomic.inline_module
+	  end
+
         def inline_module_name
           nil
         end
@@ -1425,7 +1477,7 @@ module Treetop
           elements[0]
         end
 
-        def predicate_block
+        def atomic
           elements[2]
         end
       end
@@ -1435,11 +1487,17 @@ module Treetop
           prefix.compile(address, builder, self)
         end
         def prefixed_expression
-          predicate_block
+          atomic
         end
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           []
         end
+        def inline_module
+	    nil
+	  end
       end
 
       module Primary4
@@ -1458,6 +1516,9 @@ module Treetop
 
       module Primary5
         def compile(address, builder, parent_expression=nil)
+	    if node_class_declarations.inline_module && atomic.inline_module
+	      STDERR.puts "Extraneous module ignored after suffix: #{input[interval].inspect}"
+	    end
           suffix.compile(address, builder, self)
         end
 
@@ -1469,10 +1530,18 @@ module Treetop
           node_class_declarations.node_class_name
         end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
         def inline_modules
-          atomic.inline_modules + node_class_declarations.inline_modules
+          atomic.inline_modules + parent_modules
         end
 
+        def inline_module
+          node_class_declarations.inline_module
+	  end
+
         def inline_module_name
           node_class_declarations.inline_module_name
         end
@@ -1490,6 +1559,9 @@ module Treetop
 
       module Primary7
         def compile(address, builder, parent_expression=nil)
+	    if node_class_declarations.inline_module && atomic.inline_module
+	      STDERR.puts "Extraneous module ignored with nested atomic: #{input[interval].inspect}"
+	    end
           atomic.compile(address, builder, self)
         end
 
@@ -1497,10 +1569,18 @@ module Treetop
           node_class_declarations.node_class_name
         end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
         def inline_modules
-          atomic.inline_modules + node_class_declarations.inline_modules
+          atomic.inline_modules + parent_modules
         end
 
+        def inline_module
+          node_class_declarations.inline_module
+	  end
+
         def inline_module_name
           node_class_declarations.inline_module_name
         end
@@ -1666,6 +1746,10 @@ module Treetop
           sequence_primary.compile(lexical_address, builder)
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           sequence_primary.inline_modules
         end
@@ -1722,6 +1806,10 @@ module Treetop
           sequence_primary.compile(lexical_address, builder)
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           sequence_primary.inline_modules
         end
@@ -1856,7 +1944,7 @@ module Treetop
             r5 = true
             @index += match_len
           else
-            terminal_parse_failure(':')
+            terminal_parse_failure('\':\'')
             r5 = nil
           end
           s0 << r5
@@ -1897,7 +1985,7 @@ module Treetop
           r0.extend(NullLabel0)
           @index += match_len
         else
-          terminal_parse_failure('')
+          terminal_parse_failure('\'\'')
           r0 = nil
         end
 
@@ -1925,6 +2013,10 @@ module Treetop
           elements[1]
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           atomic.inline_modules
         end
@@ -1939,7 +2031,7 @@ module Treetop
           elements[0]
         end
 
-        def predicate_block
+        def atomic
           elements[2]
         end
       end
@@ -1949,8 +2041,11 @@ module Treetop
           prefix.compile(address, builder, self)
         end
         def prefixed_expression
-          predicate_block
+          atomic
         end
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           []
         end
@@ -1975,6 +2070,10 @@ module Treetop
           nil
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           atomic.inline_modules
         end
@@ -2126,7 +2225,7 @@ module Treetop
           r0 = instantiate_node(Optional,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('?')
+          terminal_parse_failure('\'?\'')
           r0 = nil
         end
 
@@ -2211,7 +2310,7 @@ module Treetop
           r1 = instantiate_node(OneOrMore,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('+')
+          terminal_parse_failure('\'+\'')
           r1 = nil
         end
         if r1
@@ -2222,7 +2321,7 @@ module Treetop
             r2 = instantiate_node(ZeroOrMore,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('*')
+            terminal_parse_failure('\'*\'')
             r2 = nil
           end
           if r2
@@ -2281,6 +2380,7 @@ module Treetop
               r4 = true
               @index += 1
             else
+              terminal_parse_failure('[0-9]')
               r4 = nil
             end
             if r4
@@ -2296,7 +2396,7 @@ module Treetop
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('..')
+              terminal_parse_failure('\'..\'')
               r5 = nil
             end
             s0 << r5
@@ -2307,6 +2407,7 @@ module Treetop
                   r7 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[0-9]')
                   r7 = nil
                 end
                 if r7
@@ -2349,7 +2450,7 @@ module Treetop
           r1 = instantiate_node(AndPredicate,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('&')
+          terminal_parse_failure('\'&\'')
           r1 = nil
         end
         if r1
@@ -2360,7 +2461,7 @@ module Treetop
             r2 = instantiate_node(NotPredicate,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('!')
+            terminal_parse_failure('\'!\'')
             r2 = nil
           end
           if r2
@@ -2371,7 +2472,7 @@ module Treetop
               r3 = instantiate_node(TransientPrefix,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('~')
+              terminal_parse_failure('\'~\'')
               r3 = nil
             end
             if r3
@@ -2435,9 +2536,15 @@ module Treetop
       end
 
       module ParenthesizedExpression1
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           parsing_expression.inline_modules
         end
+        def inline_module
+          parsing_expression.inline_module
+        end
       end
 
       def _nt_parenthesized_expression
@@ -2456,7 +2563,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('(')
+          terminal_parse_failure('\'(\'')
           r1 = nil
         end
         s0 << r1
@@ -2484,7 +2591,7 @@ module Treetop
                   r7 = true
                   @index += match_len
                 else
-                  terminal_parse_failure(')')
+                  terminal_parse_failure('\')\'')
                   r7 = nil
                 end
                 s0 << r7
@@ -2531,6 +2638,7 @@ module Treetop
         i1 = index
         r2 = _nt_keyword_inside_grammar
         if r2
+          @index = i1
           r1 = nil
         else
           @index = i1
@@ -2665,6 +2773,7 @@ module Treetop
               r5 = true
               @index += 1
             else
+              terminal_parse_failure('[ir]')
               r5 = nil
             end
             if r5
@@ -2716,7 +2825,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('"')
+          terminal_parse_failure('\'"\'')
           r1 = nil
         end
         s0 << r1
@@ -2729,12 +2838,15 @@ module Treetop
               r5 = true
               @index += match_len
             else
-              terminal_parse_failure('"')
+              terminal_parse_failure('\'"\'')
               r5 = nil
             end
             if r5
+              @index = i4
               r4 = nil
+              terminal_parse_failure('\'"\'', true)
             else
+              @terminal_failures.pop
               @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
@@ -2745,7 +2857,7 @@ module Treetop
                 r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure("\\\\")
+                terminal_parse_failure('"\\\\\\\\"')
                 r7 = nil
               end
               if r7
@@ -2756,7 +2868,7 @@ module Treetop
                   r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure('\"')
+                  terminal_parse_failure('\'\\"\'')
                   r8 = nil
                 end
                 if r8
@@ -2801,7 +2913,7 @@ module Treetop
               r10 = true
               @index += match_len
             else
-              terminal_parse_failure('"')
+              terminal_parse_failure('\'"\'')
               r10 = nil
             end
             s0 << r10
@@ -2846,7 +2958,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure("'")
+          terminal_parse_failure('"\'"')
           r1 = nil
         end
         s0 << r1
@@ -2859,12 +2971,15 @@ module Treetop
               r5 = true
               @index += match_len
             else
-              terminal_parse_failure("'")
+              terminal_parse_failure('"\'"')
               r5 = nil
             end
             if r5
+              @index = i4
               r4 = nil
+              terminal_parse_failure('"\'"', true)
             else
+              @terminal_failures.pop
               @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
@@ -2875,7 +2990,7 @@ module Treetop
                 r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure("\\\\")
+                terminal_parse_failure('"\\\\\\\\"')
                 r7 = nil
               end
               if r7
@@ -2886,7 +3001,7 @@ module Treetop
                   r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure("\\'")
+                  terminal_parse_failure('"\\\\\'"')
                   r8 = nil
                 end
                 if r8
@@ -2931,7 +3046,7 @@ module Treetop
               r10 = true
               @index += match_len
             else
-              terminal_parse_failure("'")
+              terminal_parse_failure('"\'"')
               r10 = nil
             end
             s0 << r10
@@ -2988,7 +3103,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('[')
+          terminal_parse_failure('\'[\'')
           r1 = nil
         end
         s0 << r1
@@ -3001,12 +3116,15 @@ module Treetop
               r5 = true
               @index += match_len
             else
-              terminal_parse_failure(']')
+              terminal_parse_failure('\']\'')
               r5 = nil
             end
             if r5
+              @index = i4
               r4 = nil
+              terminal_parse_failure('\']\'', true)
             else
+              @terminal_failures.pop
               @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
@@ -3018,7 +3136,7 @@ module Treetop
                 r8 = true
                 @index += match_len
               else
-                terminal_parse_failure('\\')
+                terminal_parse_failure('\'\\\\\'')
                 r8 = nil
               end
               s7 << r8
@@ -3054,12 +3172,15 @@ module Treetop
                     r13 = true
                     @index += match_len
                   else
-                    terminal_parse_failure('\\')
+                    terminal_parse_failure('\'\\\\\'')
                     r13 = nil
                   end
                   if r13
+                    @index = i12
                     r12 = nil
+                    terminal_parse_failure('\'\\\\\'', true)
                   else
+                    @terminal_failures.pop
                     @index = i12
                     r12 = instantiate_node(SyntaxNode,input, index...index)
                   end
@@ -3117,7 +3238,7 @@ module Treetop
               r15 = true
               @index += match_len
             else
-              terminal_parse_failure(']')
+              terminal_parse_failure('\']\'')
               r15 = nil
             end
             s0 << r15
@@ -3156,7 +3277,7 @@ module Treetop
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('[:')
+          terminal_parse_failure('\'[:\'')
           r1 = nil
         end
         s0 << r1
@@ -3165,7 +3286,7 @@ module Treetop
             r3 = true
             @index += match_len
           else
-            terminal_parse_failure('^')
+            terminal_parse_failure('\'^\'')
             r3 = nil
           end
           if r3
@@ -3180,7 +3301,7 @@ module Treetop
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('alnum')
+              terminal_parse_failure('\'alnum\'')
               r5 = nil
             end
             if r5
@@ -3191,7 +3312,7 @@ module Treetop
                 r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure('alpha')
+                terminal_parse_failure('\'alpha\'')
                 r6 = nil
               end
               if r6
@@ -3202,7 +3323,7 @@ module Treetop
                   r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure('blank')
+                  terminal_parse_failure('\'blank\'')
                   r7 = nil
                 end
                 if r7
@@ -3213,7 +3334,7 @@ module Treetop
                     r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('cntrl')
+                    terminal_parse_failure('\'cntrl\'')
                     r8 = nil
                   end
                   if r8
@@ -3224,7 +3345,7 @@ module Treetop
                       r9 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                       @index += match_len
                     else
-                      terminal_parse_failure('digit')
+                      terminal_parse_failure('\'digit\'')
                       r9 = nil
                     end
                     if r9
@@ -3235,7 +3356,7 @@ module Treetop
                         r10 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                         @index += match_len
                       else
-                        terminal_parse_failure('graph')
+                        terminal_parse_failure('\'graph\'')
                         r10 = nil
                       end
                       if r10
@@ -3246,7 +3367,7 @@ module Treetop
                           r11 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                           @index += match_len
                         else
-                          terminal_parse_failure('lower')
+                          terminal_parse_failure('\'lower\'')
                           r11 = nil
                         end
                         if r11
@@ -3257,7 +3378,7 @@ module Treetop
                             r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                             @index += match_len
                           else
-                            terminal_parse_failure('print')
+                            terminal_parse_failure('\'print\'')
                             r12 = nil
                           end
                           if r12
@@ -3268,7 +3389,7 @@ module Treetop
                               r13 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                               @index += match_len
                             else
-                              terminal_parse_failure('punct')
+                              terminal_parse_failure('\'punct\'')
                               r13 = nil
                             end
                             if r13
@@ -3279,7 +3400,7 @@ module Treetop
                                 r14 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                                 @index += match_len
                               else
-                                terminal_parse_failure('space')
+                                terminal_parse_failure('\'space\'')
                                 r14 = nil
                               end
                               if r14
@@ -3290,7 +3411,7 @@ module Treetop
                                   r15 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                                   @index += match_len
                                 else
-                                  terminal_parse_failure('upper')
+                                  terminal_parse_failure('\'upper\'')
                                   r15 = nil
                                 end
                                 if r15
@@ -3301,7 +3422,7 @@ module Treetop
                                     r16 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                                     @index += match_len
                                   else
-                                    terminal_parse_failure('xdigit')
+                                    terminal_parse_failure('\'xdigit\'')
                                     r16 = nil
                                   end
                                   if r16
@@ -3312,7 +3433,7 @@ module Treetop
                                       r17 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                                       @index += match_len
                                     else
-                                      terminal_parse_failure('word')
+                                      terminal_parse_failure('\'word\'')
                                       r17 = nil
                                     end
                                     if r17
@@ -3340,7 +3461,7 @@ module Treetop
                 r18 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure(':]')
+                terminal_parse_failure('\':]\'')
                 r18 = nil
               end
               s0 << r18
@@ -3375,7 +3496,7 @@ module Treetop
           r0 = instantiate_node(AnythingSymbol,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('.')
+          terminal_parse_failure('\'.\'')
           r0 = nil
         end
 
@@ -3426,7 +3547,7 @@ module Treetop
             r3 = true
             @index += match_len
           else
-            terminal_parse_failure('<')
+            terminal_parse_failure('\'<\'')
             r3 = nil
           end
           s1 << r3
@@ -3439,12 +3560,15 @@ module Treetop
                 r7 = true
                 @index += match_len
               else
-                terminal_parse_failure('>')
+                terminal_parse_failure('\'>\'')
                 r7 = nil
               end
               if r7
+                @index = i6
                 r6 = nil
+                terminal_parse_failure('\'>\'', true)
               else
+                @terminal_failures.pop
                 @index = i6
                 r6 = instantiate_node(SyntaxNode,input, index...index)
               end
@@ -3484,7 +3608,7 @@ module Treetop
                 r9 = true
                 @index += match_len
               else
-                terminal_parse_failure('>')
+                terminal_parse_failure('\'>\'')
                 r9 = nil
               end
               s1 << r9
@@ -3508,7 +3632,7 @@ module Treetop
             r10.extend(NodeClassExpression3)
             @index += match_len
           else
-            terminal_parse_failure('')
+            terminal_parse_failure('\'\'')
             r10 = nil
           end
           if r10
@@ -3536,6 +3660,9 @@ module Treetop
       end
 
       module TrailingInlineModule1
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           [inline_module]
         end
@@ -3546,6 +3673,9 @@ module Treetop
       end
 
       module TrailingInlineModule2
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           []
         end
@@ -3595,7 +3725,7 @@ module Treetop
             r4.extend(TrailingInlineModule2)
             @index += match_len
           else
-            terminal_parse_failure('')
+            terminal_parse_failure('\'\'')
             r4 = nil
           end
           if r4
@@ -3634,7 +3764,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('')
+          terminal_parse_failure('\'\'')
           r1 = nil
         end
         s0 << r1
@@ -3677,7 +3807,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('{')
+          terminal_parse_failure('\'{\'')
           r1 = nil
         end
         s0 << r1
@@ -3696,11 +3826,15 @@ module Treetop
                 r7 = true
                 @index += 1
               else
+                terminal_parse_failure('[{}]')
                 r7 = nil
               end
               if r7
+                @index = i6
                 r6 = nil
+                terminal_parse_failure('[{}]', true)
               else
+                @terminal_failures.pop
                 @index = i6
                 r6 = instantiate_node(SyntaxNode,input, index...index)
               end
@@ -3743,7 +3877,7 @@ module Treetop
               r9 = true
               @index += match_len
             else
-              terminal_parse_failure('}')
+              terminal_parse_failure('\'}\'')
               r9 = nil
             end
             s0 << r9
@@ -3782,7 +3916,7 @@ module Treetop
           r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('rule')
+          terminal_parse_failure('\'rule\'')
           r2 = nil
         end
         if r2
@@ -3793,7 +3927,7 @@ module Treetop
             r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('end')
+            terminal_parse_failure('\'end\'')
             r3 = nil
           end
           if r3
@@ -3809,6 +3943,7 @@ module Treetop
           i4 = index
           r5 = _nt_non_space_char
           if r5
+            @index = i4
             r4 = nil
           else
             @index = i4
@@ -3847,6 +3982,7 @@ module Treetop
         i1 = index
         r2 = _nt_space
         if r2
+          @index = i1
           r1 = nil
         else
           @index = i1
@@ -3891,6 +4027,7 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
+          terminal_parse_failure('[A-Za-z_]')
           r0 = nil
         end
 
@@ -3920,6 +4057,7 @@ module Treetop
             r2 = true
             @index += 1
           else
+            terminal_parse_failure('[0-9]')
             r2 = nil
           end
           if r2
@@ -4004,7 +4142,7 @@ module Treetop
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('#')
+          terminal_parse_failure('\'#\'')
           r1 = nil
         end
         s0 << r1
@@ -4017,12 +4155,15 @@ module Treetop
               r5 = true
               @index += match_len
             else
-              terminal_parse_failure("\n")
+              terminal_parse_failure('"\\n"')
               r5 = nil
             end
             if r5
+              @index = i4
               r4 = nil
+              terminal_parse_failure('"\\n"', true)
             else
+              @terminal_failures.pop
               @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
@@ -4081,6 +4222,7 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
+          terminal_parse_failure('[ \\t\\n\\r]')
           r0 = nil
         end