X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=98a0234961d2029d0b665450a314c120bf90e35f;hb=256b44a5009467171af53316141277027bcc0ba4;hp=51e22edf7a8e47c4ea1b02a3b1077d14e34f1f6e;hpb=0881c95bef812d94d8086225c2736b4f15b4c8dc;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index 51e22ed..98a0234 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;
@@ -54,12 +54,6 @@ Loader::Loader():
 	check_sub_loads(false)
 { }
 
-Loader::~Loader()
-{
-	for(ActionMap::iterator i=local_actions.begin(); i!=local_actions.end(); ++i)
-		delete i->second;
-}
-
 void Loader::load(Parser &p)
 {
 	if(!actions)
@@ -85,8 +79,8 @@ void Loader::load(const Statement &st)
 	if(!actions)
 		throw logic_error("no actions");
 
-	for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
-		load_statement(*i);
+	for(const Statement &s: st.sub)
+		load_statement(s);
 	finish();
 }
 
@@ -123,9 +117,9 @@ void Loader::load_statement(const Statement &st)
 
 		if(!aux_loaders.empty() && !has_action(key))
 		{
-			for(vector<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);
@@ -137,9 +131,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)
 	{
@@ -199,7 +196,7 @@ bool Loader::has_action(const StatementKey &key) const
 	if(!actions)
 		return false;
 
-	ActionMap::const_iterator i = actions->lower_bound(StatementKey(key.keyword, string()));
+	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;
@@ -211,15 +208,15 @@ LoaderAction *Loader::find_action(const StatementKey &key) const
 	if(!actions)
 		return 0;
 
-	ActionMap::const_iterator begin = actions->lower_bound(StatementKey(key.keyword, string()));
-	ActionMap::const_iterator end = actions->upper_bound(StatementKey(key.keyword, "~"));
+	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;
 	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)
@@ -229,7 +226,7 @@ LoaderAction *Loader::find_action(const StatementKey &key) const
 		}
 	}
 
-	if(!act)
+	if(!match)
 		throw invalid_signature(key.keyword, key.signature);
 
 	return act;
@@ -249,5 +246,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