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

DSL: allow ()use(x)=>x and ()use(x)=>{return x}

This commit is contained in:
Alexander A. Klimov 2019-08-14 10:06:04 +02:00 committed by Michael Friedrich
parent bb08f190a1
commit 9be3b60f76
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/config/config_parser.yy
View File

@ -937,7 +937,7 @@ rterm_no_side_effect_no_dict: T_STRING
$$ = new FunctionExpression("<anonymous>", std::move(args), {}, std::unique_ptr<Expression>($3), @$); $$ = new FunctionExpression("<anonymous>", std::move(args), {}, std::unique_ptr<Expression>($3), @$);
} }
| '(' identifier_items ')' T_FOLLOWS | '(' identifier_items ')' use_specifier T_FOLLOWS
{ {
BeginFlowControlBlock(context, FlowControlReturn, false); BeginFlowControlBlock(context, FlowControlReturn, false);
} }
@ -945,15 +945,17 @@ rterm_no_side_effect_no_dict: T_STRING
{ {
EndFlowControlBlock(context); EndFlowControlBlock(context);
$$ = new FunctionExpression("<anonymous>", std::move(*$2), {}, std::unique_ptr<Expression>($6), @$); $$ = new FunctionExpression("<anonymous>", std::move(*$2), std::move(*$4), std::unique_ptr<Expression>($7), @$);
delete $2; delete $2;
delete $4;
} }
| '(' identifier_items ')' T_FOLLOWS rterm %dprec 1 | '(' identifier_items ')' use_specifier T_FOLLOWS rterm %dprec 1
{ {
ASSERT(!dynamic_cast<DictExpression *>($5)); ASSERT(!dynamic_cast<DictExpression *>($6));
$$ = new FunctionExpression("<anonymous>", std::move(*$2), {}, std::unique_ptr<Expression>($5), @$); $$ = new FunctionExpression("<anonymous>", std::move(*$2), std::move(*$4), std::unique_ptr<Expression>($6), @$);
delete $2; delete $2;
delete $4;
} }
| rterm_array | rterm_array
| '(' | '('