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

restore support for unquoted strings in expressions

Browse source
This commit is contained in:
artemp 2016-06-24 10:55:55 +01:00
parent 392ff1a70a
commit 68ddc9d0f5
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

@ -302,12 +302,10 @@ namespace mapnik { namespace grammar {
auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '"'))] > '"';
auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
auto const ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum];
auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");
// start
auto const expression_def = logical_expression [do_assign]
|
ustring[do_unicode]
;
auto const logical_expression_def = not_expression[do_assign] >
@ -399,6 +397,9 @@ namespace mapnik { namespace grammar {
binary_func_expression[do_assign]
|
('(' > logical_expression[do_assign] > ')')
|
unquoted_ustring[do_unicode]
// ^ https://github.com/mapnik/mapnik/pull/3389
;
BOOST_SPIRIT_DEFINE (