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 4a1faa3f7af650ff4f4ec3726cc768fea77255cb..dcbbd5dcda202bcd1e1af4f6da7c9f52df2a0f20 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -50,6 +50,7 @@ private:
        ActionMap actions;
        const Statement *cur_st;
        bool sub_loaded;
+       std::list<Loader *> aux_loaders;
 protected:
        bool check_sub_loads;
 
@@ -131,6 +132,11 @@ 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:
@@ -139,9 +145,6 @@ protected:
        source may not necessarily be a file. */
        const std::string &get_source() const;
 
-       /** Throws a data_error from the current line. */
-       void error(const std::string &) const;
-
        virtual void finish() { }
 };