From 545b32eaf55a9d8db689fad3f547ddbb2accea3d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 15 Sep 2016 15:41:31 +0200
Subject: [PATCH] refactor path_expression_grammar

---
 include/mapnik/path_expression_grammar_x3.hpp |  6 +++-
 .../mapnik/path_expression_grammar_x3_def.hpp |  2 +-
 src/build.py                                  |  1 +
 src/parse_path.cpp                            | 13 ++------
 src/path_expression_grammar_x3.cpp            | 32 +++++++++++++++++++
 5 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 src/path_expression_grammar_x3.cpp

diff --git a/include/mapnik/path_expression_grammar_x3.hpp b/include/mapnik/path_expression_grammar_x3.hpp
index 86e811fea..60bfd2bb4 100644
--- a/include/mapnik/path_expression_grammar_x3.hpp
+++ b/include/mapnik/path_expression_grammar_x3.hpp
@@ -39,6 +39,10 @@ using path_expression_grammar_type = x3::rule<path_expression_class, path_expres
 
 BOOST_SPIRIT_DECLARE(path_expression_grammar_type);
 
-}}
+}
+
+grammar::path_expression_grammar_type const& path_expression_grammar();
+
+}
 
 #endif  // MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_HPP
diff --git a/include/mapnik/path_expression_grammar_x3_def.hpp b/include/mapnik/path_expression_grammar_x3_def.hpp
index 7dc772aa1..324e44e35 100644
--- a/include/mapnik/path_expression_grammar_x3_def.hpp
+++ b/include/mapnik/path_expression_grammar_x3_def.hpp
@@ -53,7 +53,7 @@ BOOST_SPIRIT_DEFINE(
 
 namespace mapnik {
 
-grammar::path_expression_grammar_type path_expression_grammar()
+grammar::path_expression_grammar_type const& path_expression_grammar()
 {
     return grammar::path_expression;
 }
diff --git a/src/build.py b/src/build.py
index a1c7da041..45ba882ee 100644
--- a/src/build.py
+++ b/src/build.py
@@ -185,6 +185,7 @@ source = Split(
     font_set.cpp
     function_call.cpp
     gradient.cpp
+    path_expression_grammar_x3.cpp
     parse_path.cpp
     image_reader.cpp
     cairo_io.cpp
diff --git a/src/parse_path.cpp b/src/parse_path.cpp
index ebf50fbcc..4a9751d13 100644
--- a/src/parse_path.cpp
+++ b/src/parse_path.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,20 +27,11 @@
 #include <mapnik/value.hpp>
 
 #include <mapnik/path_expression_grammar_x3.hpp>
-#include <mapnik/path_expression_grammar_x3_def.hpp>
 
 // stl
 #include <stdexcept>
 
-namespace mapnik { namespace grammar {
-
-namespace x3 = boost::spirit::x3;
-using iterator_type = std::string::const_iterator;
-using context_type = x3::phrase_parse_context<x3::standard_wide::space_type>::type;
-
-BOOST_SPIRIT_INSTANTIATE(path_expression_grammar_type, iterator_type, context_type);
-
-}
+namespace mapnik {
 
 path_expression_ptr parse_path(std::string const& str)
 {
diff --git a/src/path_expression_grammar_x3.cpp b/src/path_expression_grammar_x3.cpp
new file mode 100644
index 000000000..fe3bf276d
--- /dev/null
+++ b/src/path_expression_grammar_x3.cpp
@@ -0,0 +1,32 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/path_expression_grammar_x3_def.hpp>
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using iterator_type = std::string::const_iterator;
+using context_type = x3::phrase_parse_context<x3::standard_wide::space_type>::type;
+BOOST_SPIRIT_INSTANTIATE(path_expression_grammar_type, iterator_type, context_type);
+
+}}