treetop 1.5.3 → 1.6.2

data/lib/treetop/version.rb

@@ -1,8 +1,8 @@
 module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 5
-    TINY  = 3
+    MINOR = 6
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/compiler/and_predicate_spec.rb

@@ -29,7 +29,7 @@ module AndPredicateSpec
         terminal_failures.size.should == 1
         failure = terminal_failures[0]
         failure.index.should == 3
-        failure.expected_string.should == 'bar'
+        failure.expected_string.should == '"bar"'
       end
     end
   end

data/spec/compiler/anything_symbol_spec.rb

@@ -19,7 +19,10 @@ module AnythingSymbolSpec
     end
   
     it "fails to parse epsilon" do
-      parse('').should be_nil
+      parse('') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
     end
   end
     

data/spec/compiler/character_class_spec.rb

@@ -21,7 +21,10 @@ module CharacterClassSpec
     end
 
     it "does not match single characters outside of that range" do
-      parse('8').should be_nil
+      parse('8') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
       parse('a').should be_nil
     end
 

data/spec/compiler/choice_spec.rb

@@ -2,42 +2,51 @@ require 'spec_helper'
 
 module ChoiceSpec
   describe "A choice between terminal symbols" do
-    testing_expression '"foo" { def foo_method; end } / "bar" { def bar_method; end } / "baz" { def baz_method; end }'
+    testing_expression '("foo" { def foo_method; end } / "bar" { def bar_method; end } / "baz" { def baz_method; end }) {def bat_method; end}'
 
     it "successfully parses input matching any of the alternatives, returning a node that responds to methods defined in its respective inline module" do
       result = parse('foo')
       result.should_not be_nil
       result.should respond_to(:foo_method)
-    
+      result.should_not respond_to(:bar_method)
+      result.should_not respond_to(:baz_method)
+      result.should respond_to(:bat_method)
+
       result = parse('bar')
       result.should_not be_nil
+      result.should_not respond_to(:foo_method)
       result.should respond_to(:bar_method)
-    
+      result.should_not respond_to(:baz_method)
+      result.should respond_to(:bat_method)
+
       result = parse('baz')
       result.should_not be_nil
+      result.should_not respond_to(:foo_method)
+      result.should_not respond_to(:bar_method)
       result.should respond_to(:baz_method)
+      result.should respond_to(:bat_method)
     end
-  
+
     it "upon parsing a string matching the second alternative, records the failure of the first terminal" do
       result = parse('bar')
       terminal_failures = parser.terminal_failures
       terminal_failures.size.should == 1
       failure = terminal_failures[0]
-      failure.expected_string.should == 'foo'
+      failure.expected_string.should == '"foo"'
       failure.index.should == 0
     end
-  
+
     it "upon parsing a string matching the third alternative, records the failure of the first two terminals" do
       result = parse('baz')
-      
+
       terminal_failures = parser.terminal_failures
-      
+
       terminal_failures.size.should == 2
 
       failure_1 = terminal_failures[0]
       failure_1.expected_string == 'foo'
       failure_1.index.should == 0
-    
+
       failure_2 = terminal_failures[1]
       failure_2.expected_string == 'bar'
       failure_2.index.should == 0
@@ -53,7 +62,7 @@ module ChoiceSpec
     end
   end
 
-  describe "A choice between terminals followed by a block" do  
+  describe "A choice between terminals followed by a block" do
     testing_expression "('a'/ 'bb' / [c]) { def a_method; end }"
 
     it "extends a match of any of its subexpressions with a module created from the block" do
@@ -68,7 +77,7 @@ module ChoiceSpec
     end
   end
 
-  describe "a choice followed by a declared module" do  
+  describe "a choice followed by a declared module" do
     testing_expression "('a'/ 'bb' / [c]) <ChoiceSpec::TestModule>"
 
     it "extends a match of any of its subexpressions with a module created from the block" do

data/spec/compiler/failure_propagation_functional_spec.rb

@@ -15,7 +15,7 @@ describe "An expression for braces surrounding zero or more letters followed by
       terminal_failures.size.should == 1      
       failure = terminal_failures[0]
       failure.index.should == 6
-      failure.expected_string.should == ';'
+      failure.expected_string.should == "';'"
     end
   end
 end

data/spec/compiler/grammar_spec.rb

@@ -31,7 +31,10 @@ module GrammarSpec
     end
 
     it "fails if it does not parse all input" do
-      parse('barbarbazbaz').should be_nil
+      parse('barbarbazbaz') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
     end
 
     it "mixes in included modules" do

data/spec/compiler/not_predicate_spec.rb

@@ -5,7 +5,21 @@ module NotPredicateSpec
     testing_expression '!"foo"'
 
     it "fails to parse input matching the terminal symbol" do
-      parse('foo').should be_nil
+      parse('foo') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
+    end
+  end
+
+  describe "A !-predicated character class symbol" do
+    testing_expression '![aeiou]'
+
+    it "fails to parse input matching the terminal symbol" do
+      parse('e') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
     end
   end
 
@@ -20,10 +34,7 @@ module NotPredicateSpec
       parse('foo') do |result|
         result.should_not be_nil
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures.first
-        failure.index.should == 3
-        failure.expected_string.should == 'bar'
+        terminal_failures.size.should == 0
       end
     end
   end
@@ -32,7 +43,10 @@ module NotPredicateSpec
     testing_expression '!("a" "b" "cc")'
 
     it "fails to parse matching input" do
-      parse('abcc').should be_nil
+      parse('abcc') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
     end
   end
 end

