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

Merge pull request #495 from aphyr/fix-load-string-grammar-npe 

BasicSemanticChecks.checkGrammarName: allow null filenames.
This commit is contained in:
Terence Parr 2014-03-24 13:20:54 -07:00
parent 08300b457f acb1b916e0
commit b4b91970bd
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.txt
View File

@ -55,3 +55,4 @@ YYYY/MM/DD, github id, Full name, email
2013/01/29, metadave, Dave Parfitt, diparfitt@gmail.com
2013/03/06, bkiers, Bart Kiers, bkiers@gmail.com
2013/08/20, cayhorstmann, Cay Horstmann, cay@horstmann.com
2014/03/18, aphyr, Kyle Kingsbury, aphyr@aphyr.com

5
tool/src/org/antlr/v4/semantics/BasicSemanticChecks.java
View File

@ -310,6 +310,11 @@ public class BasicSemanticChecks extends GrammarTreeVisitor {
void checkGrammarName(Token nameToken) {
String fullyQualifiedName = nameToken.getInputStream().getSourceName();
if (fullyQualifiedName == null) {
// This wasn't read from a file.
return;
}
File f = new File(fullyQualifiedName);
String fileName = f.getName();
if ( g.originalGrammar!=null ) return; // don't warn about diff if this is implicit lexer