Replace local RAII set utility with one from mspcore

[libs/datafile.git] / source / loader.cpp

diff --git a/source/loader.cpp b/source/loader.cpp
index 2cd27e92ac4426f9c0ff04f2c07db411938b103e..c2de4011232c93da747bfdead7df18af72c6087d 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "dataerror.h"
 #include "loader.h"
@@ -7,16 +8,6 @@ using namespace std;
 
 namespace {
 
-template<typename T>
-struct Set
-{
-       T &ref;
-       T orig;
-
-       Set(T &r, const T &v): ref(r), orig(r) { r = v; }
-       ~Set() { ref = orig; }
-};
-
 bool signature_match(char s, char a)
 {
        if(s==a)
@@ -109,18 +100,20 @@ void Loader::load(const Statement &st)
 
 void Loader::load_statement(const Statement &st)
 {
-       Set<const Statement *> set_cst(cur_st, &st);
+       SetForScope<const Statement *> set_cst(cur_st, &st);
 
        try
        {
-               if(!aux_loaders.empty() && !has_keyword(st.keyword))
+               StatementKey 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_keyword(st.keyword))
+                               if((*i)->has_action(key))
                                        return (*i)->load_statement(st);
                }
 
-               LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+               LoaderAction *act = find_action(key);
                if(act)
                {
                        sub_loaded = false;
@@ -150,7 +143,7 @@ void Loader::load_sub_with(Loader &ldr)
 
 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())
        {
@@ -166,16 +159,19 @@ void Loader::add_auxiliary_loader(Loader &ldr)
        aux_loaders.push_back(&ldr);
 }
 
-bool Loader::has_keyword(const string &kwd) const
+bool Loader::has_action(const StatementKey &key) const
 {
-       ActionMap::const_iterator i = actions.lower_bound(ActionKey(kwd, string()));
-       return i!=actions.end() && i->first.keyword==kwd;
+       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);
@@ -194,18 +190,5 @@ const string &Loader::get_source() const
        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