X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=5dac2e6b46fd8d35b38f35fafcc3f8cdb3549387;hb=HEAD;hp=fe8f0aa54f7621939b1bc2cba946f0f10ca58d0d;hpb=82d55799ee319bf2db357f2d5aded01ad0e2076f;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index fe8f0aa..3fe26e7 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_LOADER_H_
 #define MSP_DATAFILE_LOADER_H_
 
+#include <type_traits>
 #include <map>
 #include <msp/io/file.h>
 #include "loaderaction.h"
@@ -44,19 +45,19 @@ protected:
 
 private:
 	ActionMap local_actions;
-	ActionMap *actions;
-	Parser *cur_parser;
-	unsigned cur_level;
-	const Statement *cur_st;
-	bool sub_loaded;
-	bool direct;
+	ActionMap *actions = nullptr;
+	Parser *cur_parser = nullptr;
+	unsigned cur_level = 0;
+	const Statement *cur_st = nullptr;
+	bool sub_loaded = false;
+	bool direct = false;
 	std::vector<Loader *> aux_loaders;
 protected:
-	bool check_sub_loads;
+	bool check_sub_loads = false;
 
-	Loader();
+	Loader() = default;
 public:
-	virtual ~Loader() { }
+	virtual ~Loader() = default;
 
 	/** Loads statements from a parser. */
 	void load(Parser &p);
@@ -82,12 +83,12 @@ protected:
 	}
 
 	/** Loads a sub-object from the statement being processed with an extra
-	parameter for the Loader.  The Loader class of the sub-object is
+	arguments for the Loader.  The Loader class of the sub-object is
 	automatically used. */
-	template<typename S, typename T>
-	void load_sub(S &s, T &p)
+	template<typename S, typename... Args>
+	void load_sub(S &s, Args &&... args)
 	{
-		typename S::Loader ldr(s, p);
+		typename S::Loader ldr(s, std::forward<Args>(args)...);
 		load_sub_with(ldr);
 	}
 
@@ -108,36 +109,19 @@ protected:
 	void add(const std::string &k, void (L::*func)(A0))
 	{ add(k, new LoaderFunc1<L, A0>(func)); }
 
-#if __cplusplus>=201103L
 	template<typename L, typename... Args>
 	void add(const std::string &k, void (L::*func)(Args...))
 	{ add(k, new LoaderFuncN<L, Args...>(func)); }
 
-#else
-	template<typename L, typename A0, typename A1>
-	void add(const std::string &k, void (L::*func)(A0, A1))
-	{ add(k, new LoaderFunc2<L, A0, A1>(func)); }
-
-	template<typename L, typename A0, typename A1, typename A2>
-	void add(const std::string &k, void (L::*func)(A0, A1, A2))
-	{ add(k, new LoaderFunc3<L, A0, A1, A2>(func)); }
-
-	template<typename L, typename A0, typename A1, typename A2, typename A3>
-	void add(const std::string &k, void (L::*func)(A0, A1, A2, A3))
-	{ add(k, new LoaderFunc4<L, A0, A1, A2, A3>(func)); }
-
-	template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
-	void add(const std::string &k, void (L::*func)(A0, A1, A2, A3, A4))
-	{ add(k, new LoaderFunc5<L, A0, A1, A2, A3, A4>(func)); }
-#endif
-
-#if __cplusplus>=201103L
 	/** Adds a keyword that is loaded by calling a function with a bound
 	first argument. */
 	template<typename L, typename B0, typename... Args>
-	void add(const std::string &k, void (L::*func)(B0, Args...), const typename RemoveReference<B0>::Type &b0)
+	void add(const std::string &k, void (L::*func)(B0, Args...), const typename std::remove_reference<B0>::type &b0)
 	{ add(k, new LoaderFuncNBound1<L, B0, Args...>(func, b0)); }
-#endif
+
+	template<typename L, typename B0, typename... Args>
+	void add(const std::string &k, void (L::*func)(B0, Args...), B0 &&b0)
+	{ add(k, new LoaderFuncNBound1<L, B0, Args...>(func, std::forward<B0>(b0))); }
 
 	/** Adds a keyword that is loaded into a member of the loaded object. */
 	template<typename L, typename T0>
@@ -150,7 +134,7 @@ protected:
 
 	/** Adds a keyword that is recognized but ignored. */
 	void add(const std::string &k)
-	{ add(k, 0); }
+	{ add(k, nullptr); }
 
 private:
 	void add(const std::string &, LoaderAction *);
@@ -176,83 +160,52 @@ protected:
 };
 
 
-#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)
+void load(T &obj, const std::string &fn, Args &&... args)
 {
 	IO::BufferedFile in(fn);
 
 	Parser parser(in, fn);
-	typename T::Loader loader(obj, args...);
+	typename T::Loader loader(obj, std::forward<Args>(args)...);
 	loader.load(parser);
 }
 
 /**
-Loads an object from a file stored in a collection.  The object must havea
+Loads an object from a file stored in a collection.  The object must have a
 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)
+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...);
+	typename T::Loader loader(obj, coll, std::forward<Args>(args)...);
 	loader.load(parser);
 }
 
 /**
-Loads an object from a file stored in a collection.  The object must havea
+Loads an object from a file stored in a collection.  The object must have a
 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)
+typename std::enable_if<!NeedsCollection<typename T::Loader>::value>::type 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.
-*/
-template<typename T>
-void load(T &obj, const std::string &fn)
-{
-	IO::BufferedFile in(fn);
-
-	Parser parser(in, fn);
-	typename T::Loader loader(obj);
-	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)
-{
-	IO::BufferedFile in(fn);
-
-	Parser parser(in, fn);
-	typename T::Loader loader(obj, arg);
+	typename T::Loader loader(obj, std::forward<Args>(args)...);
 	loader.load(parser);
 }
-#endif
 
 } // namespace DataFile
 } // namespace Msp