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

diff --git a/source/loader.cpp b/source/loader.cpp
index 1250d0f..2c0fbd1 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -70,7 +70,7 @@ public:
 class invalid_signature: public runtime_error
 {
 public:
-	invalid_signature(const std::string &k, const std::string & s):
+	invalid_signature(const std::string &k, const std::string &s):
 		runtime_error(format("%s %s", k, s))
 	{ }
 
@@ -113,7 +113,16 @@ void Loader::load_statement(const Statement &st)
 
 	try
 	{
-		LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+		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_action(key))
+					return (*i)->load_statement(st);
+		}
+
+		LoaderAction *act = find_action(key);
 		if(act)
 		{
 			sub_loaded = false;
@@ -143,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())
 	{
@@ -154,10 +163,24 @@ void Loader::add(const string &kwd, LoaderAction *act)
 		actions[key] = act;
 }
 
-LoaderAction *Loader::find_action(const ActionKey &key) const
+void Loader::add_auxiliary_loader(Loader &ldr)
+{
+	aux_loaders.push_back(&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(signature_match(key.signature, i->first.signature))
+			return true;
+	return false;
+}
+
+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);
@@ -176,25 +199,5 @@ const string &Loader::get_source() const
 	return cur_st->source;
 }
 
-void Loader::error(const string &msg) const
-{
-	if(!cur_st)
-		throw logic_error("!cur_st");
-	throw data_error(cur_st->source, cur_st->line, msg);
-}
-
-
-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