try
{
- ActionKey key(st.keyword, st.get_signature());
+ StatementKey key(st.keyword, st.get_signature());
if(!aux_loaders.empty() && !has_action(key))
{
void Loader::add(const string &kwd, LoaderAction *act)
{
- ActionKey key(kwd, (act ? act->get_signature() : "*"));
+ StatementKey key(kwd, (act ? act->get_signature() : "*"));
ActionMap::iterator i = actions.find(key);
if(i!=actions.end())
{
aux_loaders.push_back(&ldr);
}
-bool Loader::has_action(const ActionKey &key) const
+bool Loader::has_action(const StatementKey &key) const
{
- ActionMap::const_iterator i = actions.lower_bound(ActionKey(key.keyword, string()));
+ ActionMap::const_iterator 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 ActionKey &key) const
+LoaderAction *Loader::find_action(const StatementKey &key) const
{
- ActionMap::const_iterator begin = actions.lower_bound(ActionKey(key.keyword, string()));
- ActionMap::const_iterator end = actions.upper_bound(ActionKey(key.keyword, "~"));
+ ActionMap::const_iterator begin = actions.lower_bound(StatementKey(key.keyword, string()));
+ ActionMap::const_iterator end = actions.upper_bound(StatementKey(key.keyword, "~"));
if(begin==end)
throw unknown_keyword(key.keyword);
return cur_st->source;
}
-
-Loader::ActionKey::ActionKey(const string &k, const string &s):
- keyword(k),
- signature(s)
-{ }
-
-bool Loader::ActionKey::operator<(const ActionKey &other) const
-{
- if(keyword!=other.keyword)
- return keyword<other.keyword;
- return signature<other.signature;
-}
-
} // namespace DataFile
} // namespace Msp