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

use semantic actions to fix #3744 ( >= boost_1_65)

Browse source
This commit is contained in:
Artem Pavlenko 2017-11-13 13:15:47 +01:00
parent 4aaba786fa
commit 5db45d9fa3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/json/positions_grammar_x3_def.hpp
View file

@ -34,6 +34,13 @@ using x3::double_;
using x3::no_case;
using x3::omit;
namespace {
auto assign_helper = [](auto const& ctx)
{
_val(ctx) = std::move(_attr(ctx));
};
} // anonymous ns
// start rule
positions_grammar_type const positions("Positions");
// rules
@ -42,7 +49,7 @@ x3::rule<class ring_class, ring> const ring("Ring");
x3::rule<class rings_class, rings> const rings("Rings");
x3::rule<class rings_array_class, rings_array> const rings_array("RingsArray");
auto const positions_def = rings_array | rings | ring | point ;
auto const positions_def = rings_array[assign_helper] | rings[assign_helper] | ring[assign_helper] | point[assign_helper] ;
auto const point_def = lit('[') > double_ > lit(',') > double_ > omit[*(lit(',') > double_)] > lit(']');
auto const ring_def = lit('[') >> -(point % lit(',')) >> lit(']');
auto const rings_def = lit('[') >> (ring % lit(',') > lit(']'));