sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "expression_test - attempt to fix nested function calls"

Browse source 
This reverts commit faaa841272.
This commit is contained in:
artemp 2016-01-20 14:03:00 +01:00
parent faaa841272
commit 49f5606a67
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -72,11 +72,6 @@ namespace mapnik { namespace grammar {
_val(ctx) = std::move(_attr(ctx)); _val(ctx) = std::move(_attr(ctx));
}; };
auto do_copy = [] (auto & ctx)
{
_val(ctx) = _attr(ctx);
};
auto do_negate = [] (auto & ctx) auto do_negate = [] (auto & ctx)
{ {
_val(ctx) = std::move(unary_node<mapnik::tags::negate>(_attr(ctx))); _val(ctx) = std::move(unary_node<mapnik::tags::negate>(_attr(ctx)));
@ -392,7 +387,7 @@ namespace mapnik { namespace grammar {
| |
(lit("not") | lit("!") ) > expression[do_not] (lit("not") | lit("!") ) > expression[do_not]
| |
unary_func_expression[do_copy] unary_func_expression[do_assign]
| |
binary_func_expression[do_assign] binary_func_expression[do_assign]
| |