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

Merge pull request #291 from sharwell/fix-282

This commit is contained in:
Sam Harwell 2013-06-24 15:16:29 -05:00
parent b0ddb45654 7453ddaf72
commit c58721b78c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1063,8 +1063,6 @@ public class ParserATNSimulator extends ATNSimulator {
{
if ( debug ) System.out.println("closure("+config.toString(parser,true)+")");
if ( depth != 0 && !closureBusy.add(config) ) return; // avoid infinite recursion
if ( config.state instanceof RuleStopState ) {
// We hit rule end. If we have context info, use it
// run thru all possible stack tops in ctx
@ -1144,6 +1142,12 @@ public class ParserATNSimulator extends ATNSimulator {
// track how far we dip into outer context. Might
// come in handy and we avoid evaluating context dependent
// preds if this is > 0.
if (!closureBusy.add(c)) {
// avoid infinite recursion for right-recursive rules
continue;
}
c.reachesIntoOuterContext++;
configs.dipsIntoOuterContext = true; // TODO: can remove? only care when we add to set per middle of this method
assert newDepth > Integer.MIN_VALUE;