Use negative integers for built-in statements for better extensibility

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

diff --git a/source/binaryparser.h b/source/binaryparser.h
index 2cdfbbeaba296e919ff68abb92015eb2647fbf38..b10d7b8791916a8e5ce37257c88da1b33603f6bd 100644 (file)
--- a/source/binaryparser.h
+++ b/source/binaryparser.h
@@ -4,6 +4,7 @@
 #include <map>
 #include "binarydict.h"
 #include "parsermode.h"
+#include "type.h"
 
 namespace Msp {
 namespace DataFile {
@@ -14,7 +15,7 @@ Parses data in binary format.
 class BinaryParser: public ParserMode
 {
 private:
-       typedef std::map<unsigned, DictEntry> Dictionary;
+       typedef std::map<int, DictEntry> Dictionary;
        typedef std::map<unsigned, std::string> StringMap;
 
        Dictionary dict;
@@ -27,11 +28,11 @@ public:
        virtual Statement parse();
 private:
        Statement parse_statement();
-       long long parse_int();
-       float parse_float();
-       std::string parse_string();
-       bool parse_bool();
-       std::string parse_enum();
+       IntType::Store parse_int();
+       FloatType::Store parse_float();
+       StringType::Store parse_string();
+       BoolType::Store parse_bool();
+       SymbolType::Store parse_symbol();
 };
 
 } // namespace DataFile