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

Make sure to check rules in modes while checking for undefined rules

This commit is contained in:
Sam Harwell 2012-11-21 18:36:28 -06:00
parent 094f40c961
commit 038d3ad44f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/src/org/antlr/v4/Tool.java
View File

@ -433,14 +433,13 @@ public class Tool {
public boolean checkForRuleIssues(final Grammar g) { public boolean checkForRuleIssues(final Grammar g) {
// check for redefined rules // check for redefined rules
GrammarAST RULES = (GrammarAST)g.ast.getFirstChildWithType(ANTLRParser.RULES); GrammarAST RULES = (GrammarAST)g.ast.getFirstChildWithType(ANTLRParser.RULES);
List<GrammarAST> rules = new ArrayList<GrammarAST>(RULES.getAllChildrenWithType(ANTLRParser.RULE));
List<?> rules = (List<?>)RULES.getChildren(); for (GrammarAST mode : g.ast.getAllChildrenWithType(ANTLRParser.MODE)) {
if (rules == null) { rules.addAll(mode.getAllChildrenWithType(ANTLRParser.RULE));
rules = Collections.emptyList();
} }
final Map<String, RuleAST> ruleToAST = new HashMap<String, RuleAST>(); final Map<String, RuleAST> ruleToAST = new HashMap<String, RuleAST>();
for (Object r : rules) { for (GrammarAST r : rules) {
RuleAST ruleAST = (RuleAST)r; RuleAST ruleAST = (RuleAST)r;
GrammarAST ID = (GrammarAST)ruleAST.getChild(0); GrammarAST ID = (GrammarAST)ruleAST.getChild(0);
String ruleName = ID.getText(); String ruleName = ID.getText();