tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turn '=>' lambda expressions into side-effect-free statements 

fixes #10760
This commit is contained in:
Gunnar Beutner 2015-12-01 16:41:00 +01:00 committed by Michael Friedrich
parent 833e28025a
commit f3ea00b189
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/config/config_parser.yy
View File

@ -690,27 +690,6 @@ rterm_side_effect: rterm '(' rterm_items ')'
$$ = new FunctionCallExpression($1, *$3, @$); $$ = new FunctionCallExpression($1, *$3, @$);
delete $3; delete $3;
} }
| identifier T_FOLLOWS rterm
{
DictExpression *aexpr = dynamic_cast<DictExpression *>($3);
if (aexpr)
aexpr->MakeInline();
std::vector<String> args;
args.push_back(*$1);
delete $1;
$$ = new FunctionExpression(args, new std::map<String, Expression *>(), $3, @$);
}
| '(' identifier_items ')' T_FOLLOWS rterm
{
DictExpression *aexpr = dynamic_cast<DictExpression *>($5);
if (aexpr)
aexpr->MakeInline();
$$ = new FunctionExpression(*$2, new std::map<String, Expression *>(), $5, @$);
delete $2;
}
| T_IF '(' rterm ')' rterm_scope else_if_branches | T_IF '(' rterm ')' rterm_scope else_if_branches
{ {
$5->MakeInline(); $5->MakeInline();
@ -814,6 +793,27 @@ rterm_no_side_effect: T_STRING
{ {
$$ = MakeLiteral(@$.FirstLine); $$ = MakeLiteral(@$.FirstLine);
} }
| identifier T_FOLLOWS rterm
{
DictExpression *aexpr = dynamic_cast<DictExpression *>($3);
if (aexpr)
aexpr->MakeInline();
std::vector<String> args;
args.push_back(*$1);
delete $1;
$$ = new FunctionExpression(args, new std::map<String, Expression *>(), $3, @$);
}
| '(' identifier_items ')' T_FOLLOWS rterm
{
DictExpression *aexpr = dynamic_cast<DictExpression *>($5);
if (aexpr)
aexpr->MakeInline();
$$ = new FunctionExpression(*$2, new std::map<String, Expression *>(), $5, @$);
delete $2;
}
| rterm_array | rterm_array
| rterm_scope_require_side_effect | rterm_scope_require_side_effect
{ {