X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floaderaction.h;h=82fd3b437902a3494167ae295c7f065184424a5b;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=cfbe281f399c4071df30e12b17f53f6d99843d18;hpb=b34b46788d69853eabdbbd9e71ca82f2f5c09df8;p=libs%2Fdatafile.git

diff --git a/source/loaderaction.h b/source/loaderaction.h
index cfbe281..82fd3b4 100644
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -1,14 +1,7 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_LOADERACTION_H_
 #define MSP_DATAFILE_LOADERACTION_H_
 
-#include "except.h"
+#include "argumentstore.h"
 #include "statement.h"
 
 namespace Msp {
@@ -29,6 +22,8 @@ public:
 	/** Called to process a statement. */
 	virtual void execute(Loader &, const Statement &) const = 0;
 
+	virtual void execute(Loader &, const ArgumentStore &) const = 0;
+
 	virtual std::string get_signature() const = 0;
 };
 
@@ -47,9 +42,13 @@ private:
 public:
 	LoaderFunc0(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	virtual void execute(Loader &l, const Statement &) const
+	{
+		(dynamic_cast<L &>(l).*func)();
+	};
+
+	virtual void execute(Loader &l, const ArgumentStore &) const
 	{
-		if(st.args.size()!=0) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)();
 	};
 
@@ -74,10 +73,14 @@ 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>());
 	}
 
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		(dynamic_cast<L &>(l).*func)(as.get<A0>(0));
+	}
+
 	virtual std::string get_signature() const
 	{ return std::string(1, TypeInfo<A0>::signature); }
 };
@@ -106,6 +109,16 @@ public:
 		(dynamic_cast<L &>(l).*func)(values);
 	}
 
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		std::vector<A0> values;
+		unsigned n_args = as.get_info().key.signature.size();
+		values.reserve(n_args);
+		for(unsigned i=0; i<n_args; ++i)
+			values.push_back(as.get<A0>(i));
+		(dynamic_cast<L &>(l).*func)(values);
+	}
+
 	virtual std::string get_signature() const
 	{
 		std::string result;
@@ -135,6 +148,11 @@ public:
 		(dynamic_cast<L &>(l).*func)(st);
 	}
 
+	virtual void execute(Loader &, const ArgumentStore &) const
+	{
+		throw std::logic_error("incompatible format");
+	}
+
 	virtual std::string get_signature() const
 	{ return "*"; }
 };
@@ -153,10 +171,14 @@ 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>());
 	}
 
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1));
+	}
+
 	virtual std::string get_signature() const
 	{
 		std::string result;
@@ -180,10 +202,14 @@ 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>());
 	}
 
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2));
+	}
+
 	virtual std::string get_signature() const
 	{
 		std::string result;
@@ -208,10 +234,14 @@ 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>());
 	}
 
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2), as.get<A3>(3));
+	}
+
 	virtual std::string get_signature() const
 	{
 		std::string result;
@@ -237,10 +267,14 @@ 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>());
 	}
 
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2), as.get<A3>(3), as.get<A4>(4));
+	}
+
 	virtual std::string get_signature() const
 	{
 		std::string result;
@@ -267,8 +301,12 @@ 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 void execute(Loader &l, const ArgumentStore &as) const
+	{
+		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = as.get<T0>(0);
 	}
 
 	virtual std::string get_signature() const
@@ -289,9 +327,14 @@ 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);
+		ldr.get_object().*ptr0 = &ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
+	}
+
+	virtual void execute(Loader &l, const ArgumentStore &as) const
+	{
+		typename L::Loader &ldr = dynamic_cast<typename L::Loader &>(l);
+		ldr.get_object().*ptr0 = &ldr.get_collection().template get<T0>(as.get<std::string>(0));
 	}
 
 	virtual std::string get_signature() const
@@ -314,9 +357,14 @@ 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 void execute(Loader &l, const ArgumentStore &as) const
+	{
+		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = as.get<T0>(0);
+		dynamic_cast<typename L::Loader &>(l).get_object().*ptr1 = as.get<T1>(1);
 	}
 
 	virtual std::string get_signature() const