Add missing virtual destructor to Collection::ItemKeywordBase

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

diff --git a/source/loader.h b/source/loader.h
index 8d26a418a0f5d9cdec52a6ecc85160ff4ee1c4e4..749c1047cd1a762084adb91d37956671fe8d6745 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -151,6 +151,23 @@ private:
 };
 
 
+template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
+class LoaderFunc5: public LoaderAction
+{
+public:
+       typedef void (L::*FuncType)(A0, A1, A2, A3, A4);
+
+       LoaderFunc5(FuncType f): func(f) { }
+       void execute(Loader &l, const Statement &st) const
+       {
+               if(st.args.size()!=5) throw TypeError(st.get_location()+": Wrong number of arguments");
+               (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>(), st.args[4].get<A4>());
+       }
+private:
+       FuncType func;
+};
+
+
 template<typename L, typename T0>
 class LoadValue1: public LoaderAction
 {
@@ -179,7 +196,7 @@ public:
        {
                if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
                typename L::Loader &ldr=dynamic_cast<typename L::Loader &>(l);
-               ldr.get_object().*ptr0=&ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
+               ldr.get_object().*ptr0=ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
        }
 private:
        Pointer0Type ptr0;
@@ -257,6 +274,10 @@ protected:
        void add(const std::string &k, void (L::*func)(A0, A1, A2, A3))
        { add(k, new LoaderFunc4<L, A0, A1, A2, A3>(func)); }
 
+       template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
+       void add(const std::string &k, void (L::*func)(A0, A1, A2, A3, A4))
+       { add(k, new LoaderFunc5<L, A0, A1, A2, A3, A4>(func)); }
+
        /**
        Adds a keyword that is loaded into a variable of the loaded object.
        */
@@ -322,6 +343,8 @@ protected:
                        throw InvalidState("get_source called without current statement");
                return cur_st->source;
        }
+
+       virtual void finish() { }
 private:
        typedef std::map<std::string, LoaderAction *> ActionMap;