X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=8a1103d11f14d4c251033a20a1189a2a886599e8;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=604886125614728c2552d486decfa01afa19c804;hpb=302f73123da1194dd91b43138cd880cae9318a14;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 6048861..8a1103d 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -35,21 +35,15 @@ See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 class Loader
 {
 private:
-	struct ActionKey
-	{
-		std::string keyword;
-		std::string signature;
-
-		ActionKey(const std::string &, const std::string &);
-
-		bool operator<(const ActionKey &) const;
-	};
-
-	typedef std::map<ActionKey, LoaderAction *> ActionMap;
+	typedef std::map<StatementKey, LoaderAction *> ActionMap;
 
 	ActionMap actions;
+	Parser *cur_parser;
+	unsigned cur_level;
 	const Statement *cur_st;
 	bool sub_loaded;
+	bool direct;
+	std::list<Loader *> aux_loaders;
 protected:
 	bool check_sub_loads;
 
@@ -64,6 +58,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);
 
@@ -131,7 +128,12 @@ protected:
 private:
 	void add(const std::string &, LoaderAction *);
 
-	LoaderAction *find_action(const ActionKey &) const;
+protected:
+	void add_auxiliary_loader(Loader &);
+
+private:
+	bool has_action(const StatementKey &) const;
+	LoaderAction *find_action(const StatementKey &) const;
 
 protected:
 	/** Returns the source of the statement being processed.  This can be used