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

Merge branch 'master', remote-tracking branch 'origin' into enhance-ctx

This commit is contained in:
Terence Parr 2012-02-13 10:16:57 -08:00
parent 8af1e23461 40b3bc0861
commit 43daec6f5b
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.start = start;
this.stop = stop;
this.line = source.getLine();
this.charPositionInLine = source.getCharPositionInLine();
if (source != null) {
this.line = source.getLine();
this.charPositionInLine = source.getCharPositionInLine();
}
}
public CommonToken(int type, String text) {
@ -190,7 +192,7 @@ public class CommonToken implements WritableToken, Serializable {
}
public CharStream getInputStream() {
return source.getInputStream();
return source != null ? source.getInputStream() : null;
}
public String toString() {