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

Fix ParserATNSimulator handling of EOF and rule stop states

This commit is contained in:
Sam Harwell 2012-11-04 13:33:15 -06:00
parent 68b9798d6f
commit a70479ad0c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
View File

@ -30,6 +30,7 @@
package org.antlr.v4.runtime.atn; package org.antlr.v4.runtime.atn;
import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.IntStream;
import org.antlr.v4.runtime.NoViableAltException; import org.antlr.v4.runtime.NoViableAltException;
import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.ParserRuleContext;
@ -867,6 +868,11 @@ public class ParserATNSimulator extends ATNSimulator {
intermediate.add(new ATNConfig(c, target), mergeCache); intermediate.add(new ATNConfig(c, target), mergeCache);
} }
} }
if (t == IntStream.EOF && c.state instanceof RuleStopState) {
assert c.context.isEmpty();
intermediate.add(c, mergeCache);
}
} }
// Now figure out where the closure can take us, but only if we'll // Now figure out where the closure can take us, but only if we'll
// need to continue looking for more input. // need to continue looking for more input.
@ -992,7 +998,9 @@ public class ParserATNSimulator extends ATNSimulator {
public int getAltThatFinishedDecisionEntryRule(ATNConfigSet configs) { public int getAltThatFinishedDecisionEntryRule(ATNConfigSet configs) {
IntervalSet alts = new IntervalSet(); IntervalSet alts = new IntervalSet();
for (ATNConfig c : configs) { for (ATNConfig c : configs) {
if ( c.reachesIntoOuterContext>0 ) alts.add(c.alt); if ( c.reachesIntoOuterContext>0 || (c.state instanceof RuleStopState && c.context.hasEmptyPath()) ) {
alts.add(c.alt);
}
} }
if ( alts.size()==0 ) return ATN.INVALID_ALT_NUMBER; if ( alts.size()==0 ) return ATN.INVALID_ALT_NUMBER;
return alts.getMinElement(); return alts.getMinElement();