X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fparser.cpp;h=3957cf343642b54f2f5b6123be3e907bc200436e;hb=6653c7d83dbe1fe81a541a125be8bb808b234eb7;hp=82ac0069b95d4f22e3d0de1ab0c0b66b04c76423;hpb=27630d44298cb67e075c166f4421288cc8ca117e;p=libs%2Fdatafile.git

diff --git a/source/parser.cpp b/source/parser.cpp
index 82ac006..3957cf3 100644
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#include <cctype>
-#include <sstream>
+#include <msp/strings/format.h>
 #include "binaryparser.h"
+#include "dataerror.h"
 #include "parser.h"
 #include "statement.h"
 #include "textparser.h"
@@ -16,8 +10,9 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
-Parser::Parser(istream &i, const string &s):
+Parser::Parser(IO::Base &i, const string &s):
 	in(i),
+	main_src(s),
 	src(s),
 	good(true),
 	mode(new TextParser(in, src))
@@ -28,34 +23,55 @@ 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;
-				mode=new BinaryParser(in, src);
+				mode = new BinaryParser(in, src);
 			}
 			else if(st.keyword=="__text")
 			{
 				delete mode;
-				mode=new TextParser(in, src);
+				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)
+				return st;
 		}
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
-		good=false;
-		throw;
+		good = false;
+		if(dynamic_cast<const data_error *>(&e))
+			throw;
+		else
+			throw data_error(src, in.get_line_number(), e);
 	}
 }