From 7ed6cdcc4b7e29048af106aa33e5d5eac111f81f Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 22 Sep 2012 20:08:12 -0500
Subject: [PATCH] TerminalNodeImpl.getSourceInterval didn't fulfill the
 contract of SyntaxTree.getSourceInterval

---
 .../Java/src/org/antlr/v4/runtime/tree/SyntaxTree.java   | 9 +++++----
 .../src/org/antlr/v4/runtime/tree/TerminalNodeImpl.java  | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/tree/SyntaxTree.java b/runtime/Java/src/org/antlr/v4/runtime/tree/SyntaxTree.java
index a4da54d8b..002663eb9 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/tree/SyntaxTree.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/tree/SyntaxTree.java
@@ -30,6 +30,7 @@
 package org.antlr.v4.runtime.tree;
 
 import org.antlr.v4.runtime.misc.Interval;
+import org.antlr.v4.runtime.misc.NotNull;
 
 /** A tree that knows about an interval in a token stream
  *  is some kind of syntax tree. Subinterfaces distinguish
@@ -37,11 +38,11 @@ import org.antlr.v4.runtime.misc.Interval;
  */
 public interface SyntaxTree extends Tree {
 	/** Return an interval indicating the index in the TokenStream of
-	 *  the 1st and last token associated with this subtree. If this
+	 *  the first and last token associated with this subtree. If this
 	 *  node is a leaf, then the interval represents a single token.
-	 *
-	 *  If source interval is unknown, this does not return null.
-	 *  It returns Interval.INVALID.
+	 * <p/>
+	 *  If source interval is unknown, this returns {@link Interval#INVALID}.
 	 */
+	@NotNull
 	Interval getSourceInterval();
 }
diff --git a/runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNodeImpl.java b/runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNodeImpl.java
index 3af112b5e..3b000fe4f 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNodeImpl.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNodeImpl.java
@@ -56,7 +56,8 @@ public class TerminalNodeImpl<Symbol extends Token> implements TerminalNode<Symb
 	public Interval getSourceInterval() {
 		if ( symbol ==null ) return Interval.INVALID;
 
-		return new Interval(symbol.getStartIndex(), symbol.getStopIndex());
+		int tokenIndex = symbol.getTokenIndex();
+		return new Interval(tokenIndex, tokenIndex);
 	}
 
 	@Override