X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.h;h=b10d7b8791916a8e5ce37257c88da1b33603f6bd;hb=e0af585ed57bdb5b1ea4f4a415fda13b5d99d2dc;hp=2cdfbbeaba296e919ff68abb92015eb2647fbf38;hpb=35d0da96bad97214376f18d15078e6d731e6f219;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.h b/source/binaryparser.h
index 2cdfbbe..b10d7b8 100644
--- 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