Merge pull request #1436 from pboyer/patch-5

Fix for #1397
This commit is contained in:
Terence Parr 2016-12-01 10:48:18 -08:00 committed by GitHub
commit 3ccb8279bf
1 changed files with 10 additions and 2 deletions

View File

@ -406,6 +406,10 @@ func (p *<parser.name>) <currentRule.name; format="cap">(<currentRule.args:{a |
}
}()
<if(currentRule.hasLookaheadBlock)>
var _alt int
<endif>
<if(code)>
<code>
@ -476,6 +480,10 @@ func (p *<parser.name>) <currentRule.name>(_p int<args:{a | , <a.name> <a.type>}
}
}()
<if(currentRule.hasLookaheadBlock)>
var _alt int
<endif>
<if(code)>
<code>
@ -663,7 +671,7 @@ la_ := p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), <choice.decision>,
StarBlock(choice, alts, Sync, iteration) ::= <<
p.SetState(<choice.stateNumber>)
p.GetErrorHandler().Sync(p)
_alt := p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), <choice.decision>, p.GetParserRuleContext())
_alt = p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), <choice.decision>, p.GetParserRuleContext())
for _alt != <choice.exitAlt> && _alt != antlr.ATNInvalidAltNumber {
if _alt == 1<if(!choice.ast.greedy)>+1<endif> {
@ -683,7 +691,7 @@ for _alt != <choice.exitAlt> && _alt != antlr.ATNInvalidAltNumber {
PlusBlock(choice, alts, error) ::= <<
p.SetState(<choice.blockStartStateNumber>)<! alt block decision !>
p.GetErrorHandler().Sync(p)
_alt := 1<if(!choice.ast.greedy)>+1<endif>
_alt = 1<if(!choice.ast.greedy)>+1<endif>
for ok := true; ok; ok = _alt != <choice.exitAlt> && _alt != antlr.ATNInvalidAltNumber {
switch _alt {
<if(alts)>