jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

TerminalNodeImpl.getSourceInterval didn't fulfill the contract of SyntaxTree.getSourceInterval

This commit is contained in:
Sam Harwell 2012-09-22 20:08:12 -05:00
parent 62e005c841
commit 7ed6cdcc4b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/Java/src/org/antlr/v4/runtime/tree/SyntaxTree.java
View File

@ -30,6 +30,7 @@
package org.antlr.v4.runtime.tree; package org.antlr.v4.runtime.tree;
import org.antlr.v4.runtime.misc.Interval; 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 /** A tree that knows about an interval in a token stream
* is some kind of syntax tree. Subinterfaces distinguish * is some kind of syntax tree. Subinterfaces distinguish
@ -37,11 +38,11 @@ import org.antlr.v4.runtime.misc.Interval;
*/ */
public interface SyntaxTree extends Tree { public interface SyntaxTree extends Tree {
/** Return an interval indicating the index in the TokenStream of /** 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. * node is a leaf, then the interval represents a single token.
* * <p/>
* If source interval is unknown, this does not return null. * If source interval is unknown, this returns {@link Interval#INVALID}.
* It returns Interval.INVALID.
*/ */
@NotNull
Interval getSourceInterval(); Interval getSourceInterval();
} }

3
runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNodeImpl.java
View File

@ -56,7 +56,8 @@ public class TerminalNodeImpl<Symbol extends Token> implements TerminalNode<Symb
public Interval getSourceInterval() { public Interval getSourceInterval() {
if ( symbol ==null ) return Interval.INVALID; if ( symbol ==null ) return Interval.INVALID;
return new Interval(symbol.getStartIndex(), symbol.getStopIndex()); int tokenIndex = symbol.getTokenIndex();
return new Interval(tokenIndex, tokenIndex);
} }
@Override @Override