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

move unquoted_string to the end, remove ustring from top rule

Browse source
This commit is contained in:
artemp 2016-04-01 11:14:47 +02:00
parent 890a5cff17
commit 751b691ff6
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_impl.hpp
View file

@ -168,7 +168,7 @@ expression_grammar<Iterator>::expression_grammar(std::string const& encoding)
; ;
expr = logical_expr [_val = _1] expr = logical_expr [_val = _1]
| ustring [_val = unicode(_1)] //| ustring [_val = unicode(_1)]
; ;
logical_expr = not_expr [_val = _1] logical_expr = not_expr [_val = _1]
@ -254,10 +254,10 @@ expression_grammar<Iterator>::expression_grammar(std::string const& encoding)
| global_attr [_val = construct<mapnik::global_attribute>( _1 )] | global_attr [_val = construct<mapnik::global_attribute>( _1 )]
| unary_function_expr [_val = _1] | unary_function_expr [_val = _1]
| binary_function_expr [_val = _1] | binary_function_expr [_val = _1]
| '(' > logical_expr [_val = _1 ] > ')'
// TODO: this is a backward compatibility hack to allow unquoted strings // TODO: this is a backward compatibility hack to allow unquoted strings
| unquoted_ustring [_val = unicode(_1)] | unquoted_ustring [_val = unicode(_1)]
// ^ https://github.com/mapnik/mapnik/pull/3389 // ^ https://github.com/mapnik/mapnik/pull/3389
| '(' > logical_expr [_val = _1 ] > ')'
; ;
unesc_char.add("\\a", '\a')("\\b", '\b')("\\f", '\f')("\\n", '\n') unesc_char.add("\\a", '\a')("\\b", '\b')("\\f", '\f')("\\n", '\n')