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

expression_grammar_x3 - use lexeme

Browse source
This commit is contained in:
artemp 2015-12-04 13:50:51 +00:00
parent 8200e1ffc7
commit 3fc00049f6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/expression_grammar_x3.hpp
View file

@ -59,6 +59,7 @@ namespace mapnik { namespace grammar {
using x3::_attr;
using x3::_val;
using x3::no_skip;
using x3::lexeme;
using x3::no_case;
using x3::alpha;
using x3::alnum;
@ -329,8 +330,8 @@ namespace mapnik { namespace grammar {
|
('-' > multiplicative_expression[do_subt]));
auto const feature_attr = '[' > +~char_(']') > ']';
auto const global_attr = x3::rule<class global_attr, std::string> {} = lit('@') > alpha > *alnum;
auto const feature_attr = lexeme['[' > +~char_(']') > ']'];
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_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';
auto const multiplicative_expression_def = unary_expression [do_assign]