-/* $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/strings/format.h>
+#include "dataerror.h"
#include "loader.h"
#include "type.h"
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)
}
+
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)
void Loader::load_statement(const Statement &st)
{
- cur_st = &st;
+ Set<const Statement *> set_cst(cur_st, &st);
try
{
LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
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());
+ ActionKey key(kwd, (act ? act->get_signature() : "*"));
ActionMap::iterator i = actions.find(key);
if(i!=actions.end())
{
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);
}