/* $Id$
This file is part of libmspdatafile
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
{
for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
load_statement(*i);
+ finish();
}
void Loader::load(Parser &p)
if(st.valid)
load_statement(st);
}
+ finish();
}
Loader::~Loader()
delete i->second;
}
+void Loader::load_sub_with(Loader &ldr)
+{
+ if(!cur_st)
+ throw InvalidState("load_sub called without current statement");
+
+ ldr.load(*cur_st);
+}
+
void Loader::add(const string &k, LoaderAction *a)
{
ActionMap::iterator i=actions.find(k);
cur_st=&st;
ActionMap::iterator j=actions.find(st.keyword);
if(j==actions.end())
- throw KeyError(st.get_location()+": Unknown keyword '"+st.keyword+"'");
+ throw_at(KeyError("Unknown keyword", st.keyword), st.get_location());
if(j->second)
- j->second->execute(*this, st);
+ {
+ try
+ {
+ j->second->execute(*this, st);
+ }
+ catch(Exception &e)
+ {
+ if(!e.where()[0])
+ e.at(st.get_location());
+ throw;
+ }
+ }
cur_st=0;
}