Add some optional (for now) extra checks for Loader

Remove argument count checks from LoaderActions, the signatures take care of that now

diff --git a/source/loader.cpp b/source/loader.cpp
index 6da8599ba550e373828ea96af9bd81942216180c..de9323a36269ebc51656c75e1c771a1f169bb706 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -51,6 +51,12 @@ bool signature_match(const string &st_sig, const string &act_sig)
 namespace Msp {
 namespace DataFile {
 
+Loader::Loader():
+       cur_st(0),
+       allow_pointer_reload(true),
+       check_sub_loads(false)
+{ }
+
 Loader::~Loader()
 {
        for(ActionMap::iterator i = actions.begin(); i!=actions.end(); ++i)
@@ -83,7 +89,12 @@ void Loader::load_statement(const Statement &st)
        {
                LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
                if(act)
+               {
+                       sub_loaded = false;
                        act->execute(*this, st);
+                       if(check_sub_loads && !st.sub.empty() && !sub_loaded)
+                               throw Exception("Substatements were not loaded");
+               }
        }
        catch(Exception &e)
        {
@@ -103,6 +114,7 @@ void Loader::load_sub_with(Loader &ldr)
                throw InvalidState("load_sub called without current statement");
 
        ldr.load(*cur_st);
+       sub_loaded = true;
 }
 
 void Loader::add(const string &kwd, LoaderAction *act)

diff --git a/source/loader.h b/source/loader.h
index 6f7e61464db509bf50e5c62fe26d851018f5d342..126de575ba027fb0cd241ee4a8f5beb0654550b7 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -56,14 +56,19 @@ private:
 
        typedef std::map<ActionKey, LoaderAction *> ActionMap;
 
-       ActionMap       actions;
+       ActionMap actions;
        const Statement *cur_st;
-
+       bool sub_loaded;
 protected:
-       Loader(): cur_st(0) { }
+       bool allow_pointer_reload;
+       bool check_sub_loads;
+
+       Loader();
 public:
        virtual ~Loader();
 
+       bool is_pointer_reload_allowed() const { return allow_pointer_reload; }
+
        /** Loads statements from a parser. */
        void load(Parser &p);
 

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