X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=2c0fbd12275ffdf4e54715a4ca05fc9524ce430d;hb=2d289d20a9a4aeac7774976e4213a7c72f1dc75b;hp=2cd27e92ac4426f9c0ff04f2c07db411938b103e;hpb=9763e39e6e09e747b87940920e778ac269dd8b15;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index 2cd27e9..2c0fbd1 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -113,14 +113,16 @@ void Loader::load_statement(const Statement &st)
 
 	try
 	{
-		if(!aux_loaders.empty() && !has_keyword(st.keyword))
+		StatementKey key(st.keyword, st.get_signature());
+
+		if(!aux_loaders.empty() && !has_action(key))
 		{
 			for(list<Loader *>::const_iterator i=aux_loaders.begin(); i!=aux_loaders.end(); ++i)
-				if((*i)->has_keyword(st.keyword))
+				if((*i)->has_action(key))
 					return (*i)->load_statement(st);
 		}
 
-		LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+		LoaderAction *act = find_action(key);
 		if(act)
 		{
 			sub_loaded = false;
@@ -150,7 +152,7 @@ void Loader::load_sub_with(Loader &ldr)
 
 void Loader::add(const string &kwd, LoaderAction *act)
 {
-	ActionKey key(kwd, (act ? act->get_signature() : "*"));
+	StatementKey key(kwd, (act ? act->get_signature() : "*"));
 	ActionMap::iterator i = actions.find(key);
 	if(i!=actions.end())
 	{
@@ -166,16 +168,19 @@ void Loader::add_auxiliary_loader(Loader &ldr)
 	aux_loaders.push_back(&ldr);
 }
 
-bool Loader::has_keyword(const string &kwd) const
+bool Loader::has_action(const StatementKey &key) const
 {
-	ActionMap::const_iterator i = actions.lower_bound(ActionKey(kwd, string()));
-	return i!=actions.end() && i->first.keyword==kwd;
+	ActionMap::const_iterator 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;
 }
 
-LoaderAction *Loader::find_action(const ActionKey &key) const
+LoaderAction *Loader::find_action(const StatementKey &key) const
 {
-	ActionMap::const_iterator begin = actions.lower_bound(ActionKey(key.keyword, string()));
-	ActionMap::const_iterator end = actions.upper_bound(ActionKey(key.keyword, "~"));
+	ActionMap::const_iterator begin = actions.lower_bound(StatementKey(key.keyword, string()));
+	ActionMap::const_iterator end = actions.upper_bound(StatementKey(key.keyword, "~"));
 
 	if(begin==end)
 		throw unknown_keyword(key.keyword);
@@ -194,18 +199,5 @@ const string &Loader::get_source() const
 	return cur_st->source;
 }
 
-
-Loader::ActionKey::ActionKey(const string &k, const string &s):
-	keyword(k),
-	signature(s)
-{ }
-
-bool Loader::ActionKey::operator<(const ActionKey &other) const
-{
-	if(keyword!=other.keyword)
-		return keyword<other.keyword;
-	return signature<other.signature;
-}
-
 } // namespace DataFile
 } // namespace Msp