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

expression_grammar_x3 - better names

Browse source
This commit is contained in:
artemp 2015-12-02 11:29:01 +00:00
parent dfe41c4930
commit 95c9d89afe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/expression_grammar_x3.hpp
View file

@ -335,7 +335,7 @@ namespace mapnik { namespace grammar {
| |
('-' > multiplicative_expression[do_subt])); ('-' > multiplicative_expression[do_subt]));
auto const mattr = '[' > no_skip[+~char_(']')] > ']'; auto const feature_attr = '[' > no_skip[+~char_(']')] > ']';
auto const global_attr = x3::rule<class ustring, std::string> {} = '@' > no_skip[alpha > *(alnum | char_('-'))]; auto const global_attr = x3::rule<class ustring, std::string> {} = '@' > no_skip[alpha > *(alnum | char_('-'))];
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 > ')';
@ -381,7 +381,7 @@ namespace mapnik { namespace grammar {
| |
lit("[mapnik::geometry_type]")[do_geometry_type_attribute] lit("[mapnik::geometry_type]")[do_geometry_type_attribute]
| |
mattr[do_attribute] feature_attr[do_attribute]
| |
global_attr[do_global_attribute] global_attr[do_global_attribute]
| |