From 95c9d89afebddc1f487bfd6bebed1cb16ddef292 Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 2 Dec 2015 11:29:01 +0000 Subject: [PATCH] expression_grammar_x3 - better names --- include/mapnik/expression_grammar_x3.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mapnik/expression_grammar_x3.hpp b/include/mapnik/expression_grammar_x3.hpp index 7728a885e..c2d220edb 100644 --- a/include/mapnik/expression_grammar_x3.hpp +++ b/include/mapnik/expression_grammar_x3.hpp @@ -335,7 +335,7 @@ namespace mapnik { namespace grammar { | ('-' > multiplicative_expression[do_subt])); - auto const mattr = '[' > no_skip[+~char_(']')] > ']'; + auto const feature_attr = '[' > no_skip[+~char_(']')] > ']'; auto const global_attr = x3::rule {} = '@' > no_skip[alpha > *(alnum | char_('-'))]; auto const regex_match_expression_def = lit(".match") > '(' > 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] | - mattr[do_attribute] + feature_attr[do_attribute] | global_attr[do_global_attribute] |