X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fparser.cpp;h=5972e2d98f832d312afa4373bfe66d4204d10f8f;hp=3957cf343642b54f2f5b6123be3e907bc200436e;hb=ed78b585cfc4ecb44972e346857e887b183fd7a7;hpb=6653c7d83dbe1fe81a541a125be8bb808b234eb7

diff --git a/source/parser.cpp b/source/parser.cpp
index 3957cf3..5972e2d 100644
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -1,6 +1,6 @@
 #include <msp/strings/format.h>
 #include "binaryparser.h"
-#include "dataerror.h"
+#include "except.h"
 #include "parser.h"
 #include "statement.h"
 #include "textparser.h"
@@ -32,37 +32,17 @@ Statement Parser::parse(bool raw)
 	{
 		while(1)
 		{
-			Statement st = mode->parse(raw);
-			if(st.keyword=="__bin")
+			Statement st = mode->parse();
+			if(!st.keyword.compare(0, 2, "__"))
 			{
-				delete mode;
-				mode = new BinaryParser(in, src);
+				st.control = true;
+				process_control_statement(st);
 			}
-			else if(st.keyword=="__text")
-			{
-				delete mode;
-				mode = new TextParser(in, src);
-			}
-			else if(st.keyword=="__z")
-				in.set_decompress();
-			else if(st.keyword=="__src")
-			{
-				string s = st.args[0].get<string>();
-				if(s.empty())
-					src = main_src;
-				else
-					src = format("%s[%s]", main_src, s);
-			}
-			else if(st.keyword=="__end")
-			{
-				good = false;
-				return raw ? st : Statement();
-			}
-			else
-				return st;
 
-			if(raw)
+			if(raw || !st.control)
 				return st;
+			else if(!good)  // This will occur with an __end statement
+				return Statement();
 		}
 	}
 	catch(const exception &e)
@@ -75,5 +55,57 @@ Statement Parser::parse(bool raw)
 	}
 }
 
+void Parser::process_control_statement(const Statement &st)
+{
+	if(st.keyword=="__bin")
+	{
+		delete mode;
+		mode = new BinaryParser(in, src);
+
+		while(in.peek()=='\n')
+			in.get();
+	}
+	else if(st.keyword=="__text")
+	{
+		delete mode;
+		mode = new TextParser(in, src);
+	}
+	else if(st.keyword=="__z")
+		in.set_decompress();
+	else if(st.keyword=="__src")
+	{
+		string s = st.args[0].get<string>();
+		if(s.empty())
+			src = main_src;
+		else
+			src = format("%s[%s]", main_src, s);
+	}
+	else if(st.keyword=="__end")
+		good = false;
+	else
+		mode->process_control_statement(st);
+}
+
+const StatementKey *Parser::peek(unsigned level)
+{
+	while(good)
+	{
+		const StatementKey *key = mode->peek(level);
+		if(key && !key->keyword.compare(0, 2, "__"))
+			process_control_statement(mode->parse());
+		else
+			return key;
+	}
+
+	return 0;
+}
+
+bool Parser::parse_and_load(unsigned level, Loader &ldr, const LoaderAction &act)
+{
+	// Peek first to get any control statements processed
+	peek(level);
+	return mode->parse_and_load(level, ldr, act);
+}
+
 } // namespace DataFile
 } // namespace Msp