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

improve robustness

This commit is contained in:
Terence Parr 2015-06-18 10:34:03 -07:00
parent 7e8a7bac84
commit 5f2ce89ea3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/Java/src/org/antlr/v4/runtime/tree/Trees.java
View File

@ -107,6 +107,7 @@ public class Trees {
* @since 4.5.1 * @since 4.5.1
*/ */
public static String toStringTree(Tree t, TreeTextProvider nodeTextProvider) { public static String toStringTree(Tree t, TreeTextProvider nodeTextProvider) {
if ( t==null ) return "null";
String s = Utils.escapeWhitespace(nodeTextProvider.getText(t), false); String s = Utils.escapeWhitespace(nodeTextProvider.getText(t), false);
if ( t.getChildCount()==0 ) return s; if ( t.getChildCount()==0 ) return s;
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
@ -265,8 +266,9 @@ public class Trees {
if ( t instanceof ParserRuleContext ) { if ( t instanceof ParserRuleContext ) {
ParserRuleContext r = (ParserRuleContext) t; ParserRuleContext r = (ParserRuleContext) t;
if ( startTokenIndex>=r.getStart().getTokenIndex() && // is range fully contained in t? if ( startTokenIndex>=r.getStart().getTokenIndex() && // is range fully contained in t?
stopTokenIndex<=r.getStop().getTokenIndex() ) (r.getStop()==null || stopTokenIndex<=r.getStop().getTokenIndex()) )
{ {
// note: r.getStop()==null likely implies that we bailed out of parser and there's nothing to the right
return r; return r;
} }
} }