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

feature_generator_grammar - fix escaping

Browse source
This commit is contained in:
artemp 2014-08-13 13:06:38 +01:00
parent 4ebd824368
commit e8b7d50ebb
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/mapnik/json/feature_generator_grammar.hpp
View file

@ -126,13 +126,12 @@ struct utf8
} }
}; };
struct extract_string struct value_base
{ {
template <typename T> using result_type = mapnik::value_base const&;
struct result { using type = std::string; }; mapnik::value_base const& operator() (mapnik::value const& val) const
std::string operator() (mapnik::value const& val) const
{ {
return val.to_expression_string(); return val.base();
} }
}; };
@ -145,6 +144,17 @@ struct escaped_string
karma::symbols<char, char const*> esc_char; karma::symbols<char, char const*> esc_char;
}; };
struct extract_string
{
using result_type = std::tuple<std::string,bool>;
result_type operator() (mapnik::value const& val) const
{
bool need_quotes = val.base().is<value_unicode_string>();
return std::make_tuple(val.to_string(), need_quotes);
}
};
template <typename OutputIterator> template <typename OutputIterator>
struct feature_generator_grammar: struct feature_generator_grammar:
karma::grammar<OutputIterator, mapnik::feature_impl const&()> karma::grammar<OutputIterator, mapnik::feature_impl const&()>
@ -158,11 +168,12 @@ struct feature_generator_grammar:
escaped_string<OutputIterator> escaped_string_; escaped_string<OutputIterator> escaped_string_;
karma::rule<OutputIterator, mapnik::feature_impl const&()> properties; karma::rule<OutputIterator, mapnik::feature_impl const&()> properties;
karma::rule<OutputIterator, pair_type()> pair; karma::rule<OutputIterator, pair_type()> pair;
karma::rule<OutputIterator, mapnik::value_base const&(mapnik::value const&)> value; karma::rule<OutputIterator, std::tuple<std::string,bool>()> value;
karma::rule<OutputIterator, mapnik::value_null()> value_null_; karma::rule<OutputIterator, mapnik::value_null()> value_null_;
karma::rule<OutputIterator, mapnik::value_unicode_string()> ustring; karma::rule<OutputIterator, mapnik::value_unicode_string()> ustring;
typename karma::int_generator<mapnik::value_integer,10, false> int__; typename karma::int_generator<mapnik::value_integer,10, false> int__;
boost::phoenix::function<get_id> id_; boost::phoenix::function<get_id> id_;
boost::phoenix::function<value_base> value_base_;
boost::phoenix::function<extract_string> extract_string_; boost::phoenix::function<extract_string> extract_string_;
boost::phoenix::function<utf8> utf8_; boost::phoenix::function<utf8> utf8_;
std::string quote_; std::string quote_;

23
include/mapnik/json/feature_generator_grammar_impl.hpp
View file

@ -40,7 +40,6 @@ escaped_string<OutputIterator>::escaped_string()
karma::hex_type hex; karma::hex_type hex;
karma::right_align_type right_align; karma::right_align_type right_align;
karma::print_type kprint; karma::print_type kprint;
esc_char.add esc_char.add
('"', "\\\"") ('"', "\\\"")
('\\', "\\\\") ('\\', "\\\\")
@ -70,10 +69,11 @@ feature_generator_grammar<OutputIterator>::feature_generator_grammar()
boost::spirit::karma::double_type double_; boost::spirit::karma::double_type double_;
boost::spirit::karma::_val_type _val; boost::spirit::karma::_val_type _val;
boost::spirit::karma::_1_type _1; boost::spirit::karma::_1_type _1;
boost::spirit::karma::_r1_type _r1;
boost::spirit::karma::string_type kstring; boost::spirit::karma::string_type kstring;
boost::spirit::karma::eps_type eps; boost::spirit::karma::eps_type eps;
using boost::phoenix::at_c;
feature = lit("{\"type\":\"Feature\",\"id\":") feature = lit("{\"type\":\"Feature\",\"id\":")
<< uint_[_1 = id_(_val)] << uint_[_1 = id_(_val)]
<< lit(",\"geometry\":") << geometry << lit(",\"geometry\":") << geometry
@ -89,18 +89,21 @@ feature_generator_grammar<OutputIterator>::feature_generator_grammar()
pair = lit('"') pair = lit('"')
<< kstring[_1 = boost::phoenix::at_c<0>(_val)] << lit('"') << kstring[_1 = boost::phoenix::at_c<0>(_val)] << lit('"')
<< lit(':') << lit(':')
<< value(boost::phoenix::at_c<1>(_val)) << value[_1 = extract_string_(value_base_(at_c<1>(_val)))]
; ;
value = kstring[_1 = extract_string_(_r1)] value = eps(at_c<1>(_val)) << escaped_string_(quote_.c_str())[_1 = at_c<0>(_val)]
; |
value_null_ = kstring[_1 = "null"] kstring[_1 = at_c<0>(_val)]
; ;
ustring = escaped_string_(quote_.c_str())[_1 = utf8_(_val)] // FIXME http://boost-spirit.com/home/articles/karma-examples/creating-your-own-generator-component-for-spirit-karma/
; //value = (value_null_| bool_ | int__ | double_ | ustring)//[_1 = value_base_(_r1)]
// FIXME http://boost-spirit.com/home/articles/karma-examples/creating-your-own-generator-component-for-spirit-karma/ // ;
//value_null_ = kstring[_1 = "null"]
// ;
//ustring = escaped_string_(quote_.c_str())[_1 = utf8_(_val)]
// ;
} }
}} }}