From fe05108357b21f5c7b9bfe9e2c3d88052a59ad69 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 13 Jul 2008 00:01:23 +0000
Subject: [PATCH] More flexible framework for loading substatements with custom
 loaders

---
 source/loader.cpp |  8 ++++++++
 source/loader.h   | 34 ++++++++++++----------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/source/loader.cpp b/source/loader.cpp
index 284588a..e499386 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -36,6 +36,14 @@ Loader::~Loader()
 		delete i->second;
 }
 
+void Loader::load_sub_with(Loader &ldr)
+{
+	if(!cur_st)
+		throw InvalidState("load_sub called without current statement");
+
+	ldr.load(*cur_st);
+}
+
 void Loader::add(const string &k, LoaderAction *a)
 {
 	ActionMap::iterator i=actions.find(k);
diff --git a/source/loader.h b/source/loader.h
index a7d2dbd..5f4037c 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -302,37 +302,27 @@ protected:
 	*/
 	template<typename S>
 	void load_sub(S &s)
-	{ load_sub<typename S::Loader, S>(s); }
-
-	/**
-	Loads a sub-object with a custom Loader class.
-	*/
-	template<typename L, typename S>
-	void load_sub(S &s)
 	{
-		if(!cur_st)
-			throw InvalidState("load_sub called without current statement");
-		L loader(s);
-		loader.load(*cur_st);
+		typename S::Loader ldr(s);
+		load_sub_with(ldr);
 	}
 
-	template<typename S, typename T>
-	void load_sub(S &s, T &p)
-	{ load_sub<typename S::Loader, S, T>(s, p); }
-
 	/**
-	Loads a sub-object with a custom Loader class that takes one argument in
-	addition to to object to be loaded.
+	Loads a sub-object from the statement being processed with an extra parameter
+	for the Loader.  The Loader class of the sub-object is automatically used.
 	*/
-	template<typename L, typename S, typename T>
+	template<typename S, typename T>
 	void load_sub(S &s, T &p)
 	{
-		if(!cur_st)
-			throw InvalidState("load_sub called without current statement");
-		L loader(s, p);
-		loader.load(*cur_st);
+		typename S::Loader ldr(s, p);
+		load_sub_with(ldr);
 	}
 
+	/**
+	Processes the current statement's substatements with another Loader.
+	*/
+	void load_sub_with(Loader &);
+
 	/**
 	Returns the source of the statement being processed.  This can be used to
 	implement relative paths in include-like statements.  Note that the source
-- 
2.43.0