treetop 1.3.0 → 1.4.1

data/lib/treetop/compiler/metagrammar.rb

@@ -1,3 +1,6 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
 module Treetop
   module Compiler
     module Metagrammar
@@ -64,7 +67,7 @@ module Treetop
             r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
             r2.extend(TreetopFile0)
           else
-            self.index = i2
+            @index = i2
             r2 = nil
           end
           if r2
@@ -93,7 +96,7 @@ module Treetop
               if r10
                 r8 = r10
               else
-                self.index = i8
+                @index = i8
                 r8 = nil
               end
             end
@@ -114,13 +117,13 @@ module Treetop
           r0.extend(TreetopFile1)
           r0.extend(TreetopFile2)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:treetop_file][start_index] = r0
 
-        return r0
+        r0
       end
 
       module RequireStatement0
@@ -147,7 +150,7 @@ module Treetop
         end
         s0 << r1
         if r1
-          if input.index("require", index) == index
+          if has_terminal?("require", false, index)
             r3 = instantiate_node(SyntaxNode,input, index...(index + 7))
             @index += 7
           else
@@ -158,9 +161,10 @@ module Treetop
           if r3
             s4, i4 = [], index
             loop do
-              if input.index(Regexp.new('[ \\t]'), index) == index
-                r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if has_terminal?('\G[ \\t]', true, index)
+                next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                r5 = true
+                @index = next_character
               else
                 r5 = nil
               end
@@ -171,7 +175,7 @@ module Treetop
               end
             end
             if s4.empty?
-              self.index = i4
+              @index = i4
               r4 = nil
             else
               r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
@@ -180,9 +184,10 @@ module Treetop
             if r4
               s6, i6 = [], index
               loop do
-                if input.index(Regexp.new('[^\\n\\r]'), index) == index
-                  r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if has_terminal?('\G[^\\n\\r]', true, index)
+                  next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                  r7 = true
+                  @index = next_character
                 else
                   r7 = nil
                 end
@@ -193,16 +198,17 @@ module Treetop
                 end
               end
               if s6.empty?
-                self.index = i6
+                @index = i6
                 r6 = nil
               else
                 r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
               end
               s0 << r6
               if r6
-                if input.index(Regexp.new('[\\n\\r]'), index) == index
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if has_terminal?('\G[\\n\\r]', true, index)
+                  next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                  r8 = true
+                  @index = next_character
                 else
                   r8 = nil
                 end
@@ -215,21 +221,21 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(RequireStatement0)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:require_statement][start_index] = r0
 
-        return r0
+        r0
       end
 
       module ModuleDeclaration0
-        def space
+        def space1
           elements[1]
         end
 
-        def space
+        def space2
           elements[4]
         end
       end
@@ -271,7 +277,7 @@ module Treetop
 
         i0, s0 = index, []
         i1, s1 = index, []
-        if input.index('module', index) == index
+        if has_terminal?('module', false, index)
           r2 = instantiate_node(SyntaxNode,input, index...(index + 6))
           @index += 6
         else
@@ -283,9 +289,10 @@ module Treetop
           r3 = _nt_space
           s1 << r3
           if r3
-            if input.index(Regexp.new('[A-Z]'), index) == index
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if has_terminal?('\G[A-Z]', true, index)
+              next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+              r4 = true
+              @index = next_character
             else
               r4 = nil
             end
@@ -313,7 +320,7 @@ module Treetop
           r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
           r1.extend(ModuleDeclaration0)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         s0 << r1
@@ -327,7 +334,7 @@ module Treetop
             if r10
               r8 = r10
             else
-              self.index = i8
+              @index = i8
               r8 = nil
             end
           end
@@ -337,7 +344,7 @@ module Treetop
             r12 = _nt_space
             s11 << r12
             if r12
-              if input.index('end', index) == index
+              if has_terminal?('end', false, index)
                 r13 = instantiate_node(SyntaxNode,input, index...(index + 3))
                 @index += 3
               else
@@ -350,7 +357,7 @@ module Treetop
               r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
               r11.extend(ModuleDeclaration1)
             else
-              self.index = i11
+              @index = i11
               r11 = nil
             end
             s0 << r11
