Restructure control statement processing

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

diff --git a/source/parser.h b/source/parser.h
index c830c3c8367f5c082788ad864f23eed84266439a..0989bd9d2d1fe378920c469c845f71435d799b28 100644 (file)
--- a/source/parser.h
+++ b/source/parser.h
@@ -1,14 +1,6 @@
-/* $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"
 
@@ -17,7 +9,6 @@ namespace DataFile {
 
 class ParserMode;
 class Statement;
-struct Token;
 
 /**
 Frontend for loading datafiles.  Handles switching between text and binary
@@ -27,13 +18,14 @@ 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(std::istream &i, const std::string &s);
+       Parser(IO::Base &i, const std::string &s);
        ~Parser();
 
        /**
@@ -42,8 +34,12 @@ public:
        marked as bad and no more statements may be read, even if the exception was
        caught.
        */
-       Statement parse();
+       Statement parse(bool raw = false);
 
+private:
+       void process_control_statement(const Statement &);
+
+public:
        operator bool() const { return good && in; }
 };