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

Fix USE_OF_BAD_WORD getting reported for elements that never appear in the generated code

This commit is contained in:
Sam Harwell 2012-11-18 22:10:51 -06:00
parent 80f7c35a7c
commit 0742b49c1b
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/src/org/antlr/v4/codegen/CodeGenPipeline.java
View File

@ -54,7 +54,7 @@ public class CodeGenPipeline {
idTypes.add(ANTLRParser.TOKEN_REF); idTypes.add(ANTLRParser.TOKEN_REF);
List<GrammarAST> idNodes = g.ast.getNodesWithType(idTypes); List<GrammarAST> idNodes = g.ast.getNodesWithType(idTypes);
for (GrammarAST idNode : idNodes) { for (GrammarAST idNode : idNodes) {
if ( gen.target.grammarSymbolCausesIssueInGeneratedCode(idNode.getText()) ) { if ( gen.target.grammarSymbolCausesIssueInGeneratedCode(idNode) ) {
g.tool.errMgr.grammarError(ErrorType.USE_OF_BAD_WORD, g.tool.errMgr.grammarError(ErrorType.USE_OF_BAD_WORD,
g.fileName, idNode.getToken(), g.fileName, idNode.getToken(),
idNode.getText()); idNode.getText());

35
tool/src/org/antlr/v4/codegen/Target.java
View File

@ -31,6 +31,7 @@ package org.antlr.v4.codegen;
import org.antlr.v4.codegen.model.RuleFunction; import org.antlr.v4.codegen.model.RuleFunction;
import org.antlr.v4.misc.Utils; import org.antlr.v4.misc.Utils;
import org.antlr.v4.parse.ANTLRParser;
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.tool.Grammar; import org.antlr.v4.tool.Grammar;
@ -408,8 +409,38 @@ public class Target {
return getTokenTypeAsTargetLabel(gen.g, ttype); return getTokenTypeAsTargetLabel(gen.g, ttype);
} }
public boolean grammarSymbolCausesIssueInGeneratedCode(String id) { public boolean grammarSymbolCausesIssueInGeneratedCode(GrammarAST idNode) {
return badWords.contains(id); switch (idNode.getParent().getType()) {
case ANTLRParser.ASSIGN:
switch (idNode.getParent().getParent().getType()) {
case ANTLRParser.ELEMENT_OPTIONS:
case ANTLRParser.OPTIONS:
return false;
default:
break;
}
break;
case ANTLRParser.AT:
case ANTLRParser.ELEMENT_OPTIONS:
return false;
case ANTLRParser.LEXER_ACTION_CALL:
if (idNode.getChildIndex() == 0) {
// first child is the command name which is part of the ANTLR language
return false;
}
// arguments to the command should be checked
break;
default:
break;
}
return badWords.contains(idNode.getText());
} }
} }