From a8d7fc1cfbd0bc2f388d6f132064fccfc62a95ec Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Thu, 15 Mar 2018 15:58:23 +0100
Subject: [PATCH] Revert "avoid symbols duplication"

This reverts commit c737f4d56f2f3b56237c1d1eef500321bb6b7c47.
---
 include/mapnik/csv/csv_grammar_x3_def.hpp          |  8 ++++----
 include/mapnik/expression_grammar_x3_def.hpp       |  4 ++--
 .../mapnik/json/generic_json_grammar_x3_def.hpp    |  2 +-
 include/mapnik/json/positions_grammar_x3_def.hpp   |  2 +-
 include/mapnik/json/topojson_grammar_x3_def.hpp    |  2 +-
 include/mapnik/json/unicode_string_grammar_x3.hpp  |  3 ---
 .../mapnik/json/unicode_string_grammar_x3_def.hpp  |  4 ++--
 src/expression_grammar_x3.cpp                      | 14 ++------------
 8 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
index a4f5e8942..792175e96 100644
--- a/include/mapnik/csv/csv_grammar_x3_def.hpp
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -38,9 +38,9 @@ using x3::lit;
 using x3::lexeme;
 using ascii::char_;
 
-struct csv_unesc_chars_ : x3::symbols<char>
+struct unesc_char_ : x3::symbols<char>
 {
-    csv_unesc_chars_()
+    unesc_char_()
     {
         add("\\a", '\a')
             ("\\b", '\b')
@@ -55,7 +55,7 @@ struct csv_unesc_chars_ : x3::symbols<char>
             ("\"\"", '\"') // double quote
             ;
     }
-} csv_unesc_chars;
+} unesc_char;
 
 template <typename T>
 struct literal : x3::parser<literal<T>>
@@ -97,7 +97,7 @@ auto const column_def = quoted_text | *(char_ - separator)
 auto const quoted_text_def = quote > text > quote // support unmatched quotes or not (??)
     ;
 
