X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=5b39212e53c32beceda2cc3227109dc9eb4c9b6c;hb=d84673be1c2fe8bd32ddaa7877529855cad6daa0;hp=a7d2dbdfbc9eb70f191e9e9c979f355a55174315;hpb=6dd94a7fe90c6467024685fbac769067ddb74688;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index a7d2dbd..5b39212 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
@@ -371,7 +361,7 @@ void load(T &obj, const std::string &fn)
 }
 
 template<typename T, typename U>
-void load(T &obj, const std::string &fn, U arg)
+void load(T &obj, const std::string &fn, U &arg)
 {
 	IO::File in(fn);
 	IO::Buffered buf(in);