X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=655514e5057c57a3c062317241abeeff5f9a08bb;hb=215e719d0ef85f748898660d15d01e77ac551de9;hp=0a9f68f249a8d56fe76ab5ba36f5c5bfe76a57e8;hpb=92644bf892df1220c8df67e1fc3da85dd02c53c5;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index 0a9f68f..655514e 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -12,49 +12,70 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
-void Loader::load(const Statement &st)
+Loader::~Loader()
 {
-	for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
-		load_statement(*i);
+	for(ActionMap::iterator i = actions.begin(); i!=actions.end(); ++i)
+		delete i->second;
 }
 
 void Loader::load(Parser &p)
 {
 	while(p)
 	{
-		Statement st=p.parse();
+		Statement st = p.parse();
 		if(st.valid)
 			load_statement(st);
 	}
+	finish();
 }
 
-Loader::~Loader()
+void Loader::load(const Statement &st)
 {
-	for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
-		delete i->second;
+	for(list<Statement>::const_iterator i = st.sub.begin(); i!=st.sub.end(); ++i)
+		load_statement(*i);
+	finish();
+}
+
+void Loader::load_statement(const Statement &st)
+{
+	cur_st = &st;
+	ActionMap::iterator j = actions.find(st.keyword);
+	if(j==actions.end())
+		throw_at(KeyError("Unknown keyword", st.keyword), st.get_location());
+	if(j->second)
+	{
+		try
+		{
+			j->second->execute(*this, st);
+		}
+		catch(Exception &e)
+		{
+			if(!e.where()[0])
+				e.at(st.get_location());
+			throw;
+		}
+	}
+	cur_st = 0;
+}
+
+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);
+	ActionMap::iterator i = actions.find(k);
 	if(i!=actions.end())
 	{
 		delete i->second;
-		i->second=a;
+		i->second = a;
 	}
 	else
-		actions[k]=a;
-}
-
-void Loader::load_statement(const Statement &st)
-{
-	cur_st=&st;
-	ActionMap::iterator j=actions.find(st.keyword);
-	if(j==actions.end())
-		throw KeyError(st.get_location()+": Unknown keyword '"+st.keyword+"'");
-	if(j->second)
-		j->second->execute(*this, st);
-	cur_st=0;
+		actions[k] = a;
 }
 
 } // namespace DataFile