Prefer vector over list

[libs/datafile.git] / source / loader.h

diff --git a/source/loader.h b/source/loader.h
index bb1292cc7b3c2740adc14a6c596bde54c4a59678..de0b32deaaa06f4aae771ff64644a68cfdfe4d11 100644 (file)
--- 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"
 
@@ -38,9 +39,12 @@ private:
        typedef std::map<StatementKey, LoaderAction *> ActionMap;
 
        ActionMap actions;
+       Parser *cur_parser;
+       unsigned cur_level;
        const Statement *cur_st;
        bool sub_loaded;
-       std::list<Loader *> aux_loaders;
+       bool direct;
+       std::vector<Loader *> aux_loaders;
 protected:
        bool check_sub_loads;
 
@@ -55,6 +59,9 @@ private:
        /** Loads data from a statement. */
        void load(const Statement &st);
 
+       /** Loads statemsnts from a parser, feeding them directly to actions. */
+       void load_direct(Parser &, unsigned);
+
        /** Processes a single statement */
        void load_statement(const Statement &st);
 
@@ -135,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.
 */
@@ -152,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)
 {
@@ -161,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