X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.h;h=3ab6d28fcfd194b2029588a03383ddf53adc7194;hp=3c4785c493017eadeef3f2c20bb70e05b4bb9cf8;hb=9763e39e6e09e747b87940920e778ac269dd8b15;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309

diff --git a/source/loader.h b/source/loader.h
index 3c4785c..3ab6d28 100644
--- 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"
@@ -31,7 +30,7 @@ When loading has finished successfully, the virtual function finish() is
 called.  Any post-processing of the data should be placed here and not in the
 destructor.
 
-See also classes BasicLoader and BasicLoader2.
+See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
 class Loader
 {
@@ -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,59 +132,23 @@ protected:
 private:
 	void add(const std::string &, LoaderAction *);
 
+protected:
+	void add_auxiliary_loader(Loader &);
+
+private:
+	bool has_keyword(const std::string &) 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() { }
 };
 
 
-/**
-Deprecated.  See ObjectLoader in objectloader.h.
-*/
-template<typename O>
-class BasicLoader: public Loader
-{
-public:
-	typedef O Object;
-
-protected:
-	O &obj;
-
-public:
-	BasicLoader(O &o): obj(o) { }
-	O &get_object() const { return obj; }
-};
-
-
-/**
-Deprecated.  See CollectionObjectLoader in objectloader.h.
-*/
-template<typename O, typename C>
-class BasicLoader2: public BasicLoader<O>
-{
-public:
-	typedef C Collection;
-
-protected:
-	C &coll;
-
-public:
-	BasicLoader2(O &o, C &c): BasicLoader<O>(o), coll(c) { }
-	C &get_collection() const { return coll; }
-};
-
-
 /**
 Loads an object from a file.  The object must have a public Loader class.
 */