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

+ use no_skip[] instead of lexeme[] directive

Browse source 
to avoid pre-skipping
This commit is contained in:
Artem Pavlenko 2010-06-21 09:40:46 +00:00
parent e21f670275
commit ff9cca417b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mapnik/expression_grammar.hpp
View file

@ -128,7 +128,7 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
using qi::_a;
using qi::_b;
using qi::_r1;
using qi::lexeme;
using qi::no_skip;
using qi::_val;
using qi::lit;
using qi::int_;
@ -207,15 +207,13 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
| int_ [_val = _1]
| lit("true") [_val = true]
| lit("false") [_val = false]
| '\'' >> ustring [_val = unicode_(_1) ] >> '\''
| '[' >> attr [_val = construct<attribute>( _1 ) ] >> ']'
| ustring [_val = unicode_(_1) ]
| attr [_val = construct<attribute>( _1 ) ]
| '(' >> expr [_val = _1 ] >> ')'
;
attr %= +(char_ - ']');
ustring %= lexeme[*(char_-'\'')];
attr %= '[' >> +(char_ - ']') >> ']';
ustring %= '\'' >> no_skip[+~char_('\'')] >> '\'';
}
qi::real_parser<double, qi::strict_real_policies<double> > strict_double;