X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fparser.h;h=1437190b606b89640afabd4619a62c4fe21f65c8;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=814fd2771b1240ccb14a86c4c8d5576f26c99d4b;hpb=6dd94a7fe90c6467024685fbac769067ddb74688;p=libs%2Fdatafile.git

diff --git a/source/parser.h b/source/parser.h
index 814fd27..1437190 100644
--- a/source/parser.h
+++ b/source/parser.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_PARSER_H_
 #define MSP_DATAFILE_PARSER_H_
 
@@ -14,9 +7,11 @@ Distributed under the LGPL
 namespace Msp {
 namespace DataFile {
 
+class Loader;
+class LoaderAction;
 class ParserMode;
 class Statement;
-struct Token;
+struct StatementKey;
 
 /**
 Frontend for loading datafiles.  Handles switching between text and binary
@@ -26,22 +21,34 @@ statements may be read.
 class Parser
 {
 private:
-	Input       in;
+	Input in;
+	std::string main_src;
 	std::string src;
-	bool        good;
-	ParserMode  *mode;
+	bool good;
+	ParserMode *mode;
 
 public:
 	Parser(IO::Base &i, const std::string &s);
 	~Parser();
 
-	/**
-	Reads a statement from the input.  If the end of input was reached, an empty
-	invalid statement will be returned.  If an error occurs, the parser will be
-	marked as bad and no more statements may be read, even if the exception was
-	caught.
-	*/
-	Statement parse();
+	/** Reads a statement from the input.  If the end of input was reached, an
+	empty invalid statement will be returned.  If an error occurs, the parser
+	will be marked as bad and no more statements may be read, even if the
+	exception was caught. */
+	Statement parse(bool raw = false);
+
+private:
+	void process_control_statement(const Statement &);
+
+public:
+	/** Returns a key for the next statement, consisting of its keyword and
+	signature.  Not supported in all modes. */
+	const StatementKey *peek(unsigned);
+
+	/** Parses a statement and feeds its arguments to an action.  The action
+	must be appropriate for the statement.  Use peek() to determine the
+	statement's signature. */
+	bool parse_and_load(unsigned, Loader &, const LoaderAction &);
 
 	operator bool() const { return good && in; }
 };