@@ -361,13 +368,13 @@ module Treetop
           r0.extend(ModuleDeclaration2)
           r0.extend(ModuleDeclaration3)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:module_declaration][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Grammar0
@@ -377,7 +384,7 @@ module Treetop
       end
 
       module Grammar1
-        def space
+        def space1
           elements[1]
         end
 
@@ -385,7 +392,7 @@ module Treetop
           elements[2]
         end
 
-        def space
+        def space2
           elements[3]
         end
 
@@ -404,7 +411,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('grammar', index) == index
+        if has_terminal?('grammar', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
           @index += 7
         else
@@ -423,7 +430,7 @@ module Treetop
               s0 << r4
               if r4
                 i6, s6 = index, []
-                if input.index('do', index) == index
+                if has_terminal?('do', false, index)
                   r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
                   @index += 2
                 else
@@ -439,7 +446,7 @@ module Treetop
                   r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
                   r6.extend(Grammar0)
                 else
-                  self.index = i6
+                  @index = i6
                   r6 = nil
                 end
                 if r6
@@ -460,7 +467,7 @@ module Treetop
                     end
                     s0 << r10
                     if r10
-                      if input.index('end', index) == index
+                      if has_terminal?('end', false, index)
                         r12 = instantiate_node(SyntaxNode,input, index...(index + 3))
                         @index += 3
                       else
@@ -479,13 +486,13 @@ module Treetop
           r0 = instantiate_node(Grammar,input, i0...index, s0)
           r0.extend(Grammar1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:grammar][start_index] = r0
 
-        return r0
+        r0
       end
 
       module GrammarName0
@@ -500,9 +507,10 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index(Regexp.new('[A-Z]'), index) == index
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if has_terminal?('\G[A-Z]', true, index)
+          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+          r1 = true
+          @index = next_character
         else
           r1 = nil
         end
@@ -524,13 +532,13 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(GrammarName0)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:grammar_name][start_index] = r0
 
-        return r0
+        r0
       end
 
       module DeclarationSequence0
@@ -594,7 +602,7 @@ module Treetop
               r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
               r4.extend(DeclarationSequence0)
             else
-              self.index = i4
+              @index = i4
               r4 = nil
             end
             if r4
@@ -611,13 +619,13 @@ module Treetop
           r1.extend(DeclarationSequence1)
           r1.extend(DeclarationSequence2)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         if r1
           r0 = r1
         else
-          if input.index('', index) == index
+          if has_terminal?('', false, index)
             r7 = instantiate_node(SyntaxNode,input, index...(index + 0))
             r7.extend(DeclarationSequence3)
             @index += 0
@@ -628,14 +636,14 @@ module Treetop
           if r7
             r0 = r7
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:declaration_sequence][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_declaration
@@ -655,14 +663,14 @@ module Treetop
           if r2
             r0 = r2
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:declaration][start_index] = r0
 
-        return r0
+        r0
       end
 
       module IncludeDeclaration0
