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

diff --git a/source/loader.cpp b/source/loader.cpp
index 655514e..ad62445 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,17 +1,88 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/strings/format.h>
+#include "dataerror.h"
 #include "loader.h"
+#include "type.h"
 
 using namespace std;
 
+namespace {
+
+template<typename T>
+struct Set
+{
+	T &ref;
+	T orig;
+
+	Set(T &r, const T &v): ref(r), orig(r) { r = v; }
+	~Set() { ref = orig; }
+};
+
+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 {
 
+class unknown_keyword: public runtime_error
+{
+public:
+	unknown_keyword(const std::string &k):
+		runtime_error(k)
+	{ }
+
+	virtual ~unknown_keyword() throw() { }
+};
+
+
+class invalid_signature: public runtime_error
+{
+public:
+	invalid_signature(const std::string &k, const std::string & s):
+		runtime_error(format("%s %s", k, s))
+	{ }
+
+	virtual ~invalid_signature() throw() { }
+};
+
+
+Loader::Loader():
+	cur_st(0),
+	check_sub_loads(false)
+{ }
+
 Loader::~Loader()
 {
 	for(ActionMap::iterator i = actions.begin(); i!=actions.end(); ++i)
@@ -38,44 +109,91 @@ 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)
+	Set<const Statement *> set_cst(cur_st, &st);
+
+	try
 	{
-		try
+		LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+		if(act)
 		{
-			j->second->execute(*this, st);
-		}
-		catch(Exception &e)
-		{
-			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 logic_error("substatements ignored");
 		}
 	}
-	cur_st = 0;
+	catch(const data_error &)
+	{
+		throw;
+	}
+	catch(const exception &e)
+	{
+		throw data_error(st.source, st.line, e);
+	}
 }
 
 void Loader::load_sub_with(Loader &ldr)
 {
 	if(!cur_st)
-		throw InvalidState("load_sub called without current statement");
+		throw logic_error("no 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 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 invalid_signature(key.keyword, key.signature);
+}
+
+const string &Loader::get_source() const
+{
+	if(!cur_st)
+		throw logic_error("no current statement");
+	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