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

diff --git a/source/loader.cpp b/source/loader.cpp
index 8d4f2be..655514e 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -12,54 +12,34 @@ 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);
-	finish();
+	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()
-{
-	for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
-		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)
+void Loader::load(const Statement &st)
 {
-	ActionMap::iterator i=actions.find(k);
-	if(i!=actions.end())
-	{
-		delete i->second;
-		i->second=a;
-	}
-	else
-		actions[k]=a;
+	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);
+	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)
@@ -75,7 +55,27 @@ void Loader::load_statement(const Statement &st)
 			throw;
 		}
 	}
-	cur_st=0;
+	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);
+	if(i!=actions.end())
+	{
+		delete i->second;
+		i->second = a;
+	}
+	else
+		actions[k] = a;
 }
 
 } // namespace DataFile