Remove the loaded flag from PackSource files

[libs/datafile.git] / source / parser.h

diff --git a/source/parser.h b/source/parser.h
index 5bec123ae74f7aeee3485dbbeeb226d0bad928b7..1437190b606b89640afabd4619a62c4fe21f65c8 100644 (file)
--- a/source/parser.h
+++ b/source/parser.h
@@ -1,37 +1,56 @@
-/* $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_
 
-#include <istream>
 #include <string>
 #include "input.h"
 
 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
+formats.  A Parser evaluates into a boolean value indicating whether more
+statements may be read.
+*/
 class Parser
 {
+private:
+       Input in;
+       std::string main_src;
+       std::string src;
+       bool good;
+       ParserMode *mode;
+
 public:
-       Parser(std::istream &, const std::string &);
+       Parser(IO::Base &i, const std::string &s);
        ~Parser();
 
-       Statement parse();
-       operator bool() const { return in; }
+       /** 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:
-       Input       in;
-       std::string src;
-       bool        good;
-       ParserMode  *mode;
+       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; }
 };
 
 } // namespace DataFile