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

expression_grammar X3 - add support for single and double quoted arguments in regex functions

Browse source
This commit is contained in:
artemp 2015-12-07 12:19:30 +00:00
parent 64f5de14b1
commit da2335328b
1 changed files with 4 additions and 3 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

@ -323,7 +323,7 @@ namespace mapnik { namespace grammar {
auto const relational_expression_def = additive_expression[do_assign] > auto const relational_expression_def = additive_expression[do_assign] >
*( ( (lit("<=") | lit("le")) > additive_expression [do_less_equal]) *( ( (lit("<=") | lit("le")) > additive_expression [do_less_equal])
| |
( (lit("<") | lit("lt")) >> additive_expression[do_less]) // allow backtracking to be able handle '<' and '<>' correctly ( (lit("<") | lit("lt")) >> additive_expression[do_less]) // allow backtracking to be able to handle '<' and '<>' correctly
| |
( (lit(">=") | lit("ge")) > additive_expression [do_greater_equal]) ( (lit(">=") | lit("ge")) > additive_expression [do_greater_equal])
| |
@ -337,8 +337,9 @@ namespace mapnik { namespace grammar {
auto const feature_attr = lexeme['[' > +~char_(']') > ']']; auto const feature_attr = lexeme['[' > +~char_(']') > ']'];
auto const global_attr = x3::rule<class global_attr, std::string> {} = lexeme[lit('@') > alpha > *alnum]; auto const global_attr = x3::rule<class global_attr, std::string> {} = lexeme[lit('@') > alpha > *alnum];
auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')'; auto const regex_arg = x3::rule<class regex_arg, std::string> {} = quoted_string | single_quoted_string;
auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')'; auto const regex_match_expression_def = lit(".match") > '(' > regex_arg > ')';
auto const regex_replace_expression_def = lit(".replace") > '(' > regex_arg > ',' > regex_arg > ')';
auto const multiplicative_expression_def = unary_expression [do_assign] auto const multiplicative_expression_def = unary_expression [do_assign]
> *( '*' > unary_expression [do_mult] > *( '*' > unary_expression [do_mult]
| |