X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=d987a9e92fd646ce8812f9b827028d508d0601f5;hb=0bf1684c1ae0f5ecc23b7c64f0a0fec79a8c2082;hp=c2de4011232c93da747bfdead7df18af72c6087d;hpb=0d8df25704366f3576c417436c90fbac2e479632;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index c2de401..d987a9e 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -71,6 +71,7 @@ public:
 
 Loader::Loader():
 	cur_st(0),
+	direct(false),
 	check_sub_loads(false)
 { }
 
@@ -84,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();
 }
@@ -98,6 +105,29 @@ 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)
 {
 	SetForScope<const Statement *> set_cst(cur_st, &st);
@@ -134,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)