0
@@ -11,7 +11,7 @@ module Treetop
0
           assign_result subexpression_result_var
0
         end
0
         builder.else_ do
0
-          assign_result epsilon_node(true)
0
+          assign_result epsilon_node
0
           accumulate_dependency subexpression_result_var
0
         end
0
       end

0
@@ -86,9 +86,8 @@ module Treetop
0
         builder.assign 'self.index', start_index_var
0
       end
0
       
0
-      def epsilon_node(include_endpoint = false)
0
-        elipsis = include_endpoint ? '..' : '...'
0
-        "SyntaxNode.new(input, index#{elipsis}index)"
0
+      def epsilon_node
0
+        "SyntaxNode.new(input, index..index)"
0
       end
0
       
0
       def assign_failure(start_index_var)

0
@@ -8,7 +8,7 @@ module Treetop
0
         compile_sequence_elements(sequence_elements)
0
         builder.assign '@max_terminal_failure_last_index', 'local_max_terminal_failure_last_index'
0
         builder.if__ "!#{accumulator_var}.last.is_a?(ParseFailure)" do
0
-          builder.assign "interval", "#{accumulator_var}.last.epsilon? ? #{start_index_var}..index : #{start_index_var}...index"
0
+          builder.assign "interval", "#{accumulator_var}.last.interval.exclude_end? ? #{start_index_var}...index : #{start_index_var}..index"
0
           assign_result "(#{node_class_name}).new(input, interval, #{accumulator_var})"
0
           extend_result sequence_element_accessor_module_name if sequence_element_accessor_module_name
0
           extend_result_with_inline_module

0
@@ -14,9 +14,9 @@ module AndPredicateSpec
0
         @result = parse(input, :consume_all_input => false)
0
       end
0
 
0
-      it "is an epsilon node" do
0
+      it "is an epsilon node that includes its endpoint" do
0
         result.should be_epsilon
0
-        result.interval.should == (0...0)
0
+        result.interval.should == (0..0)
0
       end
0
       
0
       it "depends on the result of the predicated subexpression" do

0
@@ -72,7 +72,7 @@ module SequenceSpec
0
     end
0
   end
0
 
0
-  describe "a sequence of non-terminals" do
0
+  describe "A sequence of non-terminals" do
0
     testing_grammar %{
0
       grammar TestGrammar
0
         rule sequence
0
@@ -97,7 +97,51 @@ module SequenceSpec
0
       end
0
     end
0
   end
0
+
0
+  describe "A sequence whose last subexpression may include its endpoint" do
0
+    describe "when its last subexpression is optional" do
0
+      testing_expression "'a' 'c'?"
0
+
0
+      it "when the the optional subexpression results in epsilon, produces a result that includes its endpoint" do
0
+        parse('a').interval.should == (0..1)
0
+      end
0
+    end
0
+
0
+    describe "when its last subexpression is a zero or more" do
0
+      testing_expression "'a' 'c'*"
0
   
0
+      it "includes its endpoint when the result of its last subexpression does" do
0
+        parse('a').interval.should == (0..1)
0
+      end
0
+    end
0
+
0
+    describe "when its last subexpression is a one or more" do
0
+      testing_expression "'a' 'c'+"
0
+
0
+      it "includes its endpoint when the result of its last subexpression does" do
0
+        parse('ac').interval.should == (0..2)
0
+      end
0
+    end
0
+
0
+    describe "when its last subexpression is another sequence whose results may include its endpoint" do
0
+      testing_grammar %{
0
+        grammar EndpointInclusion
0
+          rule foo
0
+            'a' bar
0
+          end
0
+
0
+          rule bar
0
+            'b' 'c'?
0
+          end
0
+        end
0
+      }
0
+
0
+      it "includes its endpoint when the result of its last subexpression does" do
0
+        parse('ab').interval.should == (0..2)
0
+      end
0
+    end
0
+  end
0
+
0
   describe "Compiling a sequence containing various white-space errors" do
0
     it "should succeed on a valid sequence" do
0
       compiling_expression('foo:"foo" "bar" <SequenceSpec::Foo> { def a_method; end }').should_not raise_error

0
@@ -73,7 +73,7 @@ module SyntaxNodeSpec
0
       node.should_not be_epsilon
0
     end
0
   end
0
-  
0
+
0
   describe "A new epsilon syntax node" do
0
     attr_reader :node
0