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

Fix NPE in CommonToken when TokenSource is not available

This commit is contained in:
Sam Harwell 2012-02-13 08:41:57 -06:00
parent dee579a68f
commit 9600a70724
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/Java/src/org/antlr/v4/runtime/CommonToken.java
View File

@ -64,8 +64,10 @@ public class CommonToken implements WritableToken, Serializable {
this.channel = channel; this.channel = channel;
this.start = start; this.start = start;
this.stop = stop; this.stop = stop;
this.line = source.getLine(); if (source != null) {
this.charPositionInLine = source.getCharPositionInLine(); this.line = source.getLine();
this.charPositionInLine = source.getCharPositionInLine();
}
} }
public CommonToken(int type, String text) { public CommonToken(int type, String text) {
@ -190,7 +192,7 @@ public class CommonToken implements WritableToken, Serializable {
} }
public CharStream getInputStream() { public CharStream getInputStream() {
return source.getInputStream(); return source != null ? source.getInputStream() : null;
} }
public String toString() { public String toString() {