shuffle the cost of spirit grammars

include/mapnik/transform_expression_grammar_impl.hpp

@@ -22,7 +22,6 @@
 
 // mapnik
 #include <mapnik/transform_expression_grammar.hpp>
-#include <mapnik/expression_grammar_impl.hpp>
 
 // boost
 #include <boost/spirit/include/qi.hpp>

src/build.py

@@ -144,6 +144,7 @@ else: # unix, non-macos
 
 source = Split(
     """
+    expression_grammar.cpp
     fs.cpp
     request.cpp
     well_known_srs.cpp
@@ -151,7 +152,6 @@ source = Split(
     image_filter_types.cpp
     miniz_png.cpp
     color.cpp
-    css_color_grammar.cpp
     conversions.cpp
     image_compositing.cpp
     image_scaling.cpp
@@ -171,14 +171,13 @@ source = Split(
     gamma_method.cpp
     gradient.cpp
     graphics.cpp
+    parse_path.cpp
     image_reader.cpp
     image_util.cpp
     layer.cpp
     map.cpp
     load_map.cpp
     memory.cpp
-    parse_path.cpp
-    parse_transform.cpp
     palette.cpp
     plugin.cpp
     rule.cpp
@@ -188,6 +187,7 @@ source = Split(
     proj_transform.cpp
     scale_denominator.cpp
     simplify.cpp
+    parse_transform.cpp
     memory_datasource.cpp
     symbolizer.cpp
     symbolizer_keys.cpp
@@ -201,6 +201,7 @@ source = Split(
     svg/svg_points_parser.cpp
     svg/svg_transform_parser.cpp
     warp.cpp
+    css_color_grammar.cpp
     text/vertex_cache.cpp
     text/layout.cpp
     text/text_line.cpp

src/css_color_grammar.cpp

@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2014 Artem Pavlenko, Jean-Francois Doyon
+ * 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

src/expression.cpp

@@ -26,7 +26,6 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_grammar.hpp>
-#include <mapnik/expression_grammar_impl.hpp>
 
 // boost
 #include <boost/spirit/include/qi.hpp>

src/expression_grammar.cpp

@@ -0,0 +1,30 @@
+/*****************************************************************************
+ *
+ * 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
+ *
+ *****************************************************************************/
+
+// 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/parse_transform.cpp

@@ -22,7 +22,6 @@
 
 #include <mapnik/parse_transform.hpp>
 #include <mapnik/transform_expression_grammar.hpp>
-#include <mapnik/transform_expression_grammar_impl.hpp>
 
 // stl
 #include <string>

src/rule.cpp

@@ -22,17 +22,10 @@
 
 // mapnik
 #include <mapnik/rule.hpp>
-#include <mapnik/expression_node.hpp>
-#include <mapnik/debug.hpp>
-#include <mapnik/raster_colorizer.hpp>
-#include <mapnik/expression_string.hpp>
-
-// boost
-#include <memory>
-#include <boost/concept_check.hpp>
 
 // stl
 #include <limits>
+#include <memory>
 
 namespace mapnik
 {