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

diff --git a/source/loader.cpp b/source/loader.cpp
index 655514e..51cdabe 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,17 +1,54 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/strings/format.h>
 #include "loader.h"
+#include "type.h"
 
 using namespace std;
 
+namespace {
+
+bool signature_match(char s, char a)
+{
+	if(s==a)
+		return true;
+	if(s==Msp::DataFile::IntType::signature && a==Msp::DataFile::FloatType::signature)
+		return true;
+	return false;
+}
+
+bool signature_match(const string &st_sig, const string &act_sig)
+{
+	if(act_sig=="*")
+		return true;
+	else if(act_sig.size()==2 && act_sig[1]=='*')
+	{
+		for(string::const_iterator i=st_sig.begin(); i!=st_sig.end(); ++i)
+			if(*i!=act_sig[0])
+				return false;
+
+		return true;
+	}
+	else if(st_sig.size()==act_sig.size())
+	{
+		for(unsigned i=0; i<st_sig.size(); ++i)
+			if(!signature_match(st_sig[i], act_sig[i]))
+				return false;
+
+		return true;
+	}
+	else
+		return false;
+}
+
+}
+
 namespace Msp {
 namespace DataFile {
 
+Loader::Loader():
+	cur_st(0),
+	check_sub_loads(false)
+{ }
+
 Loader::~Loader()
 {
 	for(ActionMap::iterator i = actions.begin(); i!=actions.end(); ++i)
@@ -39,22 +76,27 @@ void Loader::load(const Statement &st)
 void Loader::load_statement(const Statement &st)
 {
 	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)
+
+	try
 	{
-		try
-		{
-			j->second->execute(*this, st);
-		}
-		catch(Exception &e)
+		LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+		if(act)
 		{
-			if(!e.where()[0])
-				e.at(st.get_location());
-			throw;
+			sub_loaded = false;
+			act->execute(*this, st);
+			if(check_sub_loads && !st.sub.empty() && !sub_loaded)
+				throw Exception("Substatements were not loaded");
 		}
 	}
+	catch(Exception &e)
+	{
+		cur_st = 0;
+		if(!e.where()[0])
+			e.at(st.get_location());
+
+		throw;
+	}
+
 	cur_st = 0;
 }
 
@@ -64,18 +106,48 @@ void Loader::load_sub_with(Loader &ldr)
 		throw InvalidState("load_sub called without current statement");
 
 	ldr.load(*cur_st);
+	sub_loaded = true;
 }
 
-void Loader::add(const string &k, LoaderAction *a)
+void Loader::add(const string &kwd, LoaderAction *act)
 {
-	ActionMap::iterator i = actions.find(k);
+	ActionKey key(kwd, (act ? act->get_signature() : "*"));
+	ActionMap::iterator i = actions.find(key);
 	if(i!=actions.end())
 	{
 		delete i->second;
-		i->second = a;
+		i->second = act;
 	}
 	else
-		actions[k] = a;
+		actions[key] = act;
+}
+
+LoaderAction *Loader::find_action(const ActionKey &key) const
+{
+	ActionMap::const_iterator begin = actions.lower_bound(ActionKey(key.keyword, string()));
+	ActionMap::const_iterator end = actions.upper_bound(ActionKey(key.keyword, "~"));
+
+	if(begin==end)
+		throw KeyError("Unknown keyword", key.keyword);
+
+	for(ActionMap::const_iterator i=begin; i!=end; ++i)
+		if(signature_match(key.signature, i->first.signature))
+			return i->second;
+
+	throw KeyError(format("Keyword '%s' does not accept signature '%s'", key.keyword, key.signature));
+}
+
+
+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