Remove argument count checks from LoaderActions, the signatures take care of that now
namespace Msp {
namespace DataFile {
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)
Loader::~Loader()
{
for(ActionMap::iterator i = actions.begin(); i!=actions.end(); ++i)
{
LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
if(act)
{
LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
if(act)
+ {
+ sub_loaded = false;
+ if(check_sub_loads && !st.sub.empty() && !sub_loaded)
+ throw Exception("Substatements were not loaded");
+ }
throw InvalidState("load_sub called without current statement");
ldr.load(*cur_st);
throw InvalidState("load_sub called without current statement");
ldr.load(*cur_st);
}
void Loader::add(const string &kwd, LoaderAction *act)
}
void Loader::add(const string &kwd, LoaderAction *act)
typedef std::map<ActionKey, LoaderAction *> ActionMap;
typedef std::map<ActionKey, LoaderAction *> ActionMap;
- Loader(): cur_st(0) { }
+ bool allow_pointer_reload;
+ bool check_sub_loads;
+
+ Loader();
public:
virtual ~Loader();
public:
virtual ~Loader();
+ bool is_pointer_reload_allowed() const { return allow_pointer_reload; }
+
/** Loads statements from a parser. */
void load(Parser &p);
/** Loads statements from a parser. */
void load(Parser &p);
public:
LoaderFunc0(FuncType f): func(f) { }
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)();
};
(dynamic_cast<L &>(l).*func)();
};
virtual void execute(Loader &l, const Statement &st) const
{
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>());
}
(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
}
virtual void execute(Loader &l, const Statement &st) const
{
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>());
}
(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
}
virtual void execute(Loader &l, const Statement &st) const
{
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>());
}
(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
}
virtual void execute(Loader &l, const Statement &st) const
{
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>());
}
(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>());
}
virtual void execute(Loader &l, const Statement &st) const
{
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>());
}
(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>());
}
virtual void execute(Loader &l, const Statement &st) const
{
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
}
virtual std::string get_signature() const
virtual void execute(Loader &l, const Statement &st) const
{
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
}
virtual std::string get_signature() const
virtual void execute(Loader &l, const Statement &st) const
{
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
}
virtual std::string get_signature() const