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

diff --git a/source/parser.cpp b/source/parser.cpp
index 6166e56..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"
@@ -61,6 +61,9 @@ void Parser::process_control_statement(const Statement &st)
 	{
 		delete mode;
 		mode = new BinaryParser(in, src);
+
+		while(in.peek()=='\n')
+			in.get();
 	}
 	else if(st.keyword=="__text")
 	{
@@ -83,5 +86,26 @@ void Parser::process_control_statement(const Statement &st)
 		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