X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fparser.h;h=3a42273eb783e98b74e13fb16e9f213917650c43;hb=4371289ed39d8135d407bc7bbbfbedea0cfd6dde;hp=107bb3f9c53b83256e441f6ac6f4de5446e8658c;hpb=5453824394771ca21de32088a2842486b63e6f6d;p=libs%2Fdatafile.git

diff --git a/source/parser.h b/source/parser.h
index 107bb3f..3a42273 100644
--- a/source/parser.h
+++ b/source/parser.h
@@ -1,42 +1,53 @@
-/*
-This file is part of libmspparser
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
+/* $Id$
+
+This file is part of libmspdatafile
+Copyright © 2006-2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_PARSER_H_
-#define MSP_PARSER_PARSER_H_
 
-#include <istream>
+#ifndef MSP_DATAFILE_PARSER_H_
+#define MSP_DATAFILE_PARSER_H_
+
 #include <string>
 #include "input.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
+class ParserMode;
 class Statement;
 struct Token;
 
+/**
+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
 {
-public:
-	Parser(std::istream &, const std::string &);
-	Statement parse();
-	operator bool() const { return (bool)in; }
 private:
 	Input       in;
+	std::string main_src;
 	std::string src;
 	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();
 
-	Statement parse_(const Token *);
-	Token parse_token();
-	bool  is_delimiter(int);
-	bool  isodigit(int);
-	std::string unescape_string(const std::string &);
-	std::string get_location();
-	void  parse_error(int, int);
+	operator bool() const { return good && in; }
 };
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif