class invalid_signature: public runtime_error
{
public:
- invalid_signature(const std::string &k, const std::string & s):
+ invalid_signature(const std::string &k, const std::string &s):
runtime_error(format("%s %s", k, s))
{ }
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;
}
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();
}
try
{
- LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+ ActionKey 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;
actions[key] = act;
}
+void Loader::add_auxiliary_loader(Loader &ldr)
+{
+ aux_loaders.push_back(&ldr);
+}
+
+bool Loader::has_action(const ActionKey &key) const
+{
+ ActionMap::const_iterator i = actions.lower_bound(ActionKey(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 ActionKey &key) const
{
ActionMap::const_iterator begin = actions.lower_bound(ActionKey(key.keyword, string()));
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),