[Freeorion-programmers] SF.net SVN: freeorion:[4653] trunk/FreeOrion/parse

[<geo...@us...>]

Revision: 4653
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4653&view=rev
Author:   geoffthemedio
Date:     2012-02-16 19:07:51 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Moved macro substitution code out of header file since it's only used at file scope.

Modified Paths:
--------------
    trunk/FreeOrion/parse/Parse.cpp
    trunk/FreeOrion/parse/Parse.h

Modified: trunk/FreeOrion/parse/Parse.cpp
===================================================================
--- trunk/FreeOrion/parse/Parse.cpp	2012-02-16 17:50:54 UTC (rev 4652)
+++ trunk/FreeOrion/parse/Parse.cpp	2012-02-16 19:07:51 UTC (rev 4653)
@@ -304,12 +304,9 @@
             return rules.start;
         }
 
-        void parse_file_common(const boost::filesystem::path& path,
-                               const parse::lexer& l,
-                               std::string& filename,
-                               std::string& file_contents,
-                               parse::text_iterator& first,
-                               parse::token_iterator& it)
+        void parse_file_common(const boost::filesystem::path& path, const parse::lexer& l,
+                               std::string& filename, std::string& file_contents,
+                               parse::text_iterator& first, parse::token_iterator& it)
         {
             filename = path.string();
 
@@ -323,6 +320,8 @@
                 }
             }
 
+            macro_substitution(file_contents);
+
             first = parse::text_iterator(file_contents.begin());
             parse::text_iterator last(file_contents.end());
 

Modified: trunk/FreeOrion/parse/Parse.h
===================================================================
--- trunk/FreeOrion/parse/Parse.h	2012-02-16 17:50:54 UTC (rev 4652)
+++ trunk/FreeOrion/parse/Parse.h	2012-02-16 19:07:51 UTC (rev 4653)
@@ -20,8 +20,6 @@
 namespace parse {
     void init();
 
-    void macro_substitution(std::string& text);
-
     bool buildings(const boost::filesystem::path& path, std::map<std::string, BuildingType*>& building_types);
 
     bool specials(const boost::filesystem::path& path, std::map<std::string, Special*>& specials_);