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

add support for escaped characters/hex notataion i.e \x20

Browse source 
allow both single and double quoted strings
This commit is contained in:
Artem Pavlenko 2012-01-27 12:43:43 +00:00
parent c405d61e1c
commit f646aa2228
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/mapnik/expression_grammar.hpp
View file

@ -148,6 +148,8 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
using qi::lit; using qi::lit;
using qi::int_; using qi::int_;
using qi::double_; using qi::double_;
using qi::hex;
using qi::omit;
using standard_wide::char_; using standard_wide::char_;
expr = logical_expr.alias(); expr = logical_expr.alias();
@ -223,14 +225,23 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
| '(' >> expr [_val = _1 ] >> ')' | '(' >> expr [_val = _1 ] >> ')'
; ;
unesc_char.add("\\a", '\a')("\\b", '\b')("\\f", '\f')("\\n", '\n')
("\\r", '\r')("\\t", '\t')("\\v", '\v')("\\\\", '\\')
("\\\'", '\'')("\\\"", '\"')
;
ustring %= omit[quote_char[_a = _1]]
>> *(unesc_char | "\\x" >> hex | (char_ - lit(_a)))
>> lit(_a);
quote_char %= char_('\'') | char_('"');
#if BOOST_VERSION > 104200 #if BOOST_VERSION > 104200
ustring %= '\'' >> no_skip[*~char_('\'')] >> '\'';
attr %= '[' >> no_skip[+~char_(']')] >> ']'; attr %= '[' >> no_skip[+~char_(']')] >> ']';
#else #else
ustring %= '\'' >> lexeme[*(char_-'\'')] >> '\'';
attr %= '[' >> lexeme[+(char_ - ']')] >> ']'; attr %= '[' >> lexeme[+(char_ - ']')] >> ']';
#endif #endif
} }
qi::real_parser<double, qi::strict_real_policies<double> > strict_double; qi::real_parser<double, qi::strict_real_policies<double> > strict_double;
@ -250,7 +261,9 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
qi::rule<Iterator, std::string() > regex_match_expr; qi::rule<Iterator, std::string() > regex_match_expr;
qi::rule<Iterator, expr_node(expr_node), qi::locals<std::string,std::string>, space_type> regex_replace_expr; qi::rule<Iterator, expr_node(expr_node), qi::locals<std::string,std::string>, space_type> regex_replace_expr;
qi::rule<Iterator, std::string() , space_type> attr; qi::rule<Iterator, std::string() , space_type> attr;
qi::rule<Iterator, std::string() > ustring; qi::rule<Iterator, std::string(), qi::locals<char> > ustring;
qi::symbols<char const, char const> unesc_char;
qi::rule<Iterator, char() > quote_char;
}; };
} // namespace } // namespace