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(!signature_match(*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; i<st_sig.size(); ++i)
- if(!signature_match(st_sig[i], act_sig[i]))
- return false;
+ int match = 3;
+ for(unsigned i=0; (i<st_sig.size() && match); ++i)
+ match = min(match, signature_match(st_sig[i], act_sig[i]));
- return true;
+ return match ? match+1 : 0;
}
else
- return false;
+ return 0;
}
}
namespace DataFile {
Loader::Loader():
+ actions(0),
cur_st(0),
direct(false),
check_sub_loads(false)
{ }
-Loader::~Loader()
-{
- for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
- delete i->second;
-}
-
void Loader::load(Parser &p)
{
+ if(!actions)
+ throw logic_error("no actions");
+
while(p)
{
if(p.peek(0))
void Loader::load(const Statement &st)
{
- for(list<Statement>::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();
}
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);
+ for(Loader *l: aux_loaders)
+ if(l->has_action(key))
+ return l->load_statement(st);
}
LoaderAction *act = find_action(key);
throw logic_error("substatements ignored");
}
}
- catch(const data_error &)
+ catch(const data_error &e)
{
- throw;
+ if(e.get_source()!=st.source)
+ throw data_error(st.source, st.line, e);
+ else
+ throw;
}
catch(const exception &e)
{
throw logic_error("no current statement");
}
+void Loader::set_actions(ActionMap &a)
+{
+ if(actions)
+ throw logic_error("actions already set");
+
+ actions = &a;
+ if(a.empty())
+ init_actions();
+}
+
void Loader::add(const string &kwd, LoaderAction *act)
{
+ if(!actions)
+ actions = &local_actions;
+
StatementKey key(kwd, (act ? act->get_signature() : "*"));
- ActionMap::iterator i = actions.find(key);
- if(i!=actions.end())
+ ActionMap::iterator i = actions->find(key);
+ if(i!=actions->end())
{
delete i->second;
i->second = act;
}
else
- actions[key] = act;
+ (*actions)[key] = act;
}
void Loader::add_auxiliary_loader(Loader &ldr)
bool Loader::has_action(const StatementKey &key) const
{
- ActionMap::const_iterator i = actions.lower_bound(StatementKey(key.keyword, string()));
- for(; (i!=actions.end() && i->first.keyword==key.keyword); ++i)
+ if(!actions)
+ return false;
+
+ 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 true;
return false;
LoaderAction *Loader::find_action(const StatementKey &key) const
{
- ActionMap::const_iterator begin = actions.lower_bound(StatementKey(key.keyword, string()));
- ActionMap::const_iterator end = actions.upper_bound(StatementKey(key.keyword, "~"));
+ if(!actions)
+ return 0;
+
+ 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);
- for(ActionMap::const_iterator i=begin; i!=end; ++i)
- if(signature_match(key.signature, i->first.signature))
- return i->second;
+ LoaderAction *act = 0;
+ 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);
- throw invalid_signature(key.keyword, key.signature);
+ return act;
}
const string &Loader::get_source() const
return cur_st->keyword;
}
+
+Loader::ActionMap::~ActionMap()
+{
+ for(const auto &kvp: *this)
+ delete kvp.second;
+}
+
} // namespace DataFile
} // namespace Msp