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

Fix for redeclared error is generated Go code. Create block so _x and _m var are created in a local scope.

This commit is contained in:
Gary Miller 2016-11-29 12:35:48 +11:00
parent fa31d6f708
commit 763669ffc7
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
View File

@ -741,36 +741,40 @@ bitsetInlineComparison(s, bits) ::= <%
%>
InvokeRule(r, argExprsChunks) ::= <<
p.SetState(<r.stateNumber>)
<if(r.labels)>
{
p.SetState(<r.stateNumber>)
<if(r.labels)>
<if(r.ast.options.p)>
var _x = p.<r.name>(<r.ast.options.p><if(argExprsChunks)>, <endif><argExprsChunks>)
<else>
var _x = p.<r.name; format="cap">(<argExprsChunks>)
<endif>
<if(r.ast.options.p)>
var _x = p.<r.name>(<r.ast.options.p><if(argExprsChunks)>, <endif><argExprsChunks>)
<else>
var _x = p.<r.name; format="cap">(<argExprsChunks>)
<endif>
<r.labels:{l | <labelref(l)> = _x}; separator="\n">
<else>
<if(r.ast.options.p)>
p.<r.name>(<r.ast.options.p><if(argExprsChunks)>, <endif><argExprsChunks>)
<else>
p.<r.name; format="cap">(<argExprsChunks>)
<endif>
<endif>
<r.labels:{l | <labelref(l)> = _x}; separator="\n">
<else>
<if(r.ast.options.p)>
p.<r.name>(<r.ast.options.p><if(argExprsChunks)>, <endif><argExprsChunks>)
<else>
p.<r.name; format="cap">(<argExprsChunks>)
<endif>
<endif>
}
>>
MatchToken(m) ::= <<
p.SetState(<m.stateNumber>)
<if(m.labels)>
{
p.SetState(<m.stateNumber>)
<if(m.labels)>
var _m = p.Match(<parser.name><m.name>)
var _m = p.Match(<parser.name><m.name>)
<m.labels:{l | <labelref(l)> = _m}; separator="\n">
<else>
p.Match(<parser.name><m.name>)
<endif>
<m.labels:{l | <labelref(l)> = _m}; separator="\n">
<else>
p.Match(<parser.name><m.name>)
<endif>
}
>>
MatchSet(m, expr, capture) ::= "<CommonSetStuff(m, expr, capture, false)>"