#ifndef MSP_DATAFILE_LOADER_H_
#define MSP_DATAFILE_LOADER_H_
+#include <type_traits>
#include <map>
#include <msp/io/file.h>
#include "loaderaction.h"
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);
/** Loads a sub-object from the statement being processed with an extra
parameter 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);
}
/** 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)); }
+ 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>
void add(const std::string &k, T0 L::*p0)
/** 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 *);
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);
}
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);
}
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...);
+ typename T::Loader loader(obj, std::forward<Args>(args)...);
loader.load(parser);
}