X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=5f4037c73dbedbe846cd13213b31784b1510df2d;hb=fe05108357b21f5c7b9bfe9e2c3d88052a59ad69;hp=951eeb0d2337f9ce2793fabe294a674c915ac34e;hpb=0812e7601e9ef6081d01b243ba0365aed652d773;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 951eeb0..5f4037c 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -8,8 +8,9 @@ Distributed under the LGPL
 #ifndef MSP_DATAFILE_LOADER_H_
 #define MSP_DATAFILE_LOADER_H_
 
-#include <fstream>
 #include <map>
+#include <msp/io/buffered.h>
+#include <msp/io/file.h>
 #include "except.h"
 #include "parser.h"
 #include "statement.h"
@@ -301,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
@@ -343,6 +334,8 @@ protected:
 			throw InvalidState("get_source called without current statement");
 		return cur_st->source;
 	}
+
+	virtual void finish() { }
 private:
 	typedef std::map<std::string, LoaderAction *> ActionMap;
 
@@ -359,11 +352,10 @@ Loads an object from a file.  The object must have a public Loader class.
 template<typename T>
 void load(T &obj, const std::string &fn)
 {
-	std::ifstream in(fn.c_str());
-	if(!in)
-		throw Exception("Couldn't open "+fn);
+	IO::File in(fn);
+	IO::Buffered buf(in);
 
-	Parser parser(in, fn);
+	Parser parser(buf, fn);
 	typename T::Loader loader(obj);
 	loader.load(parser);
 }
@@ -371,9 +363,8 @@ void load(T &obj, const std::string &fn)
 template<typename T, typename U>
 void load(T &obj, const std::string &fn, U arg)
 {
-	std::ifstream in(fn.c_str());
-	if(!in)
-		throw Exception("Couldn't open "+fn);
+	IO::File in(fn);
+	IO::Buffered buf(in);
 
 	Parser parser(in, fn);
 	typename T::Loader loader(obj, arg);