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

+ fix expression grammar to work with mapnik::value_integer

Browse source
This commit is contained in:
artemp 2012-12-06 09:50:54 +00:00
parent 511399f3c1
commit cd435172d4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/expression_grammar.hpp
View file

@ -108,7 +108,7 @@ struct regex_replace_impl
mapnik::transcoder const& tr_; mapnik::transcoder const& tr_;
}; };
struct geometry_types : qi::symbols<char,int> struct geometry_types : qi::symbols<char,mapnik::value_integer>
{ {
geometry_types() geometry_types()
{ {

18
src/expression_grammar.cpp
View file

@ -47,10 +47,10 @@ expr_node regex_replace_impl::operator() (T0 & node, T1 const& pattern, T2 const
template <typename Iterator> template <typename Iterator>
expression_grammar<Iterator>::expression_grammar(mapnik::transcoder const& tr) expression_grammar<Iterator>::expression_grammar(mapnik::transcoder const& tr)
: expression_grammar::base_type(expr), : expression_grammar::base_type(expr),
unicode_(unicode_impl(tr)), unicode_(unicode_impl(tr)),
regex_match_(regex_match_impl(tr)), regex_match_(regex_match_impl(tr)),
regex_replace_(regex_replace_impl(tr)) regex_replace_(regex_replace_impl(tr))
{ {
using boost::phoenix::construct; using boost::phoenix::construct;
using qi::_1; using qi::_1;
@ -140,12 +140,12 @@ expression_grammar<Iterator>::expression_grammar(mapnik::transcoder const& tr)
primary_expr = strict_double [_val = _1] primary_expr = strict_double [_val = _1]
| long_long [_val = _1] | long_long [_val = _1]
//| no_case[lit("true")] [_val = true] | no_case[lit("true")] [_val = true]
//| no_case[lit("false")] [_val = false] | no_case[lit("false")] [_val = false]
//| no_case[lit("null")] [_val = value_null() ] | no_case[lit("null")] [_val = value_null() ]
//| no_case[geom_type][_val = _1 ] | no_case[geom_type][_val = _1 ]
| ustring [_val = unicode_(_1) ] | ustring [_val = unicode_(_1) ]
//| lit("[mapnik::geometry_type]")[_val = construct<mapnik::geometry_type_attribute>()] | lit("[mapnik::geometry_type]")[_val = construct<mapnik::geometry_type_attribute>()]
| attr [_val = construct<mapnik::attribute>( _1 ) ] | attr [_val = construct<mapnik::attribute>( _1 ) ]
| '(' >> expr [_val = _1 ] >> ')' | '(' >> expr [_val = _1 ] >> ')'
; ;