Consider full statement signature when dealing with auxiliary loaders

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

diff --git a/source/loader.h b/source/loader.h
index 416bda012dde1992e42417b3912f42721344da08..dcbbd5dcda202bcd1e1af4f6da7c9f52df2a0f20 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <msp/io/file.h>
-#include "except.h"
 #include "loaderaction.h"
 #include "parser.h"
 #include "statement.h"
@@ -51,16 +50,14 @@ private:
        ActionMap actions;
        const Statement *cur_st;
        bool sub_loaded;
+       std::list<Loader *> aux_loaders;
 protected:
-       bool allow_pointer_reload;
        bool check_sub_loads;
 
        Loader();
 public:
        virtual ~Loader();
 
-       bool is_pointer_reload_allowed() const { return allow_pointer_reload; }
-
        /** Loads statements from a parser. */
        void load(Parser &p);
 
@@ -135,18 +132,18 @@ protected:
 private:
        void add(const std::string &, LoaderAction *);
 
+protected:
+       void add_auxiliary_loader(Loader &);
+
+private:
+       bool has_action(const ActionKey &) const;
        LoaderAction *find_action(const ActionKey &) const;
 
 protected:
        /** Returns the source of the statement being processed.  This can be used
        to implement relative paths in include-like statements.  Note that the
        source may not necessarily be a file. */
-       const std::string &get_source() const
-       {
-               if(!cur_st)
-                       throw InvalidState("get_source called without current statement");
-               return cur_st->source;
-       }
+       const std::string &get_source() const;
 
        virtual void finish() { }
 };