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

relax expression_grammar: allow _ underscore characters in global attribute names

Browse source
This commit is contained in:
artemp 2017-01-11 10:38:11 +01:00
parent 11c3d97654
commit 91f9508654
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -348,7 +348,7 @@ namespace mapnik { namespace grammar {
('-' > multiplicative_expression[do_subt])); ('-' > multiplicative_expression[do_subt]));
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('@') > char_("a-zA-Z_") > *char_("a-zA-Z0-9_")];
auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')'; auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')';
auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')'; auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';