X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.cpp;h=ad62445f0be3e00a785695121e510f76cc7d4a5f;hp=8111f54c94a26d9e7d61f195881aff607c67e418;hb=b0b9af7216560da2a46ea38fe2df959f4dfb126f;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309

diff --git a/source/loader.cpp b/source/loader.cpp
index 8111f54..ad62445 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,4 +1,5 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
+#include "dataerror.h"
 #include "loader.h"
 #include "type.h"
 
@@ -6,6 +7,16 @@ 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)
@@ -41,12 +52,34 @@ 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),
-	allow_pointer_reload(true),
 	check_sub_loads(false)
 { }
 
@@ -76,7 +109,7 @@ void Loader::load(const Statement &st)
 
 void Loader::load_statement(const Statement &st)
 {
-	cur_st = &st;
+	Set<const Statement *> set_cst(cur_st, &st);
 
 	try
 	{
@@ -86,25 +119,23 @@ void Loader::load_statement(const Statement &st)
 			sub_loaded = false;
 			act->execute(*this, st);
 			if(check_sub_loads && !st.sub.empty() && !sub_loaded)
-				throw Exception("Substatements were not 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;
@@ -129,13 +160,27 @@ LoaderAction *Loader::find_action(const ActionKey &key) const
 	ActionMap::const_iterator end = actions.upper_bound(ActionKey(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);
+}
+
+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);
 }