X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.cpp;h=81fd27eecebf87c16e3418ae6d11e3ead9ba8d80;hp=2cd27e92ac4426f9c0ff04f2c07db411938b103e;hb=5da82753b395e335edaa09555566c6ffb8769118;hpb=9763e39e6e09e747b87940920e778ac269dd8b15

diff --git a/source/loader.cpp b/source/loader.cpp
index 2cd27e9..81fd27e 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -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,16 +8,6 @@ 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)
 {
 	if(s==a)
@@ -33,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;
@@ -56,30 +47,9 @@ 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),
+	direct(false),
 	check_sub_loads(false)
 { }
 
@@ -93,9 +63,15 @@ 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();
 }
@@ -107,20 +83,45 @@ void Loader::load(const Statement &st)
 	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
 	{
-		if(!aux_loaders.empty() && !has_keyword(st.keyword))
+		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_keyword(st.keyword))
+				if((*i)->has_action(key))
 					return (*i)->load_statement(st);
 		}
 
-		LoaderAction *act = find_action(ActionKey(st.keyword, st.get_signature()));
+		LoaderAction *act = find_action(key);
 		if(act)
 		{
 			sub_loaded = false;
@@ -141,16 +142,23 @@ 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();
+	}
+	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())
 	{
@@ -166,16 +174,19 @@ void Loader::add_auxiliary_loader(Loader &ldr)
 	aux_loaders.push_back(&ldr);
 }
 
-bool Loader::has_keyword(const string &kwd) const
+bool Loader::has_action(const StatementKey &key) const
 {
-	ActionMap::const_iterator i = actions.lower_bound(ActionKey(kwd, string()));
-	return i!=actions.end() && i->first.keyword==kwd;
+	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);
@@ -194,18 +205,5 @@ const string &Loader::get_source() const
 	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