X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.cpp;h=c2de4011232c93da747bfdead7df18af72c6087d;hp=6da8599ba550e373828ea96af9bd81942216180c;hb=0d8df25704366f3576c417436c90fbac2e479632;hpb=b34b46788d69853eabdbbd9e71ca82f2f5c09df8

diff --git a/source/loader.cpp b/source/loader.cpp
index 6da8599..c2de401 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,11 +1,6 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/core/raii.h>
+#include <msp/strings/format.h>
+#include "dataerror.h"
 #include "loader.h"
 #include "type.h"
 
@@ -48,12 +43,40 @@ bool signature_match(const string &st_sig, const string &act_sig)
 
 }
 
+
 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)
+	for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
 		delete i->second;
 }
 
@@ -70,44 +93,57 @@ void Loader::load(Parser &p)
 
 void Loader::load(const Statement &st)
 {
-	for(list<Statement>::const_iterator i = st.sub.begin(); i!=st.sub.end(); ++i)
+	for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
 		load_statement(*i);
 	finish();
 }
 
 void Loader::load_statement(const Statement &st)
 {
-	cur_st = &st;
+	SetForScope<const Statement *> set_cst(cur_st, &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;
 			act->execute(*this, st);
+			if(check_sub_loads && !st.sub.empty() && !sub_loaded)
+				throw logic_error("substatements ignored");
+		}
 	}
-	catch(Exception &e)
+	catch(const data_error &)
 	{
-		cur_st = 0;
-		if(!e.where()[0])
-			e.at(st.get_location());
-
 		throw;
 	}
-
-	cur_st = 0;
+	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 &kwd, LoaderAction *act)
 {
-	ActionKey key(kwd, act->get_signature());
+	StatementKey key(kwd, (act ? act->get_signature() : "*"));
 	ActionMap::iterator i = actions.find(key);
 	if(i!=actions.end())
 	{
@@ -118,32 +154,40 @@ 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)
 {
-	ActionMap::const_iterator begin = actions.lower_bound(ActionKey(key.keyword, string()));
-	ActionMap::const_iterator end = actions.upper_bound(ActionKey(key.keyword, "~"));
+	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(StatementKey(key.keyword, string()));
+	ActionMap::const_iterator end = actions.upper_bound(StatementKey(key.keyword, "~"));
 
 	if(begin==end)
-		throw KeyError("Unknown keyword", key.keyword);
+		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 KeyError(format("Keyword '%s' does not accept signature '%s'", key.keyword, key.signature));
+	throw invalid_signature(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
+const string &Loader::get_source() const
 {
-	if(keyword!=other.keyword)
-		return keyword<other.keyword;
-	return signature<other.signature;
+	if(!cur_st)
+		throw logic_error("no current statement");
+	return cur_st->source;
 }
 
 } // namespace DataFile