Use the metadata for type.h in binary write/parse functions

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

diff --git a/source/binaryparser.h b/source/binaryparser.h
index 26fa380e4e290b67c4172449a009cc47991b5efc..f9b8e542865fac10550c8a5c5105d40819efcd69 100644 (file)
--- 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