data/spec/compiler/occurrence_range_spec.rb

@@ -14,10 +14,7 @@ module OccurrenceRangeSpec
         result.should respond_to(:a_method)
 
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures.first
-        failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        terminal_failures.size.should == 0
       end
     end
 
@@ -28,10 +25,7 @@ module OccurrenceRangeSpec
         result.should respond_to(:a_method)
 
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures.first
-        failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        terminal_failures.size.should == 0
       end
     end
 
@@ -42,10 +36,7 @@ module OccurrenceRangeSpec
         result.should respond_to(:a_method)
 
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures.first
-        failure.index.should == 3
-        failure.expected_string.should == 'foo'
+        terminal_failures.size.should == 0
       end
     end
 
@@ -60,14 +51,23 @@ module OccurrenceRangeSpec
       end
     end
 
-    it "fails to parses three of that terminal, returning an instance of the declared node class and reporting no failure" do
+    it "fails to parses two of that terminal but fails because of an extra one" do
       parse("foofoofoo") do |result|
         result.should be_nil
 
-        terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	parser.terminal_failures.size.should == 1
       end
     end
+
+    it "parses two of three of that terminal, reporting no failure" do
+      parse("foofoofoo", :consume_all_input => false) do |result|
+        result.should_not be_nil
+        result.elements.size.should == 2
+
+	parser.terminal_failures.size.should == 0
+      end
+    end
+
   end
 
   describe "two to four of a terminal symbol followed by a node class declaration and a block" do
@@ -80,7 +80,7 @@ module OccurrenceRangeSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
 
@@ -92,7 +92,7 @@ module OccurrenceRangeSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 3
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
 
@@ -103,10 +103,7 @@ module OccurrenceRangeSpec
         result.should respond_to(:a_method)
 
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures.first
-        failure.index.should == 6
-        failure.expected_string.should == 'foo'
+        terminal_failures.size.should == 0
       end
     end
 
@@ -117,16 +114,16 @@ module OccurrenceRangeSpec
         result.should respond_to(:a_method)
 
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 0
       end
     end
 
-    it "fails to parses five of that terminal, returning an instance of the declared node class and reporting no failure" do
+    it "fails to parses four of that terminal because there's an extra unconsumed one" do
       parse("foofoofoofoofoo") do |result|
         result.should be_nil
 
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
   end
@@ -141,7 +138,7 @@ module OccurrenceRangeSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
 
@@ -153,7 +150,7 @@ module OccurrenceRangeSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 3
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
 
@@ -167,7 +164,7 @@ module OccurrenceRangeSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 6
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
 
@@ -181,7 +178,7 @@ module OccurrenceRangeSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 12
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
   end

data/spec/compiler/one_or_more_spec.rb

@@ -14,7 +14,7 @@ module OneOrMoreSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
   
@@ -28,7 +28,7 @@ module OneOrMoreSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 6
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
   end

data/spec/compiler/optional_spec.rb

@@ -17,7 +17,7 @@ module OptionalSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
   
@@ -30,7 +30,7 @@ module OptionalSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
   end

data/spec/compiler/parenthesized_expression_spec.rb

@@ -13,7 +13,21 @@ module ParenthesizedExpressionSpec
     testing_expression '(!"foo")'
   
     it "should behave as normal" do
-      parse('foo').should be_nil
+      parse('foo') do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
     end
   end
+
+  describe "An expression with code both inside and outside parentheses" do
+    testing_expression '("foo" { def inner; end } ) { def outer; end} '
+    it "should extend both code modules " do
+      parse('foo') do |result|
+	result.should respond_to(:inner)
+	result.should respond_to(:outer)
+      end
+    end
+  end
+
 end

data/spec/compiler/semantic_predicate_spec.rb

@@ -17,7 +17,7 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
 
@@ -44,7 +44,7 @@ module SemanticPredicateSpec
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
 
@@ -63,13 +63,13 @@ module SemanticPredicateSpec
       end
     end
 
-    it "fails with no terminal_failures if the block returns false" do
+    it "fails with one terminal_failure if the block returns false" do
       $ok_to_succeed = false
       parse('prior foo', :consume_all_input => false) do |result|
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
 
@@ -78,10 +78,12 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures[0]
-        failure.index.should == 0
-        failure.expected_string.should == 'prior '
+	# We should get "prior " failed, and also the predicate block
+        terminal_failures.size.should == 2
+        terminal_failures[0].index.should == 0
+        terminal_failures[0].expected_string.should == '"prior "'
+        terminal_failures[1].index.should == 0
+        terminal_failures[1].expected_string.should == '<semantic predicate>'
       end
     end
 
@@ -103,7 +105,7 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
 
@@ -130,7 +132,7 @@ module SemanticPredicateSpec
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
 
@@ -149,13 +151,13 @@ module SemanticPredicateSpec
       end
     end
 
-    it "fails with no terminal_failures if the block returns true" do
+    it "fails with one terminal_failure if the block returns true" do
       $ok_to_succeed = true
       parse('prior foo', :consume_all_input => false) do |result|
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 0
+	terminal_failures.size.should == 1
       end
     end
 
@@ -164,10 +166,9 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-        terminal_failures.size.should == 1
-        failure = terminal_failures[0]
-        failure.index.should == 0
-        failure.expected_string.should == 'prior '
+        terminal_failures.size.should == 2
+        terminal_failures[0].index.should == 0
+        terminal_failures[0].expected_string.should == '"prior "'
       end
     end