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

json error_handler : optional MAPNIK_LOG_ERROR + don't throw + return qi::fail

Browse source
This commit is contained in:
artemp 2015-11-02 12:46:18 +00:00
parent 96c2fc9076
commit 25ed5d1e00
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/mapnik/json/error_handler.hpp
View file

@ -23,34 +23,42 @@
#ifndef MAPNIK_JSON_ERROR_HANDLER_HPP #ifndef MAPNIK_JSON_ERROR_HANDLER_HPP
#define MAPNIK_JSON_ERROR_HANDLER_HPP #define MAPNIK_JSON_ERROR_HANDLER_HPP
#include <string>
#include <sstream>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#include <boost/spirit/home/qi.hpp>
#include <boost/spirit/home/support/info.hpp> #include <boost/spirit/home/support/info.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
// mapnik
#include <mapnik/debug.hpp>
// stl
#include <cassert> #include <cassert>
#include <string>
#include <sstream>
namespace mapnik { namespace json { namespace mapnik { namespace json {
template <typename Iterator> template <typename Iterator>
struct error_handler struct error_handler
{ {
using result_type = void; using result_type = boost::spirit::qi::error_handler_result;
void operator() ( result_type operator() (
Iterator, Iterator,
Iterator end, Iterator end,
Iterator err_pos, Iterator err_pos,
boost::spirit::info const& what) const boost::spirit::info const& what) const
{ {
#ifdef MAPNIK_LOG
std::stringstream s; std::stringstream s;
using difference_type = typename std::iterator_traits<Iterator>::difference_type; using difference_type = typename std::iterator_traits<Iterator>::difference_type;
auto start_err= err_pos; auto start_err = err_pos;
std::advance(err_pos, std::min(std::distance(err_pos, end), difference_type(16))); std::advance(err_pos, std::min(std::distance(err_pos, end), difference_type(16)));
auto end_err = err_pos; auto end_err = err_pos;
assert(end_err <= end); assert(end_err <= end);
s << "Mapnik GeoJSON parsing error:" << what << " expected but got: " << std::string(start_err, end_err); s << "Mapnik GeoJSON parsing error:" << what << " expected but got: " << std::string(start_err, end_err);
throw std::runtime_error(s.str()); MAPNIK_LOG_ERROR(error_handler) << s.str();
#endif
return boost::spirit::qi::fail;
} }
}; };