X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.h;h=f9b8e542865fac10550c8a5c5105d40819efcd69;hb=b83eea8073a4f9228e386eafd6df2e3dcf9f9ccc;hp=26fa380e4e290b67c4172449a009cc47991b5efc;hpb=d84673be1c2fe8bd32ddaa7877529855cad6daa0;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.h b/source/binaryparser.h
index 26fa380..f9b8e54 100644
--- a/source/binaryparser.h
+++ b/source/binaryparser.h
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_BINARYPARSER_H_
 #define MSP_DATAFILE_BINARYPARSER_H_
 
 #include <map>
 #include "binarydict.h"
 #include "parsermode.h"
+#include "type.h"
 
 namespace Msp {
 namespace DataFile {
@@ -30,15 +24,15 @@ private:
 
 public:
 	BinaryParser(Input &i, const std::string &s);
-	Statement parse();
+
+	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();
-	const std::string &lookup_string(unsigned) const;
+	IntType::Store parse_int();
+	FloatType::Store parse_float();
+	StringType::Store parse_string();
+	BoolType::Store parse_bool();
+	SymbolType::Store parse_symbol();
 };
 
 } // namespace DataFile