Support const types with Collection properly

[libs/datafile.git] / source / loader.h

diff --git a/source/loader.h b/source/loader.h
index da1da3a23f462f4ed4ec77efd4b8e4c7977336e2..8d26a418a0f5d9cdec52a6ecc85160ff4ee1c4e4 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -239,40 +239,40 @@ protected:
        */
        template<typename L>
        void add(const std::string &k, void (L::*func)())
-       { actions.insert(typename ActionMap::value_type(k, new LoaderFunc0<L>(func))); }
+       { add(k, new LoaderFunc0<L>(func)); }
 
        template<typename L, typename A0>
        void add(const std::string &k, void (L::*func)(A0))
-       { actions.insert(typename ActionMap::value_type(k, new LoaderFunc1<L, A0>(func))); }
+       { add(k, new LoaderFunc1<L, A0>(func)); }
 
        template<typename L, typename A0, typename A1>
        void add(const std::string &k, void (L::*func)(A0, A1))
-       { actions.insert(typename ActionMap::value_type(k, new LoaderFunc2<L, A0, A1>(func))); }
+       { add(k, new LoaderFunc2<L, A0, A1>(func)); }
 
        template<typename L, typename A0, typename A1, typename A2>
        void add(const std::string &k, void (L::*func)(A0, A1, A2))
-       { actions.insert(typename ActionMap::value_type(k, new LoaderFunc3<L, A0, A1, A2>(func))); }
+       { add(k, new LoaderFunc3<L, A0, A1, A2>(func)); }
 
        template<typename L, typename A0, typename A1, typename A2, typename A3>
        void add(const std::string &k, void (L::*func)(A0, A1, A2, A3))
-       { actions.insert(typename ActionMap::value_type(k, new LoaderFunc4<L, A0, A1, A2, A3>(func))); }
+       { add(k, new LoaderFunc4<L, A0, A1, A2, A3>(func)); }
 
        /**
        Adds a keyword that is loaded into a variable of the loaded object.
        */
        template<typename L, typename T0>
        void add(const std::string &k, T0 L::*p0)
-       { actions.insert(typename ActionMap::value_type(k, new LoadValue1<L, T0>(p0))); }
+       { add(k, new LoadValue1<L, T0>(p0)); }
 
        template<typename L, typename T0, typename T1>
        void add(const std::string &k, T0 L::*p0, T1 L::*p1)
-       { actions.insert(typename ActionMap::value_type(k, new LoadValue2<L, T0, T1>(p0, p1))); }
+       { add(k, new LoadValue2<L, T0, T1>(p0, p1)); }
 
        /**
        Adds a keyword that is recognized but ignored.
        */
        void add(const std::string &k)
-       { actions.insert(ActionMap::value_type(k, 0)); }
+       { add(k, 0); }
 
        /**
        Loads a sub-object from the statement being processed.  The Loader class of
@@ -328,6 +328,7 @@ private:
        ActionMap       actions;
        const Statement *cur_st;
 
+       void add(const std::string &, LoaderAction *);
        void load_statement(const Statement &st);
 };
 
@@ -346,6 +347,18 @@ void load(T &obj, const std::string &fn)
        loader.load(parser);
 }
 
+template<typename T, typename U>
+void load(T &obj, const std::string &fn, U arg)
+{
+       std::ifstream in(fn.c_str());
+       if(!in)
+               throw Exception("Couldn't open "+fn);
+
+       Parser parser(in, fn);
+       typename T::Loader loader(obj, arg);
+       loader.load(parser);
+}
+
 } // namespace DataFile
 } // namespace Msp