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

Fix handling of multiple EOF symbols in parser rules

This commit is contained in:
Sam Harwell 2014-04-06 16:25:14 -05:00
parent 88c7d09c24
commit f9e9a6ab38
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -848,9 +848,9 @@ public class ParserATNSimulator extends ATNSimulator {
* The conditions assume that intermediate * The conditions assume that intermediate
* contains all configurations relevant to the reach set, but this * contains all configurations relevant to the reach set, but this
* condition is not true when one or more configurations have been * condition is not true when one or more configurations have been
* withheld in skippedStopStates. * withheld in skippedStopStates, or when the current symbol is EOF.
*/ */
if (skippedStopStates == null) { if (skippedStopStates == null && t != Token.EOF) {
if ( intermediate.size()==1 ) { if ( intermediate.size()==1 ) {
// Don't pursue the closure if there is just one state. // Don't pursue the closure if there is just one state.
// It can only have one alternative; just add to result // It can only have one alternative; just add to result
@ -1415,6 +1415,11 @@ public class ParserATNSimulator extends ATNSimulator {
ATNConfig c = getEpsilonTarget(config, t, continueCollecting, ATNConfig c = getEpsilonTarget(config, t, continueCollecting,
depth == 0, fullCtx, treatEofAsEpsilon); depth == 0, fullCtx, treatEofAsEpsilon);
if ( c!=null ) { if ( c!=null ) {
if (!t.isEpsilon() && !closureBusy.add(c)) {
// avoid infinite recursion for EOF* and EOF+
//continue;
}
int newDepth = depth; int newDepth = depth;
if ( config.state instanceof RuleStopState) { if ( config.state instanceof RuleStopState) {
assert !fullCtx; assert !fullCtx;