+#include <msp/core/raii.h>
#include <msp/strings/format.h>
#include "dataerror.h"
#include "loader.h"
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)
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;
Loader::Loader():
cur_st(0),
+ direct(false),
check_sub_loads(false)
{ }
{
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();
}
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
{
- ActionKey key(st.keyword, st.get_signature());
+ StatementKey key(st.keyword, st.get_signature());
if(!aux_loaders.empty() && !has_action(key))
{
void Loader::load_sub_with(Loader &ldr)
{
- if(!cur_st)
+ 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");
-
- ldr.load(*cur_st);
- sub_loaded = true;
}
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