Skip to content

Commit

Permalink
Merge pull request #2417 from ericvergnaud/fix-#1955-python
Browse files Browse the repository at this point in the history 
Fix #1955 python
  • Loading branch information
@parrt
parrt authored Nov 18, 2018
2 parents d714d7b + 43e529c commit be49141
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 45 deletions.
35 changes: 19 additions & 16 deletions runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ParserATNSimulator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1622,12 +1622,6 @@ protected void Closure_(ATNConfig config,
depth == 0, fullCtx, treatEofAsEpsilon);
if (c != null)
{
if (!t.IsEpsilon && !closureBusy.Add(c))
{
// avoid infinite recursion for EOF* and EOF+
continue;
}

int newDepth = depth;
if (config.state is RuleStopState)
{
Expand All @@ -1637,12 +1631,6 @@ protected void Closure_(ATNConfig config,
// 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;
}

if (thisDfa != null && thisDfa.IsPrecedenceDfa)
{
int outermostPrecedenceReturn = ((EpsilonTransition)t).OutermostPrecedenceReturn;
Expand All @@ -1653,17 +1641,32 @@ protected void Closure_(ATNConfig config,
}

c.reachesIntoOuterContext++;
if (!closureBusy.Add(c))
{
// avoid infinite recursion for right-recursive rules
continue;
}

configs.dipsIntoOuterContext = true; // TODO: can remove? only care when we add to set per middle of this method
newDepth--;
if (debug)
ConsoleWriteLine("dips into outer ctx: " + c);
}
else if (t is RuleTransition)
else
{
// latch when newDepth goes negative - once we step out of the entry context we can't return
if (newDepth >= 0)

if (!t.IsEpsilon && !closureBusy.Add(c))
{
newDepth++;
// avoid infinite recursion for EOF* and EOF+
continue;
}
if (t is RuleTransition)
{
// latch when newDepth goes negative - once we step out of the entry context we can't return
if (newDepth >= 0)
{
newDepth++;
}
}
}

Expand Down
28 changes: 14 additions & 14 deletions runtime/Python2/src/antlr4/atn/ParserATNSimulator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1145,11 +1145,6 @@ def closure_(self, config, configs, closureBusy, collectPredicates, fullCtx, dep
continueCollecting = collectPredicates and not isinstance(t, ActionTransition)
c = self.getEpsilonTarget(config, t, continueCollecting, depth == 0, fullCtx, treatEofAsEpsilon)
if c is not None:
if not t.isEpsilon:
if c in closureBusy:
# avoid infinite recursion for EOF* and EOF+
continue
closureBusy.add(c)
newDepth = depth
if isinstance( config.state, RuleStopState):
# target fell off end of rule; mark resulting c as having dipped into outer context
Expand All @@ -1158,23 +1153,28 @@ def closure_(self, config, configs, closureBusy, collectPredicates, fullCtx, dep
# come in handy and we avoid evaluating context dependent
# preds if this is > 0.

if c in closureBusy:
# avoid infinite recursion for right-recursive rules
continue
closureBusy.add(c)

if self._dfa is not None and self._dfa.precedenceDfa:
if t.outermostPrecedenceReturn == self._dfa.atnStartState.ruleIndex:
c.precedenceFilterSuppressed = True
c.reachesIntoOuterContext += 1
if c in closureBusy:
# avoid infinite recursion for right-recursive rules
continue
closureBusy.add(c)
configs.dipsIntoOuterContext = True # TODO: can remove? only care when we add to set per middle of this method
newDepth -= 1
if ParserATNSimulator.debug:
print("dips into outer ctx: " + str(c))
elif isinstance(t, RuleTransition):
# latch when newDepth goes negative - once we step out of the entry context we can't return
if newDepth >= 0:
newDepth += 1
else:
if not t.isEpsilon:
if c in closureBusy:
# avoid infinite recursion for EOF* and EOF+
continue
closureBusy.add(c)
if isinstance(t, RuleTransition):
# latch when newDepth goes negative - once we step out of the entry context we can't return
if newDepth >= 0:
newDepth += 1

self.closureCheckingStopState(c, configs, closureBusy, continueCollecting, fullCtx, newDepth, treatEofAsEpsilon)

Expand Down
29 changes: 14 additions & 15 deletions runtime/Python3/src/antlr4/atn/ParserATNSimulator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1150,36 +1150,35 @@ def closure_(self, config:ATNConfig, configs:ATNConfigSet, closureBusy:set, coll
continueCollecting = collectPredicates and not isinstance(t, ActionTransition)
c = self.getEpsilonTarget(config, t, continueCollecting, depth == 0, fullCtx, treatEofAsEpsilon)
if c is not None:
if not t.isEpsilon:
if c in closureBusy:
# avoid infinite recursion for EOF* and EOF+
continue
closureBusy.add(c)
newDepth = depth
if isinstance( config.state, RuleStopState):
# target fell off end of rule; mark resulting c as having dipped into outer context
# We can't get here if incoming config was rule stop and we had context
# track how far we dip into outer context. Might
# come in handy and we avoid evaluating context dependent
# preds if this is > 0.

if c in closureBusy:
# avoid infinite recursion for right-recursive rules
continue
closureBusy.add(c)

if self._dfa is not None and self._dfa.precedenceDfa:
if t.outermostPrecedenceReturn == self._dfa.atnStartState.ruleIndex:
c.precedenceFilterSuppressed = True
c.reachesIntoOuterContext += 1
if c in closureBusy:
# avoid infinite recursion for right-recursive rules
continue
closureBusy.add(c)
configs.dipsIntoOuterContext = True # TODO: can remove? only care when we add to set per middle of this method
newDepth -= 1
if ParserATNSimulator.debug:
print("dips into outer ctx: " + str(c))
elif isinstance(t, RuleTransition):
# latch when newDepth goes negative - once we step out of the entry context we can't return
if newDepth >= 0:
newDepth += 1
else:
if not t.isEpsilon:
if c in closureBusy:
# avoid infinite recursion for EOF* and EOF+
continue
closureBusy.add(c)
if isinstance(t, RuleTransition):
# latch when newDepth goes negative - once we step out of the entry context we can't return
if newDepth >= 0:
newDepth += 1

self.closureCheckingStopState(c, configs, closureBusy, continueCollecting, fullCtx, newDepth, treatEofAsEpsilon)

Expand Down

0 comments on commit be49141

Please sign in to comment.