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

diff --git a/source/loader.cpp b/source/loader.cpp
index 67668cd..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,6 +36,14 @@ 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);