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

add single/double quoted strings + global attributes + unquoted string (default)

Browse source
This commit is contained in:
artemp 2015-12-01 13:57:39 +00:00
parent d2bb56a71f
commit 07ed49c1a0
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/mapnik/expression_grammar_x3.hpp
View file

@ -57,6 +57,8 @@ namespace mapnik { namespace grammar {
using x3::_val;
using x3::no_skip;
using x3::no_case;
using x3::alpha;
using x3::alnum;
struct transcoder_tag;
auto do_assign = [] (auto & ctx)
@ -69,6 +71,11 @@ namespace mapnik { namespace grammar {
_val(ctx) = std::move(attribute(_attr(ctx)));
};
auto do_global_attribute = [] (auto & ctx)
{
_val(ctx) = std::move(global_attribute(_attr(ctx)));
};
auto do_add = [] (auto & ctx)
{
_val(ctx) = std::move(mapnik::binary_node<mapnik::tags::plus>(std::move(_val(ctx)), std::move(_attr(ctx))));
@ -241,8 +248,9 @@ namespace mapnik { namespace grammar {
//auto const quote_char = char_('\'') | char_('"');
auto const quoted_string = lexeme['\''> *(char_ - '\'') > '\''];
auto const quoted_string = lexeme['"'> *(char_ - '"') > '"'];
auto const single_quoted_string = lexeme['\''> *(char_ - '\'') > '\''];
auto const ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha >> *alnum];
auto const expression = logical_expression;
auto const logical_expression_def = not_expression[do_assign] >
@ -281,6 +289,7 @@ namespace mapnik { namespace grammar {
('-' > multiplicative_expression[do_subt]));
auto const attr = '[' > no_skip[+~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_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';
@ -323,14 +332,20 @@ namespace mapnik { namespace grammar {
|
quoted_string[do_unicode]
|
single_quoted_string[do_unicode]
|
attr[do_attribute]
|
global_attr[do_global_attribute]
|
unary_func_expression[do_assign]
|
binary_func_expression[do_assign]
|
('(' > expression[do_assign] > ')');
('(' > expression[do_assign] > ')')
|
ustring[do_unicode]
;
BOOST_SPIRIT_DEFINE (
logical_expression,