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

Merge branch 'closure-labels' of github.com:sharwell/antlr4 into main

This commit is contained in:
Terence Parr 2012-09-04 18:40:25 -07:00
parent 3565efbbc3 5dacfc9554
commit a0563656f7
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tool/src/org/antlr/v4/codegen/model/RuleFunction.java
View File

@ -170,7 +170,19 @@ public class RuleFunction extends OutputModelObject {
FrequencySet<String> altFreq = getElementFrequenciesForAlt(ast); FrequencySet<String> altFreq = getElementFrequenciesForAlt(ast);
for (GrammarAST t : refs) { for (GrammarAST t : refs) {
String refLabelName = t.getText(); String refLabelName = t.getText();
if ( altFreq.count(t.getText())>1 ) needsList.add(refLabelName); if (needsList.contains(refLabelName)) {
continue;
}
if ( altFreq.count(t.getText())>1 ) {
needsList.add(refLabelName);
}
else {
boolean inLoop = t.hasAncestor(CLOSURE) || t.hasAncestor(POSITIVE_CLOSURE);
if (inLoop) {
needsList.add(refLabelName);
}
}
} }
} }
Set<Decl> decls = new HashSet<Decl>(); Set<Decl> decls = new HashSet<Decl>();