0
@@ -15,7 +15,7 @@ module Treetop
0
         builder.else_ do
0
           reset_index
0
           assign_failure start_index_var
0
-          accumulate_dependency "#{accumulator_var}.last"
0
+          builder << "#{result_var}.dependencies.concat(#{accumulator_var})"
0
         end
0
         end_comment(self)
0
       end

0
@@ -49,11 +49,13 @@ module SequenceSpec
0
           result.should be_an_instance_of(Runtime::ParseFailure)
0
         end
0
         
0
-        it "depends on the failure of the first failing subexpression" do
0
+        it "depends on the success of the first subexpression and failure of the second" do
0
           dependencies = result.dependencies
0
-          dependencies.size.should == 1
0
-          dependencies.first.index.should == 6
0
-          dependencies.first.expected_string.should == 'bar'
0
+          dependencies.size.should == 2
0
+          dependencies[0].interval.should == (3...6)
0
+          dependencies[0].text_value.should == 'foo'
0
+          dependencies[1].index.should == 6
0
+          dependencies[1].expected_string.should == 'bar'
0
         end
0
       end
0
       

0
@@ -160,33 +160,6 @@ module IterativeParsingSpec
0
     end
0
   end
0
 
0
-  describe "A really simple grammar" do
0
-    include PrintDependencies
0
-
0
-    testing_grammar %{
0
-      grammar Addition
0
-        rule primary
0
-          '(' addition ')'
0
-        end
0
-
0
-        rule addition
0
-          number '+' number
0
-        end
0
-
0
-        rule number
0
-          [0-9]
0
-        end
0
-      end
0
-    }
0
-
0
-    xit "blah" do
0
-      result = parse('(1+', :return_parse_failure => true)
0
-      puts
0
-      print_dependencies(result)
0
-
0
-    end
0
-  end
0
-
0
   describe "A parser for a simplified addition grammar" do
0
     testing_grammar %{
0
       grammar Addition
0
@@ -206,25 +179,8 @@ module IterativeParsingSpec
0
 
0
     include PrintDependencies
0
 
0
-    it "constructs the correct parse failure" do
0
-      result = parse('(1+', :return_parse_failure => true)
0
-      puts
0
-      print_dependencies(result)
0
-
0
-      puts
0
-      print_dependencies(node_cache.get(:addition, 1))
0
 
0
-    end
0
-
0
-    xit "other one" do
0
-      result = parse('(1+', :return_parse_failure => true, :consume_all_input => false, :index => 1)
0
-      puts
0
-      print_dependencies(result)
0
-
0
-
0
-    end
0
-
0
-    xit "expires the stale failure of addition as successive characters are added to the buffer" do
0
+    it "expires the stale failure of addition as successive characters are added to the buffer" do
0
       input = '('
0
       parse(input, :return_parse_failure => true, :return_propagations => true)
0
       node_cache.should have_result(:addition, 0)
0
@@ -264,9 +220,6 @@ module IterativeParsingSpec
0
 
0
       expire(3..3, 1)
0
 
0
-      puts
0
-      print_dependencies node_cache.get(:addition, 0)
0
-
0
       node_cache.should_not have_result(:addition, 0)
0
       node_cache.should_not have_result(:addition, 1)
0
       node_cache.should_not have_result(:addition, 2)