0
@@ -135,7 +135,12 @@ module Treetop
0
           r3 = _nt_space
0
           s1 << r3
0
           if r3.success?
0
-            r4 = parse_char_class(/[A-Z]/, 'A-Z', SyntaxNode)
0
+            if input.index(/[A-Z]/, index) == index
0
+              r4 = (SyntaxNode).new(input, index...(index + 1))
0
+              @index += 1
0
+            else
0
+              r4 = nil
0
+            end
0
             s1 << r4
0
             if r4.success?
0
               s5, i5 = [], index
0
@@ -295,7 +300,12 @@ module Treetop
0
         end
0
         
0
         i0, s0 = index, []
0
-        r1 = parse_char_class(/[A-Z]/, 'A-Z', SyntaxNode)
0
+        if input.index(/[A-Z]/, index) == index
0
+          r1 = (SyntaxNode).new(input, index...(index + 1))
0
+          @index += 1
0
+        else
0
+          r1 = nil
0
+        end
0
         s0 << r1
0
         if r1.success?
0
           s2, i2 = [], index
0
@@ -476,7 +486,12 @@ module Treetop
0
           r2 = _nt_space
0
           s0 << r2
0
           if r2.success?
0
-            r3 = parse_char_class(/[A-Z]/, 'A-Z', SyntaxNode)
0
+            if input.index(/[A-Z]/, index) == index
0
+              r3 = (SyntaxNode).new(input, index...(index + 1))
0
+              @index += 1
0
+            else
0
+              r3 = nil
0
+            end
0
             s0 << r3
0
             if r3.success?
0
               s4, i4 = [], index
0
@@ -1812,6 +1827,16 @@ module Treetop
0
       end
0
       
0
       module CharacterClass1
0
+        def characters
0
+          elements[1]
0
+        end
0
+        
0
+      end
0
+      
0
+      module CharacterClass2
0
+        def characters
0
+          super.text_value
0
+        end
0
       end
0
       
0
       def _nt_character_class
0
@@ -1882,6 +1907,7 @@ module Treetop
0
         if s0.last.success?
0
           r0 = (CharacterClass).new(input, i0...index, s0)
0
           r0.extend(CharacterClass1)
0
+          r0.extend(CharacterClass2)
0
         else
0
           self.index = i0
0
           r0 = nil
0
@@ -2114,7 +2140,12 @@ module Treetop
0
             else
0
               i5, s5 = index, []
0
               i6 = index
0
-              r7 = parse_char_class(/[{}]/, '{}', SyntaxNode)
0
+              if input.index(/[{}]/, index) == index
0
+                r7 = (SyntaxNode).new(input, index...(index + 1))
0
+                @index += 1
0
+              else
0
+                r7 = nil
0
+              end
0
               if r7.success?
0
                 r6 = nil
0
               else
0
@@ -2262,7 +2293,12 @@ module Treetop
0
           return cached
0
         end
0
         
0
-        r0 = parse_char_class(/[A-Za-z_]/, 'A-Za-z_', SyntaxNode)
0
+        if input.index(/[A-Za-z_]/, index) == index
0
+          r0 = (SyntaxNode).new(input, index...(index + 1))
0
+          @index += 1
0
+        else
0
+          r0 = nil
0
+        end
0
         
0
         node_cache[:alpha_char][start_index] = r0
0
         
0
@@ -2282,7 +2318,12 @@ module Treetop
0
         if r1.success?
0
           r0 = r1
0
         else
0
-          r2 = parse_char_class(/[0-9]/, '0-9', SyntaxNode)
0
+          if input.index(/[0-9]/, index) == index
0
+            r2 = (SyntaxNode).new(input, index...(index + 1))
0
+            @index += 1
0
+          else
0
+            r2 = nil
0
+          end
0
           if r2.success?
0
             r0 = r2
0
           else
0
@@ -2306,7 +2347,12 @@ module Treetop
0
         
0
         s0, i0 = [], index
0
         loop do
0
-          r1 = parse_char_class(/[ \t\n\r]/, ' \t\n\r', SyntaxNode)
0
+          if input.index(/[ \t\n\r]/, index) == index
0
+            r1 = (SyntaxNode).new(input, index...(index + 1))
0
+            @index += 1
0
+          else
0
+            r1 = nil
0
+          end
0
           if r1.success?
0
             s0 << r1
0
           else