]> git.tdb.fi Git - libs/datafile.git/blobdiff - source/loader.cpp
Cosmetic changes
[libs/datafile.git] / source / loader.cpp
index 2c0fbd12275ffdf4e54715a4ca05fc9524ce430d..7e910b8a73c5d79adc63b161a2e01248edf50211 100644 (file)
@@ -1,5 +1,6 @@
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
-#include "dataerror.h"
+#include "except.h"
 #include "loader.h"
 #include "type.h"
 
@@ -7,47 +8,37 @@ 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)
+int signature_match(char s, char a)
 {
        if(s==a)
-               return true;
+               return 3;
        if(s==Msp::DataFile::IntType::signature && a==Msp::DataFile::FloatType::signature)
-               return true;
-       return false;
+               return 1;
+       return 0;
 }
 
-bool signature_match(const string &st_sig, const string &act_sig)
+int signature_match(const string &st_sig, const string &act_sig)
 {
        if(act_sig=="*")
-               return true;
+               return 1;
        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])
-                               return false;
+               int match = 3;
+               for(auto i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
+                       match = min(match, signature_match(*i, act_sig[0]));
 
-               return true;
+               return match;
        }
        else if(st_sig.size()==act_sig.size())
        {
-               for(unsigned i=0; i<st_sig.size(); ++i)
-                       if(!signature_match(st_sig[i], act_sig[i]))
-                               return false;
+               int match = 3;
+               for(unsigned i=0; (i<st_sig.size() && match); ++i)
+                       match = min(match, signature_match(st_sig[i], act_sig[i]));
 
-               return true;
+               return match ? match+1 : 0;
        }
        else
-               return false;
+               return 0;
 }
 
 }
@@ -56,60 +47,66 @@ bool signature_match(const string &st_sig, const string &act_sig)
 namespace Msp {
 namespace DataFile {
 
-class unknown_keyword: public runtime_error
-{
-public:
-       unknown_keyword(const std::string &k):
-               runtime_error(k)
-       { }
-
-       virtual ~unknown_keyword() throw() { }
-};
-
-
-class invalid_signature: public runtime_error
-{
-public:
-       invalid_signature(const std::string &k, const std::string &s):
-               runtime_error(format("%s %s", k, s))
-       { }
-
-       virtual ~invalid_signature() throw() { }
-};
-
-
-Loader::Loader():
-       cur_st(0),
-       check_sub_loads(false)
-{ }
-
-Loader::~Loader()
-{
-       for(ActionMap::iterator i=actions.begin(); i!=actions.end(); ++i)
-               delete i->second;
-}
-
 void Loader::load(Parser &p)
 {
+       if(!actions)
+               throw logic_error("no actions");
+
        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();
+       for(Loader *l: aux_loaders)
+               l->finish();
 }
 
 void Loader::load(const Statement &st)
 {
-       for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
-               load_statement(*i);
+       if(!actions)
+               throw logic_error("no actions");
+
+       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)
+{
+       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)
 {
-       Set<const Statement *> set_cst(cur_st, &st);
+       SetForScope<const Statement *> set_cst(cur_st, &st);
 
        try
        {
@@ -117,9 +114,9 @@ void Loader::load_statement(const Statement &st)
 
                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);
+                       for(Loader *l: aux_loaders)
+                               if(l->has_action(key))
+                                       return l->load_statement(st);
                }
 
                LoaderAction *act = find_action(key);
@@ -131,9 +128,12 @@ void Loader::load_statement(const Statement &st)
                                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)
        {
@@ -143,24 +143,46 @@ void Loader::load_statement(const Statement &st)
 
 void Loader::load_sub_with(Loader &ldr)
 {
-       if(!cur_st)
+       if(direct)
+       {
+               ldr.load_direct(*cur_parser, cur_level+1);
+               ldr.finish();
+               for(Loader *l: ldr.aux_loaders)
+                       l->finish();
+       }
+       else if(cur_st)
+       {
+               ldr.load(*cur_st);
+               sub_loaded = true;
+       }
+       else
                throw logic_error("no current statement");
+}
+
+void Loader::set_actions(ActionMap &a)
+{
+       if(actions)
+               throw logic_error("actions already set");
 
-       ldr.load(*cur_st);
-       sub_loaded = true;
+       actions = &a;
+       if(a.empty())
+               init_actions();
 }
 
 void Loader::add(const string &kwd, LoaderAction *act)
 {
+       if(!actions)
+               actions = &local_actions;
+
        StatementKey key(kwd, (act ? act->get_signature() : "*"));
-       ActionMap::iterator i = actions.find(key);
-       if(i!=actions.end())
+       ActionMap::iterator i = actions->find(key);
+       if(i!=actions->end())
        {
                delete i->second;
                i->second = act;
        }
        else
-               actions[key] = act;
+               (*actions)[key] = act;
 }
 
 void Loader::add_auxiliary_loader(Loader &ldr)
@@ -170,8 +192,11 @@ void Loader::add_auxiliary_loader(Loader &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(!actions)
+               return false;
+
+       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;
        return false;
@@ -179,17 +204,31 @@ bool Loader::has_action(const StatementKey &key) const
 
 LoaderAction *Loader::find_action(const StatementKey &key) const
 {
-       ActionMap::const_iterator begin = actions.lower_bound(StatementKey(key.keyword, string()));
-       ActionMap::const_iterator end = actions.upper_bound(StatementKey(key.keyword, "~"));
+       if(!actions)
+               return nullptr;
+
+       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);
 
-       for(ActionMap::const_iterator i=begin; i!=end; ++i)
-               if(signature_match(key.signature, i->first.signature))
-                       return i->second;
+       LoaderAction *act = nullptr;
+       int match = 0;
+       for(auto i=begin; i!=end; ++i)
+       {
+               int m = signature_match(key.signature, i->first.signature);
+               if(m>match)
+               {
+                       act = i->second;
+                       match = m;
+               }
+       }
+
+       if(!match)
+               throw invalid_signature(key.keyword, key.signature);
 
-       throw invalid_signature(key.keyword, key.signature);
+       return act;
 }
 
 const string &Loader::get_source() const
@@ -199,5 +238,19 @@ const string &Loader::get_source() const
        return cur_st->source;
 }
 
+const string &Loader::get_keyword() const
+{
+       if(!cur_st)
+               throw logic_error("no current statement");
+       return cur_st->keyword;
+}
+
+
+Loader::ActionMap::~ActionMap()
+{
+       for(const auto &kvp: *this)
+               delete kvp.second;
+}
+
 } // namespace DataFile
 } // namespace Msp