Move newline eating out of BinaryParser

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

diff --git a/source/binaryparser.h b/source/binaryparser.h
index b4fec6b4c9e681f6f635a7e348868d65097eddeb..255209a971bed7fdd5e7149e7a9dd20a8fb30cd4 100644 (file)
--- a/source/binaryparser.h
+++ b/source/binaryparser.h
@@ -2,7 +2,6 @@
 #define MSP_DATAFILE_BINARYPARSER_H_
 
 #include <map>
-#include "binarydict.h"
 #include "parsermode.h"
 #include "type.h"
 
@@ -15,20 +14,19 @@ Parses data in binary format.
 class BinaryParser: public ParserMode
 {
 private:
-       typedef std::map<int, DictEntry> Dictionary;
+       typedef std::map<int, StatementKey> Dictionary;
        typedef std::map<unsigned, std::string> StringMap;
 
        Dictionary dict;
        StringMap strings;
-       bool first;
        unsigned float_precision;
 
 public:
        BinaryParser(Input &i, const std::string &s);
 
        virtual Statement parse();
+       virtual void process_control_statement(const Statement &);
 private:
-       Statement parse_statement();
        IntType::Store parse_int();
        FloatType::Store parse_float();
        StringType::Store parse_string();