Consider full statement signature when dealing with auxiliary loaders

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

diff --git a/source/loader.cpp b/source/loader.cpp
index 2bf90ee1e5ec9436e9306a09a7917c8e25e32cdc..bffa9fd31c6ccf5018535139aa119f859d3c36b0 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -70,7 +70,7 @@ public:
 class invalid_signature: public runtime_error
 {
 public:
-       invalid_signature(const std::string &k, const std::string & s):
+       invalid_signature(const std::string &k, const std::string &s):
                runtime_error(format("%s %s", k, s))
        { }
 
@@ -85,7 +85,7 @@ Loader::Loader():
 
 Loader::~Loader()
 {
-       for(ActionMap::iterator i = actions.begin(); i!=actions.end(); ++i)
+       for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
                delete i->second;
 }
 
@@ -102,7 +102,7 @@ void Loader::load(Parser &p)
 
 void Loader::load(const Statement &st)
 {
-       for(list<Statement>::const_iterator i = st.sub.begin(); i!=st.sub.end(); ++i)
+       for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
                load_statement(*i);
        finish();
 }
@@ -113,7 +113,16 @@ void Loader::load_statement(const Statement &st)
 
        try
        {
-               LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+               ActionKey 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_action(key))
+                                       return (*i)->load_statement(st);
+               }
+
+               LoaderAction *act = find_action(key);
                if(act)
                {
                        sub_loaded = false;
@@ -154,6 +163,20 @@ void Loader::add(const string &kwd, LoaderAction *act)
                actions[key] = act;
 }
 
+void Loader::add_auxiliary_loader(Loader &ldr)
+{
+       aux_loaders.push_back(&ldr);
+}
+
+bool Loader::has_action(const ActionKey &key) const
+{
+       ActionMap::const_iterator i = actions.lower_bound(ActionKey(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
 {
        ActionMap::const_iterator begin = actions.lower_bound(ActionKey(key.keyword, string()));