X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarywriter.h;h=b10c5abdce2adc887f0c70bb5080eacc92efc518;hb=HEAD;hp=f028f39d96f811775a30a9d9a0fa2b730a3fe9e2;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/binarywriter.h b/source/binarywriter.h
index f028f39..dafc7eb 100644
--- a/source/binarywriter.h
+++ b/source/binarywriter.h
@@ -2,7 +2,8 @@
 #define MSP_DATAFILE_BINARYWRITER_H_
 
 #include <map>
-#include "binarydict.h"
+#include "statement.h"
+#include "type.h"
 #include "writermode.h"
 
 namespace Msp {
@@ -14,25 +15,27 @@ Writes data in binary format.
 class BinaryWriter: public WriterMode
 {
 private:
-	typedef std::map<DictEntry, unsigned> Dictionary;
+	typedef std::map<StatementKey, int> Dictionary;
 	typedef std::map<std::string, unsigned> StringMap;
 
 	Dictionary dict;
-	unsigned next_kwd_id;
+	unsigned next_kwd_id = 1;
 	StringMap strings;
-	unsigned next_str_id;
+	unsigned next_str_id = 1;
+	unsigned float_precision = 32;
 
 public:
-	BinaryWriter(IO::Base &o);
+	BinaryWriter(Output &o);
 
-	virtual void write(const Statement &st);
+	void set_float_precision(unsigned) override;
+	void write(const Statement &st) override;
 private:
 	void write_(const Statement &st);
 	void collect_keywords(const Statement &st);
-	void write_int(long long n);
-	void write_string(const std::string &s);
-	void write_float(float f);
-	void write_enum(const std::string &e);
+	void write_int(IntType::Store n);
+	void write_string(const StringType::Store &s);
+	void write_float(FloatType::Store f);
+	void write_symbol(const SymbolType::Store &s);
 };
 
 } // namespace DataFile