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

Fix for a weird lambda execution problem in Windows. 

One of the lambdas used in a "finally" expression executed already while defining the "finally" instance, which is way too early of course (others did not show this behavior), which happens only with the Visual Studio compiler, not clang. By changing the capture list to a general reference capture things started working as they should.
This commit is contained in:
Mike Lischke 2016-05-05 10:02:29 +02:00
parent 8ff852640a
commit 0fada33ceb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg
View File

@ -491,19 +491,19 @@ Ref\<<parser.name>::<currentRule.ctxType>\> <parser.name>::<currentRule.name>(<c
} }
Ref\<<parser.name>::<currentRule.ctxType>\> <parser.name>::<currentRule.name>(int precedence<currentRule.args:{a | , <a>}>) { Ref\<<parser.name>::<currentRule.ctxType>\> <parser.name>::<currentRule.name>(int precedence<currentRule.args:{a | , <a>}>) {
Ref\<ParserRuleContext> parentContext = _ctx; Ref\<ParserRuleContext> parentContext = _ctx;
int parentState = getState(); int parentState = getState();
Ref\<<parser.name>::<currentRule.ctxType>\> result = std::make_shared\<<currentRule.ctxType>\>(_ctx, parentState<currentRule.args: {a | , <a.name>}>); Ref\<<parser.name>::<currentRule.ctxType>\> result = std::make_shared\<<currentRule.ctxType>\>(_ctx, parentState<currentRule.args: {a | , <a.name>}>);
Ref\<<parser.name>::<currentRule.ctxType>\> previousContext = result; Ref\<<parser.name>::<currentRule.ctxType>\> previousContext = result;
int startState = <currentRule.startState>; int startState = <currentRule.startState>;
enterRecursionRule(result, <currentRule.startState>, <parser.name>Rule::Rule<currentRule.name; format = "cap">, precedence); enterRecursionRule(result, <currentRule.startState>, <parser.name>Rule::Rule<currentRule.name; format = "cap">, precedence);
<namedActions.init> <namedActions.init>
<! TODO: untested !> <locals; separator = "\n"> <! TODO: untested !> <locals; separator = "\n">
auto onExit = finally([this, parentContext] { auto onExit = finally([&] {
<! TODO: untested !><if (finallyAction)><finallyAction><endif> <! TODO: untested !><if (finallyAction)><finallyAction><endif>
unrollRecursionContexts(parentContext); unrollRecursionContexts(parentContext);
}); });
try { try {
<if (currentRule.hasLookaheadBlock)>int alt;<endif> <if (currentRule.hasLookaheadBlock)>int alt;<endif>