+#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)
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
+ {
+ // 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
{
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)