0
@@ -1869,7 +1869,13 @@ module Treetop
0
                 if r8
0
                   r6 = r8
0
                 else
0
-                  r9 = parse_anything(SyntaxNode)
0
+                  if index < input_length
0
+                    r9 = (SyntaxNode).new(input, index...(index + 1))
0
+                    @index += 1
0
+                  else
0
+                    terminal_parse_failure("any character")
0
+                    r9 = nil
0
+                  end
0
                   if r9
0
                     r6 = r9
0
                   else
0
@@ -1987,7 +1993,13 @@ module Treetop
0
                 if r8
0
                   r6 = r8
0
                 else
0
-                  r9 = parse_anything(SyntaxNode)
0
+                  if index < input_length
0
+                    r9 = (SyntaxNode).new(input, index...(index + 1))
0
+                    @index += 1
0
+                  else
0
+                    terminal_parse_failure("any character")
0
+                    r9 = nil
0
+                  end
0
                   if r9
0
                     r6 = r9
0
                   else
0
@@ -2101,7 +2113,13 @@ module Treetop
0
               if r7
0
                 r6 = r7
0
               else
0
-                r8 = parse_anything(SyntaxNode)
0
+                if index < input_length
0
+                  r8 = (SyntaxNode).new(input, index...(index + 1))
0
+                  @index += 1
0
+                else
0
+                  terminal_parse_failure("any character")
0
+                  r8 = nil
0
+                end
0
                 if r8
0
                   r6 = r8
0
                 else
0
@@ -2240,7 +2258,13 @@ module Treetop
0
               end
0
               s5 << r6
0
               if r6
0
-                r8 = parse_anything(SyntaxNode)
0
+                if index < input_length
0
+                  r8 = (SyntaxNode).new(input, index...(index + 1))
0
+                  @index += 1
0
+                else
0
+                  terminal_parse_failure("any character")
0
+                  r8 = nil
0
+                end
0
                 s5 << r8
0
               end
0
               if s5.last
0
@@ -2436,7 +2460,13 @@ module Treetop
0
               end
0
               s5 << r6
0
               if r6
0
-                r8 = parse_anything(SyntaxNode)
0
+                if index < input_length
0
+                  r8 = (SyntaxNode).new(input, index...(index + 1))
0
+                  @index += 1
0
+                else
0
+                  terminal_parse_failure("any character")
0
+                  r8 = nil
0
+                end
0
                 s5 << r8
0
               end
0
               if s5.last
0
@@ -2569,7 +2599,13 @@ module Treetop
0
         end
0
         s0 << r1
0
         if r1
0
-          r3 = parse_anything(SyntaxNode)
0
+          if index < input_length
0
+            r3 = (SyntaxNode).new(input, index...(index + 1))
0
+            @index += 1
0
+          else
0
+            terminal_parse_failure("any character")
0
+            r3 = nil
0
+          end
0
           s0 << r3
0
         end
0
         if s0.last
0
@@ -2647,11 +2683,18 @@ module Treetop
0
         
0
         s0, i0 = [], index
0
         loop do
0
-          if input.index(/[ \t\n\r]/, index) == index
0
-            r1 = (SyntaxNode).new(input, index...(index + 1))
0
-            @index += 1
0
+          i1 = index
0
+          r2 = _nt_white
0
+          if r2
0
+            r1 = r2
0
           else
0
-            r1 = nil
0
+            r3 = _nt_comment_to_eol
0
+            if r3
0
+              r1 = r3
0
+            else
0
+              self.index = i1
0
+              r1 = nil
0
+            end
0
           end
0
           if r1
0
             s0 << r1
0
@@ -2671,6 +2714,112 @@ module Treetop
0
         return r0
0
       end
0
       
0
+      module CommentToEol0
0
+      end
0
+      
0
+      module CommentToEol1
0
+      end
0
+      
0
+      def _nt_comment_to_eol
0
+        start_index = index
0
+        cached = node_cache[:comment_to_eol][index]
0
+        if cached
0
+          @index = cached.interval.end
0
+          return cached
0
+        end
0
+        
0
+        i0, s0 = index, []
0
+        if input.index('#', index) == index
0
+          r1 = (SyntaxNode).new(input, index...(index + 1))
0
+          @index += 1
0
+        else
0
+          terminal_parse_failure('#')
0
+          r1 = nil
0
+        end
0
+        s0 << r1
0
+        if r1
0
+          s2, i2 = [], index
0
+          loop do
0
+            i3, s3 = index, []
0
+            i4 = index
0
+            if input.index("\n", index) == index
0
+              r5 = (SyntaxNode).new(input, index...(index + 1))
0
+              @index += 1
0
+            else
0
+              terminal_parse_failure("\n")
0
+              r5 = nil
0
+            end
0
+            if r5
0
+              r4 = nil
0
+            else
0
+              self.index = i4
0
+              r4 = SyntaxNode.new(input, index...index)
0
+            end
0
+            s3 << r4
0
+            if r4
0
+              if index < input_length
0
+                r6 = (SyntaxNode).new(input, index...(index + 1))
0
+                @index += 1
0
+              else
0
+                terminal_parse_failure("any character")
0
+                r6 = nil
0
+              end
0
+              s3 << r6
0
+            end
0
+            if s3.last
0
+              r3 = (SyntaxNode).new(input, i3...index, s3)
0
+              r3.extend(CommentToEol0)
0
+            else
0
+              self.index = i3
0
+              r3 = nil
0
+            end
0
+            if r3
0
+              s2 << r3
0
+            else
0
+              break
0
+            end
0
+          end
0
+          if s2.empty?
0
+            self.index = i2
0
+            r2 = nil
0
+          else
0
+            r2 = SyntaxNode.new(input, i2...index, s2)
0
+          end
0
+          s0 << r2
0
+        end
0
+        if s0.last
0
+          r0 = (SyntaxNode).new(input, i0...index, s0)
0
+          r0.extend(CommentToEol1)
0
+        else
0
+          self.index = i0
0
+          r0 = nil
0
+        end
0
+        
0
+        node_cache[:comment_to_eol][start_index] = r0
0
+        
0
+        return r0
0
+      end
0
+      
0
+      def _nt_white
0
+        start_index = index
0
+        cached = node_cache[:white][index]
0
+        if cached
0
+          @index = cached.interval.end
0
+          return cached
0
+        end
0
+        
0
+        if input.index(/[ \t\n\r]/, index) == index
0
+          r0 = (SyntaxNode).new(input, index...(index + 1))
0
+          @index += 1
0
+        else
0
+          r0 = nil
0
+        end
0
+        
0
+        node_cache[:white][start_index] = r0
0
+        
0
+        return r0
0
+      end
0
+      
0
     end
0
     
0
     class MetagrammarParser < Treetop::Runtime::CompiledParser
0
@@ -2678,4 +2827,4 @@ module Treetop
0
     end
0
 
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -389,8 +389,16 @@ module Treetop
0
       end
0
 
0
       rule space
0
-        [ \t\n\r]+
0
+        (white / comment_to_eol)+
0
+      end
0
+
0
+      rule comment_to_eol
0
+        '#' (!"\n" .)+
0
+      end
0
+
0
+      rule white
0
+        [ \t\n\r]
0
       end
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -3,37 +3,38 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
0
 module GrammarSpec
0
   module Bar
0
   end
0
-  
0
+
0
   describe "a grammar" do
0
     testing_grammar %{
0
       grammar Foo
0
+	# This is a grammar for Foo
0
         include GrammarSpec::Bar
0
-    
0
+
0
         rule foo
0
           bar / baz
0
         end
0
-      
0
+
0
         rule bar
0
           'bar' 'bar'
0
         end
0
-      
0
+
0
         rule baz
0
           'baz' 'baz'
0
         end
0
       end
0
     }
0
-  
0
+
0
     it "parses matching input" do
0
       parse('barbar').should_not be_nil
0
       parse('bazbaz').should_not be_nil
0
     end
0
-  
0
+
0
     it "fails if it does not parse all input" do
0
       parse('barbarbazbaz').should be_nil
0
     end
0
-  
0
+
0
     it "mixes in included modules" do
0
       self.class.const_get(:Foo).ancestors.should include(GrammarSpec::Bar)
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -36,7 +36,7 @@ module Treetop
0
         parser = Treetop::Compiler::MetagrammarParser.new
0
         parser.root = root
0
         node = parser.parse(input)
0
-        raise "#{input} cannot be parsed by the metagrammar: #{parser.terminal_failures.map {|f| f.to_s}.join("\n")}" unless node
0
+        raise parser.failure_reason unless node
0
         node
0
       end
0
     end
0
@@ -74,4 +74,4 @@ module Treetop
0
     Spec::Example::ExampleGroupFactory.register(:compiler, self)
0
     Spec::Example::ExampleGroupFactory.register(:parser, self)
0
   end
0
-end
0
\ No newline at end of file
0
+end