X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.h;h=fe928048508d208aafe339def238a4cdc722dc2d;hp=dcbbd5dcda202bcd1e1af4f6da7c9f52df2a0f20;hb=1a3b30ea35fbc19e56bbd35e4ee1811d8d5e02a4;hpb=d248c63a252b0efcbcd9ef11cf7f8e22e594403e

diff --git a/source/loader.h b/source/loader.h
index dcbbd5d..fe92804 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -35,21 +35,14 @@ 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;
@@ -65,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);
 
@@ -136,8 +132,8 @@ protected:
 	void add_auxiliary_loader(Loader &);
 
 private:
-	bool has_action(const ActionKey &) const;
-	LoaderAction *find_action(const ActionKey &) const;
+	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
@@ -145,6 +141,10 @@ 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() { }
 };