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

diff --git a/source/parser.cpp b/source/parser.cpp
index 99ece49..6166e56 100644
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -1,5 +1,6 @@
 #include <msp/strings/format.h>
 #include "binaryparser.h"
+#include "dataerror.h"
 #include "parser.h"
 #include "statement.h"
 #include "textparser.h"
@@ -22,44 +23,65 @@ Parser::~Parser()
 	delete mode;
 }
 
-Statement Parser::parse()
+Statement Parser::parse(bool raw)
 {
 	if(!good)
-		throw Exception("Parser is not good");
+		throw logic_error("Parser::parse() !good");
 
 	try
 	{
 		while(1)
 		{
 			Statement st = mode->parse();
-			if(st.keyword=="__bin")
+			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=="__src")
-			{
-				string s = st.args[0].get<string>();
-				if(s.empty())
-					src = main_src;
-				else
-					src = format("%s[%s]", main_src, s);
-			}
-			else
+
+			if(raw || !st.control)
 				return st;
+			else if(!good)  // This will occur with an __end statement
+				return Statement();
 		}
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
 		good = false;
-		throw;
+		if(dynamic_cast<const data_error *>(&e))
+			throw;
+		else
+			throw data_error(src, in.get_line_number(), e);
 	}
 }
 
+void Parser::process_control_statement(const Statement &st)
+{
+	if(st.keyword=="__bin")
+	{
+		delete mode;
+		mode = new BinaryParser(in, src);
+	}
+	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);
+}
+
 } // namespace DataFile
 } // namespace Msp