@@ -687,7 +695,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('include', index) == index
+        if has_terminal?('include', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
           @index += 7
         else
@@ -699,9 +707,10 @@ module Treetop
           r2 = _nt_space
           s0 << r2
           if r2
-            if input.index(Regexp.new('[A-Z]'), index) == index
-              r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if has_terminal?('\G[A-Z]', true, index)
+              next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+              r3 = true
+              @index = next_character
             else
               r3 = nil
             end
@@ -714,7 +723,7 @@ module Treetop
                 if r6
                   r5 = r6
                 else
-                  if input.index('::', index) == index
+                  if has_terminal?('::', false, index)
                     r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
                     @index += 2
                   else
@@ -724,7 +733,7 @@ module Treetop
                   if r7
                     r5 = r7
                   else
-                    self.index = i5
+                    @index = i5
                     r5 = nil
                   end
                 end
@@ -744,13 +753,13 @@ module Treetop
           r0.extend(IncludeDeclaration0)
           r0.extend(IncludeDeclaration1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:include_declaration][start_index] = r0
 
-        return r0
+        r0
       end
 
       module ParsingRule0
@@ -760,7 +769,7 @@ module Treetop
       end
 
       module ParsingRule1
-        def space
+        def space1
           elements[1]
         end
 
@@ -768,7 +777,7 @@ module Treetop
           elements[2]
         end
 
-        def space
+        def space2
           elements[3]
         end
 
@@ -776,7 +785,7 @@ module Treetop
           elements[5]
         end
 
-        def space
+        def space3
           elements[6]
         end
 
@@ -791,7 +800,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('rule', index) == index
+        if has_terminal?('rule', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
           @index += 4
         else
@@ -810,7 +819,7 @@ module Treetop
               s0 << r4
               if r4
                 i6, s6 = index, []
-                if input.index('do', index) == index
+                if has_terminal?('do', false, index)
                   r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
                   @index += 2
                 else
@@ -826,7 +835,7 @@ module Treetop
                   r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
                   r6.extend(ParsingRule0)
                 else
-                  self.index = i6
+                  @index = i6
                   r6 = nil
                 end
                 if r6
@@ -842,7 +851,7 @@ module Treetop
                     r10 = _nt_space
                     s0 << r10
                     if r10
-                      if input.index('end', index) == index
+                      if has_terminal?('end', false, index)
                         r11 = instantiate_node(SyntaxNode,input, index...(index + 3))
                         @index += 3
                       else
@@ -861,13 +870,13 @@ module Treetop
           r0 = instantiate_node(ParsingRule,input, i0...index, s0)
           r0.extend(ParsingRule1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:parsing_rule][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_parsing_expression
@@ -891,7 +900,7 @@ module Treetop
             if r3
               r0 = r3
             else
-              self.index = i0
+              @index = i0
               r0 = nil
             end
           end
@@ -899,7 +908,7 @@ module Treetop
 
         node_cache[:parsing_expression][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Choice0
@@ -955,7 +964,7 @@ module Treetop
             end
             s3 << r4
             if r4
-              if input.index('/', index) == index
+              if has_terminal?('/', false, index)
                 r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
@@ -981,7 +990,7 @@ module Treetop
               r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(Choice0)
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
             if r3
@@ -991,7 +1000,7 @@ module Treetop
             end
           end
           if s2.empty?
-            self.index = i2
+            @index = i2
             r2 = nil
           else
             r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
@@ -1003,13 +1012,13 @@ module Treetop
           r0.extend(Choice1)
           r0.extend(Choice2)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:choice][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Sequence0
@@ -1081,7 +1090,7 @@ module Treetop
               r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(Sequence0)
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
             if r3
@@ -1091,7 +1100,7 @@ module Treetop
             end
           end
           if s2.empty?
-            self.index = i2
+            @index = i2
             r2 = nil
           else
             r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
@@ -1107,13 +1116,13 @@ module Treetop
           r0.extend(Sequence1)
           r0.extend(Sequence2)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:sequence][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_alternative
@@ -1133,14 +1142,14 @@ module Treetop
           if r2
             r0 = r2
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:alternative][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Primary0
@@ -1172,6 +1181,28 @@ module Treetop
       end
 
       module Primary2
+        def prefix
+          elements[0]
+        end
+
+        def predicate_block
+          elements[2]
+        end
+      end
+
+      module Primary3
+        def compile(address, builder, parent_expression=nil)
+          prefix.compile(address, builder, self)
+        end
+        def prefixed_expression
+          predicate_block
+        end
+        def inline_modules
+          []
+        end
+      end
+
+      module Primary4
         def atomic
           elements[0]
         end
@@ -1185,7 +1216,7 @@ module Treetop
         end
       end
 
-      module Primary3
+      module Primary5
         def compile(address, builder, parent_expression=nil)
           suffix.compile(address, builder, self)
         end
@@ -1207,7 +1238,7 @@ module Treetop
         end
       end
 
-      module Primary4
+      module Primary6
         def atomic
           elements[0]
         end
@@ -1217,7 +1248,7 @@ module Treetop
         end
       end
 
-      module Primary5
+      module Primary7
         def compile(address, builder, parent_expression=nil)
           atomic.compile(address, builder, self)
         end
@@ -1256,21 +1287,26 @@ module Treetop
           r1.extend(Primary0)
           r1.extend(Primary1)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         if r1
           r0 = r1
         else
           i4, s4 = index, []
-          r5 = _nt_atomic
+          r5 = _nt_prefix
           s4 << r5
           if r5
-            r6 = _nt_suffix
+            r7 = _nt_space
+            if r7
+              r6 = r7
+            else
+              r6 = instantiate_node(SyntaxNode,input, index...index)
+            end
             s4 << r6
             if r6
-              r7 = _nt_node_class_declarations
-              s4 << r7
+              r8 = _nt_predicate_block
+              s4 << r8
             end
           end
           if s4.last
@@ -1278,39 +1314,62 @@ module Treetop
             r4.extend(Primary2)
             r4.extend(Primary3)
           else
-            self.index = i4
+            @index = i4
             r4 = nil
           end
           if r4
             r0 = r4
           else
-            i8, s8 = index, []
-            r9 = _nt_atomic
-            s8 << r9
-            if r9
-              r10 = _nt_node_class_declarations
-              s8 << r10
+            i9, s9 = index, []
+            r10 = _nt_atomic
+            s9 << r10
+            if r10
+              r11 = _nt_suffix
+              s9 << r11
+              if r11
+                r12 = _nt_node_class_declarations
+                s9 << r12
+              end
             end
-            if s8.last
-              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-              r8.extend(Primary4)
-              r8.extend(Primary5)
+            if s9.last
+              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+              r9.extend(Primary4)
+              r9.extend(Primary5)
             else
-              self.index = i8
-              r8 = nil
+              @index = i9
+              r9 = nil
             end
-            if r8
-              r0 = r8
+            if r9
+              r0 = r9
             else
-              self.index = i0
-              r0 = nil
+              i13, s13 = index, []
+              r14 = _nt_atomic
+              s13 << r14
+              if r14
+                r15 = _nt_node_class_declarations
+                s13 << r15
+              end
+              if s13.last
+                r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+                r13.extend(Primary6)
+                r13.extend(Primary7)
+              else
+                @index = i13
+                r13 = nil
+              end
+              if r13
+                r0 = r13
+              else
+                @index = i0
+                r0 = nil
+              end
             end
           end
         end
 
         node_cache[:primary][start_index] = r0
 
-        return r0
+        r0
       end
 
       module LabeledSequencePrimary0
@@ -1363,13 +1422,13 @@ module Treetop
           r0.extend(LabeledSequencePrimary0)
           r0.extend(LabeledSequencePrimary1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:labeled_sequence_primary][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Label0
@@ -1424,12 +1483,12 @@ module Treetop
           r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           r2.extend(Label0)
         else
-          self.index = i2
+          @index = i2
           r2 = nil
         end
         s1 << r2
         if r2
-          if input.index(':', index) == index
+          if has_terminal?(':', false, index)
             r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
@@ -1443,13 +1502,13 @@ module Treetop
           r1.extend(Label1)
           r1.extend(Label2)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         if r1
           r0 = r1
         else
-          if input.index('', index) == index
+          if has_terminal?('', false, index)
             r7 = instantiate_node(SyntaxNode,input, index...(index + 0))
             r7.extend(Label3)
             @index += 0
@@ -1460,14 +1519,14 @@ module Treetop
           if r7
             r0 = r7
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:label][start_index] = r0
 
-        return r0
+        r0
       end
 
       module SequencePrimary0
@@ -1499,6 +1558,28 @@ module Treetop
       end
 
       module SequencePrimary2
+        def prefix
+          elements[0]
+        end
+
+        def predicate_block
+          elements[2]
+        end
+      end
+
+      module SequencePrimary3
+        def compile(address, builder, parent_expression=nil)
+          prefix.compile(address, builder, self)
+        end
+        def prefixed_expression
+          predicate_block
+        end
+        def inline_modules
+          []
+        end
+      end
+
+      module SequencePrimary4
         def atomic
           elements[0]
         end
@@ -1508,7 +1589,7 @@ module Treetop
         end
       end
 
-      module SequencePrimary3
+      module SequencePrimary5
         def compile(lexical_address, builder)
           suffix.compile(lexical_address, builder, self)
         end
@@ -1547,43 +1628,71 @@ module Treetop
           r1.extend(SequencePrimary0)
           r1.extend(SequencePrimary1)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         if r1
           r0 = r1
         else
           i4, s4 = index, []
-          r5 = _nt_atomic
+          r5 = _nt_prefix
           s4 << r5
           if r5
-            r6 = _nt_suffix
+            r7 = _nt_space
+            if r7
+              r6 = r7
+            else
+              r6 = instantiate_node(SyntaxNode,input, index...index)
+            end
             s4 << r6
+            if r6
+              r8 = _nt_predicate_block
+              s4 << r8
+            end
           end
           if s4.last
             r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
             r4.extend(SequencePrimary2)
             r4.extend(SequencePrimary3)
           else
-            self.index = i4
+            @index = i4
             r4 = nil
           end
           if r4
             r0 = r4
           else
-            r7 = _nt_atomic
-            if r7
-              r0 = r7
+            i9, s9 = index, []
+            r10 = _nt_atomic
+            s9 << r10
+            if r10
+              r11 = _nt_suffix
+              s9 << r11
+            end
+            if s9.last
+              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+              r9.extend(SequencePrimary4)
+              r9.extend(SequencePrimary5)
             else
-              self.index = i0
-              r0 = nil
+              @index = i9
+              r9 = nil
+            end
+            if r9
+              r0 = r9
+            else
+              r12 = _nt_atomic
+              if r12
+                r0 = r12
+              else
+                @index = i0
+                r0 = nil
+              end
             end
           end
         end
 
         node_cache[:sequence_primary][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_suffix
@@ -1603,14 +1712,14 @@ module Treetop
           if r2
             r0 = r2
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:suffix][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_optional_suffix
@@ -1621,7 +1730,7 @@ module Treetop
           return cached
         end
 
-        if input.index('?', index) == index
+        if has_terminal?('?', false, index)
           r0 = instantiate_node(Optional,input, index...(index + 1))
           @index += 1
         else
@@ -1631,7 +1740,7 @@ module Treetop
 
         node_cache[:optional_suffix][start_index] = r0
 
-        return r0
+        r0
       end
 
       module NodeClassDeclarations0
@@ -1682,13 +1791,13 @@ module Treetop
           r0.extend(NodeClassDeclarations0)
           r0.extend(NodeClassDeclarations1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:node_class_declarations][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_repetition_suffix
@@ -1700,7 +1809,7 @@ module Treetop
         end
 
         i0 = index
-        if input.index('+', index) == index
+        if has_terminal?('+', false, index)
           r1 = instantiate_node(OneOrMore,input, index...(index + 1))
           @index += 1
         else
@@ -1710,7 +1819,7 @@ module Treetop
         if r1
           r0 = r1
         else
-          if input.index('*', index) == index
+          if has_terminal?('*', false, index)
             r2 = instantiate_node(ZeroOrMore,input, index...(index + 1))
             @index += 1
           else
@@ -1720,14 +1829,14 @@ module Treetop
           if r2
             r0 = r2
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:repetition_suffix][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_prefix
@@ -1739,7 +1848,7 @@ module Treetop
         end
 
         i0 = index
-        if input.index('&', index) == index
+        if has_terminal?('&', false, index)
           r1 = instantiate_node(AndPredicate,input, index...(index + 1))
           @index += 1
         else
@@ -1749,7 +1858,7 @@ module Treetop
         if r1
           r0 = r1
         else
-          if input.index('!', index) == index
+          if has_terminal?('!', false, index)
             r2 = instantiate_node(NotPredicate,input, index...(index + 1))
             @index += 1
           else
@@ -1759,7 +1868,7 @@ module Treetop
           if r2
             r0 = r2
           else
-            if input.index('~', index) == index
+            if has_terminal?('~', false, index)
               r3 = instantiate_node(TransientPrefix,input, index...(index + 1))
               @index += 1
             else
@@ -1769,7 +1878,7 @@ module Treetop
             if r3
               r0 = r3
             else
-              self.index = i0
+              @index = i0
               r0 = nil
             end
           end
@@ -1777,7 +1886,7 @@ module Treetop
 
         node_cache[:prefix][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_atomic
@@ -1801,7 +1910,7 @@ module Treetop
             if r3
               r0 = r3
             else
-              self.index = i0
+              @index = i0
               r0 = nil
             end
           end
@@ -1809,7 +1918,7 @@ module Treetop
 
         node_cache[:atomic][start_index] = r0
 
-        return r0
+        r0
       end
 
       module ParenthesizedExpression0
@@ -1834,7 +1943,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('(', index) == index
+        if has_terminal?('(', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -1862,7 +1971,7 @@ module Treetop
               end
               s0 << r5
               if r5
-                if input.index(')', index) == index
+                if has_terminal?(')', false, index)
                   r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
                   @index += 1
                 else
@@ -1879,13 +1988,13 @@ module Treetop
           r0.extend(ParenthesizedExpression0)
           r0.extend(ParenthesizedExpression1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:parenthesized_expression][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Nonterminal0
@@ -1912,7 +2021,7 @@ module Treetop
         if r2
           r1 = nil
         else
-          self.index = i1
+          @index = i1
           r1 = instantiate_node(SyntaxNode,input, index...index)
         end
         s0 << r1
@@ -1937,7 +2046,7 @@ module Treetop
             r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
             r3.extend(Nonterminal0)
           else
-            self.index = i3
+            @index = i3
             r3 = nil
           end
           s0 << r3
@@ -1946,13 +2055,13 @@ module Treetop
           r0 = instantiate_node(Nonterminal,input, i0...index, s0)
           r0.extend(Nonterminal1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:nonterminal][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_terminal
@@ -1976,7 +2085,7 @@ module Treetop
             if r3
               r0 = r3
             else
-              self.index = i0
+              @index = i0
               r0 = nil
             end
           end
@@ -1984,7 +2093,7 @@ module Treetop
 
         node_cache[:terminal][start_index] = r0
 
-        return r0
+        r0
       end
 
       module QuotedString0
@@ -2012,14 +2121,14 @@ module Treetop
             r0 = r2
             r0.extend(QuotedString0)
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:quoted_string][start_index] = r0
 
-        return r0
+        r0
       end
 
       module DoubleQuotedString0
@@ -2041,7 +2150,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('"', index) == index
+        if has_terminal?('"', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -2054,7 +2163,7 @@ module Treetop
           loop do
             i3, s3 = index, []
             i4 = index
-            if input.index('"', index) == index
+            if has_terminal?('"', false, index)
               r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2064,13 +2173,13 @@ module Treetop
             if r5
               r4 = nil
             else
-              self.index = i4
+              @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s3 << r4
             if r4
               i6 = index
-              if input.index("\\\\", index) == index
+              if has_terminal?("\\\\", false, index)
                 r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
                 @index += 2
               else
@@ -2080,7 +2189,7 @@ module Treetop
               if r7
                 r6 = r7
               else
-                if input.index('\"', index) == index
+                if has_terminal?('\"', false, index)
                   r8 = instantiate_node(SyntaxNode,input, index...(index + 2))
                   @index += 2
                 else
@@ -2091,8 +2200,9 @@ module Treetop
                   r6 = r8
                 else
                   if index < input_length
-                    r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                    next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                    r9 = instantiate_node(SyntaxNode,input, index...next_character)
+                    @index = next_character
                   else
                     terminal_parse_failure("any character")
                     r9 = nil
@@ -2100,7 +2210,7 @@ module Treetop
                   if r9
                     r6 = r9
                   else
-                    self.index = i6
+                    @index = i6
                     r6 = nil
                   end
                 end
@@ -2111,7 +2221,7 @@ module Treetop
               r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(DoubleQuotedString0)
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
             if r3
@@ -2123,7 +2233,7 @@ module Treetop
           r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
-            if input.index('"', index) == index
+            if has_terminal?('"', false, index)
               r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2137,13 +2247,13 @@ module Treetop
           r0 = instantiate_node(Terminal,input, i0...index, s0)
           r0.extend(DoubleQuotedString1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:double_quoted_string][start_index] = r0
 
-        return r0
+        r0
       end
 
       module SingleQuotedString0
@@ -2165,7 +2275,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index("'", index) == index
+        if has_terminal?("'", false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -2178,7 +2288,7 @@ module Treetop
           loop do
             i3, s3 = index, []
             i4 = index
-            if input.index("'", index) == index
+            if has_terminal?("'", false, index)
               r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2188,13 +2298,13 @@ module Treetop
             if r5
               r4 = nil
             else
-              self.index = i4
+              @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s3 << r4
             if r4
               i6 = index
-              if input.index("\\\\", index) == index
+              if has_terminal?("\\\\", false, index)
                 r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
                 @index += 2
               else
@@ -2204,7 +2314,7 @@ module Treetop
               if r7
                 r6 = r7
               else
-                if input.index("\\'", index) == index
+                if has_terminal?("\\'", false, index)
                   r8 = instantiate_node(SyntaxNode,input, index...(index + 2))
                   @index += 2
                 else
@@ -2215,8 +2325,9 @@ module Treetop
                   r6 = r8
                 else
                   if index < input_length
-                    r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                    next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                    r9 = instantiate_node(SyntaxNode,input, index...next_character)
+                    @index = next_character
                   else
                     terminal_parse_failure("any character")
                     r9 = nil
@@ -2224,7 +2335,7 @@ module Treetop
                   if r9
                     r6 = r9
                   else
-                    self.index = i6
+                    @index = i6
                     r6 = nil
                   end
                 end
@@ -2235,7 +2346,7 @@ module Treetop
               r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(SingleQuotedString0)
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
             if r3
@@ -2247,7 +2358,7 @@ module Treetop
           r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
-            if input.index("'", index) == index
+            if has_terminal?("'", false, index)
               r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2261,13 +2372,13 @@ module Treetop
           r0 = instantiate_node(Terminal,input, i0...index, s0)
           r0.extend(SingleQuotedString1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:single_quoted_string][start_index] = r0
 
-        return r0
+        r0
       end
 
       module CharacterClass0
@@ -2301,7 +2412,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('[', index) == index
+        if has_terminal?('[', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -2314,7 +2425,7 @@ module Treetop
           loop do
             i3, s3 = index, []
             i4 = index
-            if input.index(']', index) == index
+            if has_terminal?(']', false, index)
               r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2324,14 +2435,14 @@ module Treetop
             if r5
               r4 = nil
             else
-              self.index = i4
+              @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s3 << r4
             if r4
               i6 = index
               i7, s7 = index, []
-              if input.index('\\', index) == index
+              if has_terminal?('\\', false, index)
                 r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
@@ -2341,8 +2452,9 @@ module Treetop
               s7 << r8
               if r8
                 if index < input_length
-                  r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                  next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                  r9 = instantiate_node(SyntaxNode,input, index...next_character)
+                  @index = next_character
                 else
                   terminal_parse_failure("any character")
                   r9 = nil
@@ -2353,7 +2465,7 @@ module Treetop
                 r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
                 r7.extend(CharacterClass0)
               else
-                self.index = i7
+                @index = i7
                 r7 = nil
               end
               if r7
@@ -2361,7 +2473,7 @@ module Treetop
               else
                 i10, s10 = index, []
                 i11 = index
-                if input.index('\\', index) == index
+                if has_terminal?('\\', false, index)
                   r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
                   @index += 1
                 else
@@ -2371,14 +2483,15 @@ module Treetop
                 if r12
                   r11 = nil
                 else
-                  self.index = i11
+                  @index = i11
                   r11 = instantiate_node(SyntaxNode,input, index...index)
                 end
                 s10 << r11
                 if r11
                   if index < input_length
-                    r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                    next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                    r13 = instantiate_node(SyntaxNode,input, index...next_character)
+                    @index = next_character
                   else
                     terminal_parse_failure("any character")
                     r13 = nil
@@ -2389,13 +2502,13 @@ module Treetop
                   r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
                   r10.extend(CharacterClass1)
                 else
-                  self.index = i10
+                  @index = i10
                   r10 = nil
                 end
                 if r10
                   r6 = r10
                 else
-                  self.index = i6
+                  @index = i6
                   r6 = nil
                 end
               end
@@ -2405,7 +2518,7 @@ module Treetop
               r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(CharacterClass2)
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
             if r3
@@ -2415,14 +2528,14 @@ module Treetop
             end
           end
           if s2.empty?
-            self.index = i2
+            @index = i2
             r2 = nil
           else
             r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           end
           s0 << r2
           if r2
-            if input.index(']', index) == index
+            if has_terminal?(']', false, index)
               r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2437,13 +2550,13 @@ module Treetop
           r0.extend(CharacterClass3)
           r0.extend(CharacterClass4)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:character_class][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_anything_symbol
@@ -2454,7 +2567,7 @@ module Treetop
           return cached
         end
 
-        if input.index('.', index) == index
+        if has_terminal?('.', false, index)
           r0 = instantiate_node(AnythingSymbol,input, index...(index + 1))
           @index += 1
         else
@@ -2464,7 +2577,7 @@ module Treetop
 
         node_cache[:anything_symbol][start_index] = r0
 
-        return r0
+        r0
       end
 
       module NodeClassExpression0
@@ -2502,7 +2615,7 @@ module Treetop
         r2 = _nt_space
         s1 << r2
         if r2
-          if input.index('<', index) == index
+          if has_terminal?('<', false, index)
             r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
@@ -2515,7 +2628,7 @@ module Treetop
             loop do
               i5, s5 = index, []
               i6 = index
-              if input.index('>', index) == index
+              if has_terminal?('>', false, index)
                 r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
@@ -2525,14 +2638,15 @@ module Treetop
               if r7
                 r6 = nil
               else
-                self.index = i6
+                @index = i6
                 r6 = instantiate_node(SyntaxNode,input, index...index)
               end
               s5 << r6
               if r6
                 if index < input_length
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                  next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                  r8 = instantiate_node(SyntaxNode,input, index...next_character)
+                  @index = next_character
                 else
                   terminal_parse_failure("any character")
                   r8 = nil
@@ -2543,7 +2657,7 @@ module Treetop
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 r5.extend(NodeClassExpression0)
               else
-                self.index = i5
+                @index = i5
                 r5 = nil
               end
               if r5
@@ -2553,14 +2667,14 @@ module Treetop
               end
             end
             if s4.empty?
-              self.index = i4
+              @index = i4
               r4 = nil
             else
               r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
             end
             s1 << r4
             if r4
-              if input.index('>', index) == index
+              if has_terminal?('>', false, index)
                 r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
@@ -2576,13 +2690,13 @@ module Treetop
           r1.extend(NodeClassExpression1)
           r1.extend(NodeClassExpression2)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         if r1
           r0 = r1
         else
-          if input.index('', index) == index
+          if has_terminal?('', false, index)
             r10 = instantiate_node(SyntaxNode,input, index...(index + 0))
             r10.extend(NodeClassExpression3)
             @index += 0
@@ -2593,14 +2707,14 @@ module Treetop
           if r10
             r0 = r10
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:node_class_expression][start_index] = r0
 
-        return r0
+        r0
       end
 
       module TrailingInlineModule0
@@ -2658,13 +2772,13 @@ module Treetop
           r1.extend(TrailingInlineModule0)
           r1.extend(TrailingInlineModule1)
         else
-          self.index = i1
+          @index = i1
           r1 = nil
         end
         if r1
           r0 = r1
         else
-          if input.index('', index) == index
+          if has_terminal?('', false, index)
             r4 = instantiate_node(SyntaxNode,input, index...(index + 0))
             r4.extend(TrailingInlineModule2)
             @index += 0
@@ -2675,14 +2789,54 @@ module Treetop
           if r4
             r0 = r4
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:trailing_inline_module][start_index] = r0
 
-        return r0
+        r0
+      end
+
+      module PredicateBlock0
+        def inline_module
+          elements[1]
+        end
+      end
+
+      def _nt_predicate_block
+        start_index = index
+        if node_cache[:predicate_block].has_key?(index)
+          cached = node_cache[:predicate_block][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0, s0 = index, []
+        if has_terminal?('', false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 0))
+          @index += 0
+        else
+          terminal_parse_failure('')
+          r1 = nil
+        end
+        s0 << r1
+        if r1
+          r2 = _nt_inline_module
+          s0 << r2
+        end
+        if s0.last
+          r0 = instantiate_node(PredicateBlock,input, i0...index, s0)
+          r0.extend(PredicateBlock0)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:predicate_block][start_index] = r0
+
+        r0
       end
 
       module InlineModule0
@@ -2700,7 +2854,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('{', index) == index
+        if has_terminal?('{', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -2718,23 +2872,25 @@ module Treetop
             else
               i5, s5 = index, []
               i6 = index
-              if input.index(Regexp.new('[{}]'), index) == index
-                r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if has_terminal?('\G[{}]', true, index)
+                next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                r7 = true
+                @index = next_character
               else
                 r7 = nil
               end
               if r7
                 r6 = nil
               else
-                self.index = i6
+                @index = i6
                 r6 = instantiate_node(SyntaxNode,input, index...index)
               end
               s5 << r6
               if r6
                 if index < input_length
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                  next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                  r8 = instantiate_node(SyntaxNode,input, index...next_character)
+                  @index = next_character
                 else
                   terminal_parse_failure("any character")
                   r8 = nil
@@ -2745,13 +2901,13 @@ module Treetop
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 r5.extend(InlineModule0)
               else
-                self.index = i5
+                @index = i5
                 r5 = nil
               end
               if r5
                 r3 = r5
               else
-                self.index = i3
+                @index = i3
                 r3 = nil
               end
             end
@@ -2764,7 +2920,7 @@ module Treetop
           r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
-            if input.index('}', index) == index
+            if has_terminal?('}', false, index)
               r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -2778,13 +2934,13 @@ module Treetop
           r0 = instantiate_node(InlineModule,input, i0...index, s0)
           r0.extend(InlineModule1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:inline_module][start_index] = r0
 
-        return r0
+        r0
       end
 
       module KeywordInsideGrammar0
@@ -2800,7 +2956,7 @@ module Treetop
 
         i0, s0 = index, []
         i1 = index
-        if input.index('rule', index) == index
+        if has_terminal?('rule', false, index)
           r2 = instantiate_node(SyntaxNode,input, index...(index + 4))
           @index += 4
         else
@@ -2810,7 +2966,7 @@ module Treetop
         if r2
           r1 = r2
         else
-          if input.index('end', index) == index
+          if has_terminal?('end', false, index)
             r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
             @index += 3
           else
@@ -2820,7 +2976,7 @@ module Treetop
           if r3
             r1 = r3
           else
-            self.index = i1
+            @index = i1
             r1 = nil
           end
         end
@@ -2831,7 +2987,7 @@ module Treetop
           if r5
             r4 = nil
           else
-            self.index = i4
+            @index = i4
             r4 = instantiate_node(SyntaxNode,input, index...index)
           end
           s0 << r4
@@ -2840,13 +2996,13 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(KeywordInsideGrammar0)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:keyword_inside_grammar][start_index] = r0
 
-        return r0
+        r0
       end
 
       module NonSpaceChar0
@@ -2866,14 +3022,15 @@ module Treetop
         if r2
           r1 = nil
         else
-          self.index = i1
+          @index = i1
           r1 = instantiate_node(SyntaxNode,input, index...index)
         end
         s0 << r1
         if r1
           if index < input_length
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+            next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+            r3 = instantiate_node(SyntaxNode,input, index...next_character)
+            @index = next_character
           else
             terminal_parse_failure("any character")
             r3 = nil
@@ -2884,13 +3041,13 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(NonSpaceChar0)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:non_space_char][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_alpha_char
@@ -2901,16 +3058,17 @@ module Treetop
           return cached
         end
 
-        if input.index(Regexp.new('[A-Za-z_]'), index) == index
-          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if has_terminal?('\G[A-Za-z_]', true, index)
+          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+          r0 = instantiate_node(SyntaxNode, input, index...next_character)
+          @index = next_character
         else
           r0 = nil
         end
 
         node_cache[:alpha_char][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_alphanumeric_char
@@ -2926,23 +3084,24 @@ module Treetop
         if r1
           r0 = r1
         else
-          if input.index(Regexp.new('[0-9]'), index) == index
-            r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if has_terminal?('\G[0-9]', true, index)
+            next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+            r2 = true
+            @index = next_character
           else
             r2 = nil
           end
           if r2
             r0 = r2
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:alphanumeric_char][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_space
@@ -2964,7 +3123,7 @@ module Treetop
             if r3
               r1 = r3
             else
-              self.index = i1
+              @index = i1
               r1 = nil
             end
           end
@@ -2975,7 +3134,7 @@ module Treetop
           end
         end
         if s0.empty?
-          self.index = i0
+          @index = i0
           r0 = nil
         else
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -2983,7 +3142,7 @@ module Treetop
 
         node_cache[:space][start_index] = r0
 
-        return r0
+        r0
       end
 
       module CommentToEol0
@@ -3001,7 +3160,7 @@ module Treetop
         end
 
         i0, s0 = index, []
-        if input.index('#', index) == index
+        if has_terminal?('#', false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -3014,7 +3173,7 @@ module Treetop
           loop do
             i3, s3 = index, []
             i4 = index
-            if input.index("\n", index) == index
+            if has_terminal?("\n", false, index)
               r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -3024,14 +3183,15 @@ module Treetop
             if r5
               r4 = nil
             else
-              self.index = i4
+              @index = i4
               r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s3 << r4
             if r4
               if index < input_length
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+                next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+                r6 = instantiate_node(SyntaxNode,input, index...next_character)
+                @index = next_character
               else
                 terminal_parse_failure("any character")
                 r6 = nil
@@ -3042,7 +3202,7 @@ module Treetop
               r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(CommentToEol0)
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
             if r3
@@ -3058,13 +3218,13 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(CommentToEol1)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:comment_to_eol][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_white
@@ -3075,16 +3235,17 @@ module Treetop
           return cached
         end
 
-        if input.index(Regexp.new('[ \\t\\n\\r]'), index) == index
-          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if has_terminal?('\G[ \\t\\n\\r]', true, index)
+          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+          r0 = instantiate_node(SyntaxNode, input, index...next_character)
+          @index = next_character
         else
           r0 = nil
         end
 
         node_cache[:white][start_index] = r0
 
-        return r0
+        r0
       end
 
     end