break apart expression+transform grammars - refs #2526

src/build.py

@@ -143,8 +143,6 @@ else: # unix, non-macos
 
 source = Split(
     """
-    marker_helpers.cpp
-    dasharray_parser.cpp
     expression_grammar.cpp
     fs.cpp
     request.cpp
@@ -167,6 +165,7 @@ source = Split(
     feature_kv_iterator.cpp
     feature_style_processor.cpp
     feature_type_style.cpp
+    dasharray_parser.cpp
     font_engine_freetype.cpp
     font_set.cpp
     function_call.cpp
@@ -180,6 +179,8 @@ source = Split(
     load_map.cpp
     memory.cpp
     palette.cpp
+    marker_helpers.cpp
+    transform_expression_grammar.cpp
     plugin.cpp
     rule.cpp
     save_map.cpp

src/expression_grammar.cpp

@@ -23,8 +23,6 @@
 // NOTE: we define this here in a cpp because def is needed twice:
 // once by src/expression.cpp and once by mapnik/transform_expression_grammar_impl.hpp
 #include <mapnik/expression_grammar_impl.hpp>
-#include <mapnik/transform_expression_grammar_impl.hpp>
 #include <string>
 
 template struct mapnik::expression_grammar<std::string::const_iterator>;
-template struct mapnik::transform_expression_grammar<std::string::const_iterator>;

src/transform_expression_grammar.cpp

@@ -0,0 +1,26 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2014 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/transform_expression_grammar_impl.hpp>
+#include <string>
+
+template struct mapnik::transform_expression_grammar<std::string::const_iterator>;