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

Fix getSourceName returning null (fixes #667)

This commit is contained in:
Sam Harwell 2014-09-28 12:11:35 -05:00
parent f143495ab2
commit 90071c69b8
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,10 @@ public class ANTLRInputStream implements CharStream {
@Override @Override
public String getSourceName() { public String getSourceName() {
if (name == null || name.isEmpty()) {
return UNKNOWN_SOURCE_NAME;
}
return name; return name;
} }

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

@ -297,6 +297,10 @@ public class UnbufferedCharStream implements CharStream {
@Override @Override
public String getSourceName() { public String getSourceName() {
if (name == null || name.isEmpty()) {
return UNKNOWN_SOURCE_NAME;
}
return name; return name;
} }

2
tool/test/org/antlr/v4/test/BaseTest.java
View File

@ -1269,7 +1269,7 @@ public abstract class BaseTest {
@Override @Override
public String getSourceName() { public String getSourceName() {
return null; return UNKNOWN_SOURCE_NAME;
} }
@Override @Override

5
tool/test/org/antlr/v4/test/TestCommonTokenStream.java
View File

@ -33,6 +33,7 @@ package org.antlr.v4.test;
import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CommonToken; import org.antlr.v4.runtime.CommonToken;
import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.IntStream;
import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenFactory; import org.antlr.v4.runtime.TokenFactory;
@ -235,7 +236,7 @@ public class TestCommonTokenStream extends TestBufferedTokenStream {
@Override @Override
public String getSourceName() { public String getSourceName() {
return null; return IntStream.UNKNOWN_SOURCE_NAME;
} }
@Override @Override
@ -283,7 +284,7 @@ public class TestCommonTokenStream extends TestBufferedTokenStream {
@Override @Override
public String getSourceName() { public String getSourceName() {
return null; return IntStream.UNKNOWN_SOURCE_NAME;
} }
@Override @Override