X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=81370687ffd7e32f35a413359ac47d90d01c6c5a;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=2c0fbd12275ffdf4e54715a4ca05fc9524ce430d;hpb=2d289d20a9a4aeac7774976e4213a7c72f1dc75b;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index 2c0fbd1..8137068 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "dataerror.h"
 #include "loader.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;
@@ -80,6 +71,7 @@ public:
 
 Loader::Loader():
 	cur_st(0),
+	direct(false),
 	check_sub_loads(false)
 { }
 
@@ -93,9 +85,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,9 +105,32 @@ 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
 	{
@@ -143,11 +164,18 @@ 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)