else if(act_sig.size()==2 && act_sig[1]=='*')
{
int match = 3;
- for(string::const_iterator i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
+ for(auto i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
match = min(match, signature_match(*i, act_sig[0]));
return match;
namespace Msp {
namespace DataFile {
-Loader::Loader():
- actions(0),
- cur_st(0),
- direct(false),
- check_sub_loads(false)
-{ }
-
void Loader::load(Parser &p)
{
if(!actions)
}
}
finish();
+ for(Loader *l: aux_loaders)
+ l->finish();
}
void Loader::load(const Statement &st)
if(!actions)
throw logic_error("no actions");
- for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
- load_statement(*i);
+ 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)
if(!aux_loaders.empty() && !has_action(key))
{
- for(vector<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)
{
{
ldr.load_direct(*cur_parser, cur_level+1);
ldr.finish();
+ for(Loader *l: ldr.aux_loaders)
+ l->finish();
}
else if(cur_st)
{
if(!actions)
return false;
- ActionMap::const_iterator i = actions->lower_bound(StatementKey(key.keyword, string()));
+ 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;
LoaderAction *Loader::find_action(const StatementKey &key) const
{
if(!actions)
- return 0;
+ return nullptr;
- ActionMap::const_iterator begin = actions->lower_bound(StatementKey(key.keyword, string()));
- ActionMap::const_iterator end = actions->upper_bound(StatementKey(key.keyword, "~"));
+ 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 = 0;
+ LoaderAction *act = nullptr;
int match = 0;
- for(ActionMap::const_iterator i=begin; i!=end; ++i)
+ for(auto i=begin; i!=end; ++i)
{
int m = signature_match(key.signature, i->first.signature);
if(m>match)
Loader::ActionMap::~ActionMap()
{
- for(iterator i=begin(); i!=end(); ++i)
- delete i->second;
+ for(const auto &kvp: *this)
+ delete kvp.second;
}
} // namespace DataFile