X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=de0b32deaaa06f4aae771ff64644a68cfdfe4d11;hb=a887b3f7518605c22e4b70eeb9fe136acb2ea632;hp=8a1103d11f14d4c251033a20a1189a2a886599e8;hpb=3b78eeb8b92dc3524d6a0456b4daf0a0f3dbf813;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 8a1103d..de0b32d 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -4,6 +4,7 @@
 #include <map>
 #include <msp/io/file.h>
 #include "loaderaction.h"
+#include "meta.h"
 #include "parser.h"
 #include "statement.h"
 
@@ -43,7 +44,7 @@ private:
 	const Statement *cur_st;
 	bool sub_loaded;
 	bool direct;
-	std::list<Loader *> aux_loaders;
+	std::vector<Loader *> aux_loaders;
 protected:
 	bool check_sub_loads;
 
@@ -141,10 +142,64 @@ protected:
 	source may not necessarily be a file. */
 	const std::string &get_source() const;
 
+	/** Returns the keyword of the statement being processed.  Can be used to
+	implement dynamic keywords. */
+	const std::string &get_keyword() const;
+
 	virtual void finish() { }
 };
 
 
+#if __cplusplus>=201103L
+/**
+Loads an object from a file.  The object must have a public Loader class.  Any
+extra arguments are passed to the Loader constructor.
+*/
+template<typename T, typename... Args>
+void load(T &obj, const std::string &fn, Args &... args)
+{
+	IO::BufferedFile in(fn);
+
+	Parser parser(in, fn);
+	typename T::Loader loader(obj, args...);
+	loader.load(parser);
+}
+
+/**
+Loads an object from a file stored in a collection.  The object must havea
+public Loader class.  The collection is passed to the Loader constructor,
+followed by any extra arguments.
+*/
+template<typename T, typename... Args>
+void load(T &obj, typename T::Loader::Collection &coll, const std::string &fn, Args &... args)
+{
+	RefPtr<IO::Seekable> in = coll.open_raw(fn);
+	if(!in)
+		throw IO::file_not_found(fn);
+
+	Parser parser(*in, fn);
+	typename T::Loader loader(obj, coll, args...);
+	loader.load(parser);
+}
+
+/**
+Loads an object from a file stored in a collection.  The object must havea
+public Loader class.  Any extra arguments are passed to the Loader constructor.
+*/
+template<typename T, typename C, typename... Args>
+typename EnableIf<NeedsCollection<typename T::Loader>::value, void>::No load(T &obj, C &coll, const std::string &fn, Args &... args)
+{
+	RefPtr<IO::Seekable> in = coll.open_raw(fn);
+	if(!in)
+		throw IO::file_not_found(fn);
+
+	Parser parser(*in, fn);
+	typename T::Loader loader(obj, args...);
+	loader.load(parser);
+}
+
+#else
+
 /**
 Loads an object from a file.  The object must have a public Loader class.
 */
@@ -158,6 +213,10 @@ void load(T &obj, const std::string &fn)
 	loader.load(parser);
 }
 
+/**
+Loads an object from a file, passing one extra argument to the Loader
+constructor.  The object must have a public Loader class.
+*/
 template<typename T, typename U>
 void load(T &obj, const std::string &fn, U &arg)
 {
@@ -167,6 +226,7 @@ void load(T &obj, const std::string &fn, U &arg)
 	typename T::Loader loader(obj, arg);
 	loader.load(parser);
 }
+#endif
 
 } // namespace DataFile
 } // namespace Msp