-auto const text_def = *(csv_unesc_chars | (char_ - quote))
+auto const text_def = *(unesc_char | (char_ - quote))
     ;
 
 BOOST_SPIRIT_DEFINE (
diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index f35ccdb45..dd7d40eba 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
 
 #include <mapnik/expression_grammar_x3.hpp>
-#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
 #include <mapnik/unicode.hpp>
@@ -67,7 +67,7 @@ namespace mapnik { namespace grammar {
     x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
     namespace {
-    auto const& escaped_unicode = json::escaped_unicode_grammar();
+    auto const& escaped_unicode = json::grammar::escaped_unicode;
     }
 
     auto append = [](auto const& ctx)
diff --git a/include/mapnik/json/generic_json_grammar_x3_def.hpp b/include/mapnik/json/generic_json_grammar_x3_def.hpp
index 9f6e882d5..ea4f52f3c 100644
--- a/include/mapnik/json/generic_json_grammar_x3_def.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3_def.hpp
@@ -74,7 +74,7 @@ namespace { auto const& json_string = mapnik::json::unicode_string_grammar(); }
 
 // exported rules
 // start
-generic_json_grammar_type const value MAPNIK_INIT_PRIORITY(103) ("JSON Value");
+generic_json_grammar_type const value MAPNIK_INIT_PRIORITY(102) ("JSON Value");
 generic_json_key_value_type const key_value("JSON Object element");
 // rules
 x3::rule<class json_object_tag, json_object> const object("JSON Object");
diff --git a/include/mapnik/json/positions_grammar_x3_def.hpp b/include/mapnik/json/positions_grammar_x3_def.hpp
index e786b121c..206d22251 100644
--- a/include/mapnik/json/positions_grammar_x3_def.hpp
+++ b/include/mapnik/json/positions_grammar_x3_def.hpp
@@ -43,7 +43,7 @@ auto assign_helper = [](auto const& ctx)
 } // anonymous ns
 
 // start rule
-positions_grammar_type const positions MAPNIK_INIT_PRIORITY(104) ("Positions");
+positions_grammar_type const positions MAPNIK_INIT_PRIORITY(103) ("Positions");
 // rules
 x3::rule<class point_class, point> const point("Position");
 x3::rule<class ring_class, ring> const ring("Ring");
diff --git a/include/mapnik/json/topojson_grammar_x3_def.hpp b/include/mapnik/json/topojson_grammar_x3_def.hpp
index 49d7ee5d7..54ba23963 100644
--- a/include/mapnik/json/topojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/topojson_grammar_x3_def.hpp
@@ -306,7 +306,7 @@ struct topojson_geometry_type_ : x3::symbols<int>
 } topojson_geometry_type;
 
 // start rule
-topojson_grammar_type const topology MAPNIK_INIT_PRIORITY(105) ("Topology");
+topojson_grammar_type const topology MAPNIK_INIT_PRIORITY(104) ("Topology");
 // rules
 x3::rule<class transform_tag, mapnik::topojson::transform> const transform = "Transform";
 x3::rule<class bbox_tag, mapnik::topojson::bounding_box> const bbox = "Bounding Box";
diff --git a/include/mapnik/json/unicode_string_grammar_x3.hpp b/include/mapnik/json/unicode_string_grammar_x3.hpp
index 740b13613..9cc9f3f34 100644
--- a/include/mapnik/json/unicode_string_grammar_x3.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3.hpp
@@ -33,15 +33,12 @@ namespace mapnik { namespace json { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
 using unicode_string_grammar_type = x3::rule<class unicode_string_tag, std::string>;
-using escaped_unicode_type = x3::rule<class escaped_unicode_tag, std::string>;
 
 BOOST_SPIRIT_DECLARE(unicode_string_grammar_type);
-BOOST_SPIRIT_DECLARE(escaped_unicode_type);
 
 }
 
 grammar::unicode_string_grammar_type const& unicode_string_grammar();
-grammar::escaped_unicode_type const& escaped_unicode_grammar();
 
 }}
 
diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 2a6b1b2da..2335b657b 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -110,11 +110,11 @@ x3::uint_parser<std::uint16_t, 16, 4, 4> const hex4 {};
 x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
 // start rule
-unicode_string_grammar_type const unicode_string MAPNIK_INIT_PRIORITY(102) ("Unicode String");
+unicode_string_grammar_type const unicode_string MAPNIK_INIT_PRIORITY(101) ("Unicode String");
 // rules
 x3::rule<class double_quoted_tag, std::string> const double_quoted("Double-quoted string");
 x3::rule<class escaped_tag, std::string> const escaped("Escaped Character");
-escaped_unicode_type const escaped_unicode MAPNIK_INIT_PRIORITY(101) ("Escaped Unicode code point(s)");
+x3::rule<class escaped_unicode_tag, std::string> const escaped_unicode("Escaped Unicode code point(s)");
 x3::rule<class utf16_string_tag, std::vector<std::uint16_t>> const utf16_string("UTF16 encoded string");
 
 auto unicode_string_def = double_quoted
diff --git a/src/expression_grammar_x3.cpp b/src/expression_grammar_x3.cpp
index c072ad75d..24f43f8a5 100644
--- a/src/expression_grammar_x3.cpp
+++ b/src/expression_grammar_x3.cpp
@@ -22,19 +22,9 @@
 
 #include <mapnik/expression_grammar_x3_def.hpp>
 #include <mapnik/expression_grammar_x3_config.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
-
-namespace mapnik { namespace json { namespace grammar {
-BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, mapnik::grammar::iterator_type, mapnik::grammar::context_type);
-}
-
-grammar::escaped_unicode_type const& escaped_unicode_grammar()
-{
-    return grammar::escaped_unicode;
-}
-
-}}
 
 namespace mapnik { namespace grammar {
+
 BOOST_SPIRIT_INSTANTIATE(expression_grammar_type, iterator_type, context_type);
+
 }}