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

diff --git a/source/parser.h b/source/parser.h
index 6ad28b5..1437190 100644
--- a/source/parser.h
+++ b/source/parser.h
@@ -7,8 +7,11 @@
 namespace Msp {
 namespace DataFile {
 
+class Loader;
+class LoaderAction;
 class ParserMode;
 class Statement;
+struct StatementKey;
 
 /**
 Frontend for loading datafiles.  Handles switching between text and binary
@@ -28,14 +31,25 @@ 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.
-	*/
+	/** 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; }
 };