X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fparser.cpp;h=3957cf343642b54f2f5b6123be3e907bc200436e;hb=0d8df25704366f3576c417436c90fbac2e479632;hp=957018f7a35c1e302e659da5f4ac5650f14aeca6;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/parser.cpp b/source/parser.cpp
index 957018f..3957cf3 100644
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -1,5 +1,6 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binaryparser.h"
+#include "dataerror.h"
 #include "parser.h"
 #include "statement.h"
 #include "textparser.h"
@@ -22,16 +23,16 @@ 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();
+			Statement st = mode->parse(raw);
 			if(st.keyword=="__bin")
 			{
 				delete mode;
@@ -42,6 +43,8 @@ Statement Parser::parse()
 				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>();
@@ -50,14 +53,25 @@ Statement Parser::parse()
 				else
 					src = format("%s[%s]", main_src, s);
 			}
+			else if(st.keyword=="__end")
+			{
+				good = false;
+				return raw ? st : Statement();
+			}
 			else
 				return st;
+
+			if(raw)
+				return st;
 		}
 	}
-	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);
 	}
 }