#include <msp/core/raii.h>
#include <msp/strings/format.h>
-#include "dataerror.h"
+#include "except.h"
#include "loader.h"
#include "type.h"
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;
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),
+ 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)
{
SetForScope<const Statement *> set_cst(cur_st, &st);
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)
return cur_st->source;
}
+const string &Loader::get_keyword() const
+{
+ if(!cur_st)
+ throw logic_error("no current statement");
+ return cur_st->keyword;
+}
+
} // namespace DataFile
} // namespace Msp