X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fparser.h;h=1437190b606b89640afabd4619a62c4fe21f65c8;hb=HEAD;hp=40907dcdb86b4b6b5a21b7635463f5d242b310f2;hpb=5c98c1f499413c41fd46ddf71a46b481338d7d6b;p=libs%2Fdatafile.git

diff --git a/source/parser.h b/source/parser.h
index 40907dc..ed7a037 100644
--- a/source/parser.h
+++ b/source/parser.h
@@ -2,42 +2,56 @@
 #define MSP_DATAFILE_PARSER_H_
 
 #include <string>
+#include <msp/core/noncopyable.h>
 #include "input.h"
 
 namespace Msp {
 namespace DataFile {
 
+class Loader;
+class LoaderAction;
 class ParserMode;
-class Statement;
-struct Token;
+struct Statement;
+struct StatementKey;
 
 /**
 Frontend for loading datafiles.  Handles switching between text and binary
 formats.  A Parser evaluates into a boolean value indicating whether more
 statements may be read.
 */
-class Parser
+class Parser: private NonCopyable
 {
 private:
 	Input in;
 	std::string main_src;
 	std::string src;
-	bool good;
-	ParserMode *mode;
+	bool good = true;
+	ParserMode *mode = nullptr;
 
 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);
 
-	operator bool() const { return good && in; }
+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 &);
+
+	explicit operator bool() const { return good && in; }
 };
 
 } // namespace DataFile