X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.cpp;h=51e22edf7a8e47c4ea1b02a3b1077d14e34f1f6e;hp=a05e5f0dfe187b0060cd307f21146d7f199dbb55;hb=HEAD;hpb=5520420ecb8da0f6528b2681569f7504f75ddf38

diff --git a/source/loader.cpp b/source/loader.cpp
index a05e5f0..7e910b8 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -24,7 +24,7 @@ int signature_match(const string &st_sig, const string &act_sig)
 	else if(act_sig.size()==2 && act_sig[1]=='*')
 	{
 		int match = 3;
-		for(string::const_iterator i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
+		for(auto i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
 			match = min(match, signature_match(*i, act_sig[0]));
 
 		return match;
@@ -47,20 +47,11 @@ int signature_match(const string &st_sig, const string &act_sig)
 namespace Msp {
 namespace DataFile {
 
-Loader::Loader():
-	cur_st(0),
-	direct(false),
-	check_sub_loads(false)
-{ }
-
-Loader::~Loader()
-{
-	for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
-		delete i->second;
-}
-
 void Loader::load(Parser &p)
 {
+	if(!actions)
+		throw logic_error("no actions");
+
 	while(p)
 	{
 		if(p.peek(0))
@@ -74,13 +65,20 @@ void Loader::load(Parser &p)
 		}
 	}
 	finish();
+	for(Loader *l: aux_loaders)
+		l->finish();
 }
 
 void Loader::load(const Statement &st)
 {
-	for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
-		load_statement(*i);
+	if(!actions)
+		throw logic_error("no actions");
+
+	for(const Statement &s: st.sub)
+		load_statement(s);
 	finish();
+	for(Loader *l: aux_loaders)
+		l->finish();
 }
 
 void Loader::load_direct(Parser &p, unsigned l)
@@ -116,9 +114,9 @@ void Loader::load_statement(const Statement &st)
 
 		if(!aux_loaders.empty() && !has_action(key))
 		{
-			for(list<Loader *>::const_iterator i=aux_loaders.begin(); i!=aux_loaders.end(); ++i)
-				if((*i)->has_action(key))
-					return (*i)->load_statement(st);
+			for(Loader *l: aux_loaders)
+				if(l->has_action(key))
+					return l->load_statement(st);
 		}
 
 		LoaderAction *act = find_action(key);
@@ -130,9 +128,12 @@ void Loader::load_statement(const Statement &st)
 				throw logic_error("substatements ignored");
 		}
 	}
-	catch(const data_error &)
+	catch(const data_error &e)
 	{
-		throw;
+		if(e.get_source()!=st.source)
+			throw data_error(st.source, st.line, e);
+		else
+			throw;
 	}
 	catch(const exception &e)
 	{
@@ -146,6 +147,8 @@ void Loader::load_sub_with(Loader &ldr)
 	{
 		ldr.load_direct(*cur_parser, cur_level+1);
 		ldr.finish();
+		for(Loader *l: ldr.aux_loaders)
+			l->finish();
 	}
 	else if(cur_st)
 	{
@@ -156,17 +159,30 @@ void Loader::load_sub_with(Loader &ldr)
 		throw logic_error("no current statement");
 }
 
+void Loader::set_actions(ActionMap &a)
+{
+	if(actions)
+		throw logic_error("actions already set");
+
+	actions = &a;
+	if(a.empty())
+		init_actions();
+}
+
 void Loader::add(const string &kwd, LoaderAction *act)
 {
+	if(!actions)
+		actions = &local_actions;
+
 	StatementKey key(kwd, (act ? act->get_signature() : "*"));
-	ActionMap::iterator i = actions.find(key);
-	if(i!=actions.end())
+	ActionMap::iterator i = actions->find(key);
+	if(i!=actions->end())
 	{
 		delete i->second;
 		i->second = act;
 	}
 	else
-		actions[key] = act;
+		(*actions)[key] = act;
 }
 
 void Loader::add_auxiliary_loader(Loader &ldr)
@@ -176,8 +192,11 @@ void Loader::add_auxiliary_loader(Loader &ldr)
 
 bool Loader::has_action(const StatementKey &key) const
 {
-	ActionMap::const_iterator i = actions.lower_bound(StatementKey(key.keyword, string()));
-	for(; (i!=actions.end() && i->first.keyword==key.keyword); ++i)
+	if(!actions)
+		return false;
+
+	auto i = actions->lower_bound(StatementKey(key.keyword, string()));
+	for(; (i!=actions->end() && i->first.keyword==key.keyword); ++i)
 		if(signature_match(key.signature, i->first.signature))
 			return true;
 	return false;
@@ -185,15 +204,18 @@ bool Loader::has_action(const StatementKey &key) const
 
 LoaderAction *Loader::find_action(const StatementKey &key) const
 {
-	ActionMap::const_iterator begin = actions.lower_bound(StatementKey(key.keyword, string()));
-	ActionMap::const_iterator end = actions.upper_bound(StatementKey(key.keyword, "~"));
+	if(!actions)
+		return nullptr;
+
+	auto begin = actions->lower_bound(StatementKey(key.keyword, string()));
+	auto end = actions->upper_bound(StatementKey(key.keyword, "~"));
 
 	if(begin==end)
 		throw unknown_keyword(key.keyword);
 
-	LoaderAction *act = 0;
+	LoaderAction *act = nullptr;
 	int match = 0;
-	for(ActionMap::const_iterator i=begin; i!=end; ++i)
+	for(auto i=begin; i!=end; ++i)
 	{
 		int m = signature_match(key.signature, i->first.signature);
 		if(m>match)
@@ -203,7 +225,7 @@ LoaderAction *Loader::find_action(const StatementKey &key) const
 		}
 	}
 
-	if(!act)
+	if(!match)
 		throw invalid_signature(key.keyword, key.signature);
 
 	return act;
@@ -223,5 +245,12 @@ const string &Loader::get_keyword() const
 	return cur_st->keyword;
 }
 
+
+Loader::ActionMap::~ActionMap()
+{
+	for(const auto &kvp: *this)
+		delete kvp.second;
+}
+
 } // namespace DataFile
 } // namespace Msp