X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.cpp;h=51e22edf7a8e47c4ea1b02a3b1077d14e34f1f6e;hp=51cdabec478d812a23a8133f3716b77c58568163;hb=HEAD;hpb=e4beb0453a1cfe200fc97607afab94c3ddee1c65 diff --git a/source/loader.cpp b/source/loader.cpp index 51cdabe..7e910b8 100644 --- a/source/loader.cpp +++ b/source/loader.cpp @@ -1,4 +1,6 @@ +#include #include +#include "except.h" #include "loader.h" #include "type.h" @@ -6,148 +8,248 @@ using namespace std; namespace { -bool signature_match(char s, char a) +int signature_match(char s, char a) { if(s==a) - return true; + return 3; if(s==Msp::DataFile::IntType::signature && a==Msp::DataFile::FloatType::signature) - return true; - return false; + return 1; + return 0; } -bool signature_match(const string &st_sig, const string &act_sig) +int signature_match(const string &st_sig, const string &act_sig) { if(act_sig=="*") - return true; + return 1; else if(act_sig.size()==2 && act_sig[1]=='*') { - for(string::const_iterator i=st_sig.begin(); i!=st_sig.end(); ++i) - if(*i!=act_sig[0]) - return false; + int match = 3; + for(auto i=st_sig.begin(); (i!=st_sig.end() && match); ++i) + match = min(match, signature_match(*i, act_sig[0])); - return true; + return match; } else if(st_sig.size()==act_sig.size()) { - for(unsigned i=0; isecond; -} - void Loader::load(Parser &p) { + if(!actions) + throw logic_error("no actions"); + while(p) { - Statement st = p.parse(); - if(st.valid) - load_statement(st); + if(p.peek(0)) + load_direct(p, 0); + else if(p) // Peek may have processed an __end, so recheck goodness + { + // Parse in raw mode so we can peek immediately after a mode change + Statement st = p.parse(true); + if(st.valid && !st.control) + load_statement(st); + } } finish(); + for(Loader *l: aux_loaders) + l->finish(); } void Loader::load(const Statement &st) { - for(list::const_iterator i = st.sub.begin(); i!=st.sub.end(); ++i) - load_statement(*i); + if(!actions) + throw logic_error("no actions"); + + for(const Statement &s: st.sub) + load_statement(s); finish(); + for(Loader *l: aux_loaders) + l->finish(); +} + +void Loader::load_direct(Parser &p, unsigned l) +{ + SetForScope set_parser(cur_parser, &p); + SetForScope set_level(cur_level, l); + + while(p) + { + const StatementKey *key = p.peek(l); + if(!key) + break; + + LoaderAction *act = find_action(*key); + if(act) + { + SetFlag set_direct(direct); + if(!p.parse_and_load(l, *this, *act)) + throw logic_error("direct load failed"); + } + else + load_statement(p.parse()); + } } void Loader::load_statement(const Statement &st) { - cur_st = &st; + SetForScope 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(Loader *l: aux_loaders) + if(l->has_action(key)) + return l->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 Exception("Substatements were not loaded"); + throw logic_error("substatements ignored"); } } - catch(Exception &e) + catch(const data_error &e) { - cur_st = 0; - if(!e.where()[0]) - e.at(st.get_location()); - - throw; + if(e.get_source()!=st.source) + throw data_error(st.source, st.line, e); + else + throw; + } + catch(const exception &e) + { + throw data_error(st.source, st.line, e); } - - cur_st = 0; } void Loader::load_sub_with(Loader &ldr) { - if(!cur_st) - throw InvalidState("load_sub called without current statement"); + if(direct) + { + ldr.load_direct(*cur_parser, cur_level+1); + ldr.finish(); + for(Loader *l: ldr.aux_loaders) + l->finish(); + } + else if(cur_st) + { + ldr.load(*cur_st); + sub_loaded = true; + } + else + throw logic_error("no current statement"); +} + +void Loader::set_actions(ActionMap &a) +{ + if(actions) + throw logic_error("actions already set"); - ldr.load(*cur_st); - sub_loaded = true; + actions = &a; + if(a.empty()) + init_actions(); } void Loader::add(const string &kwd, LoaderAction *act) { - ActionKey key(kwd, (act ? act->get_signature() : "*")); - ActionMap::iterator i = actions.find(key); - if(i!=actions.end()) + if(!actions) + actions = &local_actions; + + StatementKey key(kwd, (act ? act->get_signature() : "*")); + ActionMap::iterator i = actions->find(key); + if(i!=actions->end()) { delete i->second; i->second = act; } else - actions[key] = 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); +} - if(begin==end) - throw KeyError("Unknown keyword", key.keyword); +bool Loader::has_action(const StatementKey &key) const +{ + if(!actions) + return false; - for(ActionMap::const_iterator i=begin; i!=end; ++i) + auto 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 i->second; + return true; + return false; +} + +LoaderAction *Loader::find_action(const StatementKey &key) const +{ + if(!actions) + return nullptr; - throw KeyError(format("Keyword '%s' does not accept signature '%s'", key.keyword, key.signature)); + auto begin = actions->lower_bound(StatementKey(key.keyword, string())); + auto end = actions->upper_bound(StatementKey(key.keyword, "~")); + + if(begin==end) + throw unknown_keyword(key.keyword); + + LoaderAction *act = nullptr; + int match = 0; + for(auto i=begin; i!=end; ++i) + { + int m = signature_match(key.signature, i->first.signature); + if(m>match) + { + act = i->second; + match = m; + } + } + + if(!match) + throw invalid_signature(key.keyword, key.signature); + + return act; +} + +const string &Loader::get_source() const +{ + if(!cur_st) + throw logic_error("no current statement"); + return cur_st->source; } +const string &Loader::get_keyword() const +{ + if(!cur_st) + throw logic_error("no current statement"); + return cur_st->keyword; +} -Loader::ActionKey::ActionKey(const string &k, const string &s): - keyword(k), - signature(s) -{ } -bool Loader::ActionKey::operator<(const ActionKey &other) const +Loader::ActionMap::~ActionMap() { - if(keyword!=other.keyword) - return keyword