X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=0c8118625918823ee2b5ebf6640bfd171a9d85fb;hb=256f7238bc60d6dcc31a564988f5cc02a60c4537;hp=749c1047cd1a762084adb91d37956671fe8d6745;hpb=55592b9eeaff3d41e5f03b9c0c1566ed508f38a5;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 749c104..0c81186 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,15 +1,16 @@
 /* $Id$
 
 This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 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"
@@ -49,7 +50,7 @@ public:
 	LoaderFunc0(FuncType f): func(f) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=0) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=0) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)();
 	};
 private:
@@ -69,7 +70,7 @@ public:
 	LoaderFunc1(FuncType f): func(f) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
 	}
 private:
@@ -109,7 +110,7 @@ public:
 	LoaderFunc2(FuncType f): func(f) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=2) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
 	}
 private:
@@ -126,7 +127,7 @@ public:
 	LoaderFunc3(FuncType f): func(f) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=3) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=3) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
 	}
 private:
@@ -143,7 +144,7 @@ public:
 	LoaderFunc4(FuncType f): func(f) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=4) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=4) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>());
 	}
 private:
@@ -160,7 +161,7 @@ public:
 	LoaderFunc5(FuncType f): func(f) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=5) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=5) throw TypeError("Wrong number of arguments");
 		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>(), st.args[4].get<A4>());
 	}
 private:
@@ -177,7 +178,7 @@ public:
 	LoadValue1(Pointer0Type p0): ptr0(p0) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0=st.args[0].get<T0>();
 	}
 private:
@@ -194,7 +195,7 @@ public:
 	LoadValue1(Pointer0Type p0): ptr0(p0) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
 		typename L::Loader &ldr=dynamic_cast<typename L::Loader &>(l);
 		ldr.get_object().*ptr0=ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
 	}
@@ -213,7 +214,7 @@ public:
 	LoadValue2(Pointer0Type p0, Pointer1Type p1): ptr0(p0), ptr1(p1) { }
 	void execute(Loader &l, const Statement &st) const
 	{
-		if(st.args.size()!=2) throw TypeError(st.get_location()+": Wrong number of arguments");
+		if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0=st.args[0].get<T0>();
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr1=st.args[1].get<T1>();
 	}
@@ -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
@@ -361,21 +352,19 @@ 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);
 }
 
 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)
 {
-	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);