X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=e4993868ab3adfac95c385ef7c5d9e6a3c638a1c;hb=fe05108357b21f5c7b9bfe9e2c3d88052a59ad69;hp=cf1a5acae89dc0e4abe7583358e3926ab629277c;hpb=de02b5618273df1b94085934f699371b4be31783;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index cf1a5ac..e499386 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -16,6 +16,7 @@ void Loader::load(const Statement &st)
 {
 	for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
 		load_statement(*i);
+	finish();
 }
 
 void Loader::load(Parser &p)
@@ -26,6 +27,7 @@ void Loader::load(Parser &p)
 		if(st.valid)
 			load_statement(st);
 	}
+	finish();
 }
 
 Loader::~Loader()
@@ -34,12 +36,32 @@ 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);
+	if(i!=actions.end())
+	{
+		delete i->second;
+		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+"'");
+		throw KeyError(st.get_location()+": Unknown keyword", st.keyword);
 	if(j->second)
 		j->second->execute(*this, st);
 	cur_st=0;