Move all exception classes to except.h, for real this time

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

diff --git a/source/loader.cpp b/source/loader.cpp
index 51cdabec478d812a23a8133f3716b77c58568163..81fd27eecebf87c16e3418ae6d11e3ead9ba8d80 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,4 +1,6 @@
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
+#include "except.h"
 #include "loader.h"
 #include "type.h"
 
@@ -22,7 +24,7 @@ bool signature_match(const string &st_sig, const string &act_sig)
        else if(act_sig.size()==2 && act_sig[1]=='*')
        {
                for(string::const_iterator i=st_sig.begin(); i!=st_sig.end(); ++i)
-                       if(*i!=act_sig[0])
+                       if(!signature_match(*i, act_sig[0]))
                                return false;
 
                return true;
@@ -41,17 +43,19 @@ bool signature_match(const string &st_sig, const string &act_sig)
 
 }
 
+
 namespace Msp {
 namespace DataFile {
 
 Loader::Loader():
        cur_st(0),
+       direct(false),
        check_sub_loads(false)
 { }
 
 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;
 }
 
@@ -59,59 +63,102 @@ void Loader::load(Parser &p)
 {
        while(p)
        {
-               Statement st = p.parse();
-               if(st.valid)
-                       load_statement(st);
+               if(p.peek(0))
+                       load_direct(p, 0);
+               else if(p)  // Peek may have processed an __end, so recheck goodness
+               {
+                       // Parse in raw mode so we can peek immediately after a mode change
+                       Statement st = p.parse(true);
+                       if(st.valid && !st.control)
+                               load_statement(st);
+               }
        }
        finish();
 }
 
 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();
 }
 
+void Loader::load_direct(Parser &p, unsigned l)
+{
+       SetForScope<Parser *> set_parser(cur_parser, &p);
+       SetForScope<unsigned> set_level(cur_level, l);
+
+       while(p)
+       {
+               const StatementKey *key = p.peek(l);
+               if(!key)
+                       break;
+
+               LoaderAction *act = find_action(*key);
+               if(act)
+               {
+                       SetFlag set_direct(direct);
+                       if(!p.parse_and_load(l, *this, *act))
+                               throw logic_error("direct load failed");
+               }
+               else
+                       load_statement(p.parse());
+       }
+}
+
 void Loader::load_statement(const Statement &st)
 {
-       cur_st = &st;
+       SetForScope<const Statement *> set_cst(cur_st, &st);
 
        try
        {
-               LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+               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_action(key))
+                                       return (*i)->load_statement(st);
+               }
+
+               LoaderAction *act = find_action(key);
                if(act)
                {
                        sub_loaded = false;
                        act->execute(*this, st);
                        if(check_sub_loads && !st.sub.empty() && !sub_loaded)
-                               throw Exception("Substatements were not loaded");
+                               throw logic_error("substatements ignored");
                }
        }
-       catch(Exception &e)
+       catch(const data_error &)
        {
-               cur_st = 0;
-               if(!e.where()[0])
-                       e.at(st.get_location());
-
                throw;
        }
-
-       cur_st = 0;
+       catch(const exception &e)
+       {
+               throw data_error(st.source, st.line, e);
+       }
 }
 
 void Loader::load_sub_with(Loader &ldr)
 {
-       if(!cur_st)
-               throw InvalidState("load_sub called without current statement");
-
-       ldr.load(*cur_st);
-       sub_loaded = true;
+       if(direct)
+       {
+               ldr.load_direct(*cur_parser, cur_level+1);
+               ldr.finish();
+       }
+       else if(cur_st)
+       {
+               ldr.load(*cur_st);
+               sub_loaded = true;
+       }
+       else
+               throw logic_error("no current statement");
 }
 
 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())
        {
@@ -122,32 +169,40 @@ void Loader::add(const string &kwd, LoaderAction *act)
                actions[key] = act;
 }
 
-LoaderAction *Loader::find_action(const ActionKey &key) const
+void Loader::add_auxiliary_loader(Loader &ldr)
+{
+       aux_loaders.push_back(&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(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(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 KeyError("Unknown keyword", key.keyword);
+               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;
 
-       throw KeyError(format("Keyword '%s' does not accept signature '%s'", key.keyword, key.signature));
+       throw invalid_signature(key.keyword, key.signature);
 }
 
-
-Loader::ActionKey::ActionKey(const string &k, const string &s):
-       keyword(k),
-       signature(s)
-{ }
-
-bool Loader::ActionKey::operator<(const ActionKey &other) const
+const string &Loader::get_source() const
 {
-       if(keyword!=other.keyword)
-               return keyword<other.keyword;
-       return signature<other.signature;
+       if(!cur_st)
+               throw logic_error("no current statement");
+       return cur_st->source;
 }
 
 } // namespace DataFile