Add some optional (for now) extra checks for Loader

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

diff --git a/source/loaderaction.h b/source/loaderaction.h
index cfbe281f399c4071df30e12b17f53f6d99843d18..03a9da7bcc1aa8fc33823f404a0426f704aaeaed 100644 (file)
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -47,9 +47,8 @@ private:
 public:
        LoaderFunc0(FuncType f): func(f) { }
 
-       virtual void execute(Loader &l, const Statement &st) const
+       virtual void execute(Loader &l, const Statement &) const
        {
-               if(st.args.size()!=0) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)();
        };
 
@@ -74,7 +73,6 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
        }
 
@@ -153,7 +151,6 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
        }
 
@@ -180,7 +177,6 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=3) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
        }
 
@@ -208,7 +204,6 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=4) throw TypeError("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>());
        }
 
@@ -237,7 +232,6 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=5) throw TypeError("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>());
        }
 
@@ -267,8 +261,7 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
-               dynamic_cast<typename L::Loader &>(l).get_object().*ptr0=st.args[0].get<T0>();
+               dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = st.args[0].get<T0>();
        }
 
        virtual std::string get_signature() const
@@ -289,9 +282,10 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("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>());
+               typename L::Loader &ldr = dynamic_cast<typename L::Loader &>(l);
+               if(!ldr.is_pointer_reload_allowed() && ldr.get_object().*ptr0)
+                       throw InvalidState("The pointer has already been loaded");
+               ldr.get_object().*ptr0 = ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
        }
 
        virtual std::string get_signature() const
@@ -314,9 +308,8 @@ public:
 
        virtual void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
-               dynamic_cast<typename L::Loader &>(l).get_object().*ptr0=st.args[0].get<T0>();
-               dynamic_cast<typename L::Loader &>(l).get_object().*ptr1=st.args[1].get<T1>();
+               dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = st.args[0].get<T0>();
+               dynamic_cast<typename L::Loader &>(l).get_object().*ptr1 = st.args[1].get<T1>();
        }
 
        virtual std::string get_signature() const