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

fix null pointer bug with rule "a : a;"

This commit is contained in:
Terence Parr 2013-12-19 16:35:37 -08:00
parent 4e8353dea4
commit 9ca6bf9bd3
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
View File

@ -88,19 +88,23 @@ public class LeftRecursiveRule extends Rule {
List<Triple<Integer,AltAST,String>> labels = new ArrayList<Triple<Integer,AltAST,String>>();
List<Triple<Integer,AltAST,String>> normalAltLabels = super.getAltLabels();
if ( normalAltLabels!=null ) labels.addAll(normalAltLabels);
for (LeftRecursiveRuleAltInfo altInfo : recPrimaryAlts) {
if (altInfo.altLabel != null) {
labels.add(new Triple<Integer, AltAST, String>(altInfo.altNum,
altInfo.originalAltAST,
altInfo.altLabel));
if ( recPrimaryAlts!=null ) {
for (LeftRecursiveRuleAltInfo altInfo : recPrimaryAlts) {
if (altInfo.altLabel != null) {
labels.add(new Triple<Integer, AltAST, String>(altInfo.altNum,
altInfo.originalAltAST,
altInfo.altLabel));
}
}
}
for (int i = 0; i < recOpAlts.size(); i++) {
LeftRecursiveRuleAltInfo altInfo = recOpAlts.getElement(i);
if ( altInfo.altLabel!=null ) {
labels.add(new Triple<Integer,AltAST,String>(altInfo.altNum,
altInfo.originalAltAST,
altInfo.altLabel));
if ( recOpAlts!=null ) {
for (int i = 0; i < recOpAlts.size(); i++) {
LeftRecursiveRuleAltInfo altInfo = recOpAlts.getElement(i);
if ( altInfo.altLabel!=null ) {
labels.add(new Triple<Integer,AltAST,String>(altInfo.altNum,
altInfo.originalAltAST,
altInfo.altLabel));
}
}
}
if ( labels.isEmpty() ) return null;