X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=5dac2e6b46fd8d35b38f35fafcc3f8cdb3549387;hb=HEAD;hp=3e39872a5c2f1263d6748a761d28a52baa97e0f7;hpb=42752616c307bfb5a25fda5dae38c5e3d2f21694;p=libs%2Fdatafile.git diff --git a/source/loader.h b/source/loader.h index 3e39872..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 #include #include #include "loaderaction.h" @@ -33,24 +34,30 @@ destructor. See also classes ObjectLoader and CollectionObjectLoader in objectloader.h. */ -class Loader +class Loader: private NonCopyable { +protected: + class ActionMap: public std::map, private NonCopyable + { + public: + ~ActionMap(); + }; + private: - typedef std::map ActionMap; - - ActionMap actions; - Parser *cur_parser; - unsigned cur_level; - const Statement *cur_st; - bool sub_loaded; - bool direct; - std::list aux_loaders; + ActionMap local_actions; + 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 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); @@ -76,18 +83,23 @@ 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 - void load_sub(S &s, T &p) + template + void load_sub(S &s, Args &&... args) { - typename S::Loader ldr(s, p); + typename S::Loader ldr(s, std::forward(args)...); load_sub_with(ldr); } /** Processes the current statement's substatements with another Loader. */ void load_sub_with(Loader &); + /** Sets the actions to be used when loading. If the map is empty, + init_actions will be called. */ + void set_actions(ActionMap &); + virtual void init_actions() { } + /** Adds a keyword that is loaded by calling a function. */ template void add(const std::string &k, void (L::*func)()) @@ -97,21 +109,19 @@ protected: void add(const std::string &k, void (L::*func)(A0)) { add(k, new LoaderFunc1(func)); } - template - void add(const std::string &k, void (L::*func)(A0, A1)) - { add(k, new LoaderFunc2(func)); } + template + void add(const std::string &k, void (L::*func)(Args...)) + { add(k, new LoaderFuncN(func)); } - template - void add(const std::string &k, void (L::*func)(A0, A1, A2)) - { add(k, new LoaderFunc3(func)); } + /** Adds a keyword that is loaded by calling a function with a bound + first argument. */ + template + void add(const std::string &k, void (L::*func)(B0, Args...), const typename std::remove_reference::type &b0) + { add(k, new LoaderFuncNBound1(func, b0)); } - template - void add(const std::string &k, void (L::*func)(A0, A1, A2, A3)) - { add(k, new LoaderFunc4(func)); } - - template - void add(const std::string &k, void (L::*func)(A0, A1, A2, A3, A4)) - { add(k, new LoaderFunc5(func)); } + template + void add(const std::string &k, void (L::*func)(B0, Args...), B0 &&b0) + { add(k, new LoaderFuncNBound1(func, std::forward(b0))); } /** Adds a keyword that is loaded into a member of the loaded object. */ template @@ -124,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 *); @@ -150,84 +160,53 @@ 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 -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)...); 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 -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 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)...); 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 EnableIf::value, void>::No load(T &obj, C &coll, const std::string &fn, Args &... args) +typename std::enable_if::value>::type load(T &obj, C &coll, const std::string &fn, Args &&... args) { RefPtr 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)...); loader.load(parser); } -#else - -/** -Loads an object from a file. The object must have a public Loader class. -*/ -template -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 -void load(T &obj, const std::string &fn, U &arg) -{ - IO::BufferedFile in(fn); - - Parser parser(in, fn); - typename T::Loader loader(obj, arg); - loader.load(parser); -} -#endif - } // namespace DataFile } // namespace Msp