X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarywriter.cpp;h=9c9c893e890354bc1198c0cfdd4603ede61b3270;hb=e0af585ed57bdb5b1ea4f4a415fda13b5d99d2dc;hp=09e36c0085be33c8ad7c0ff0eb5c8a611ca33a95;hpb=a582163d380833b1370ba067a1fd0ad5c2984723;p=libs%2Fdatafile.git

diff --git a/source/binarywriter.cpp b/source/binarywriter.cpp
index 09e36c0..9c9c893 100644
--- a/source/binarywriter.cpp
+++ b/source/binarywriter.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/maputils.h>
 #include "binarywriter.h"
 #include "statement.h"
 
@@ -15,11 +9,11 @@ namespace DataFile {
 
 BinaryWriter::BinaryWriter(IO::Base &o):
 	WriterMode(o),
-	next_kwd_id(3),
+	next_kwd_id(1),
 	next_str_id(1)
 {
-	dict[DictEntry("__kwd", "iss")] = 1;
-	dict[DictEntry("__str", "is")] = 2;
+	dict[DictEntry("__kwd", "iss")] = -1;
+	dict[DictEntry("__str", "is")] = -2;
 }
 
 void BinaryWriter::write(const Statement &st)
@@ -30,11 +24,9 @@ void BinaryWriter::write(const Statement &st)
 
 void BinaryWriter::write_(const Statement &st)
 {
-	Dictionary::iterator i = dict.find(DictEntry(st.keyword, st.get_signature()));
-	if(i==dict.end())
-		throw InvalidParameterValue("Unknown statement");
+	int id = get_item(dict, DictEntry(st.keyword, st.get_signature()));
 
-	write_int(i->second);
+	write_int(id);
 	for(Statement::Arguments::const_iterator j = st.args.begin(); j!=st.args.end(); ++j)
 		switch(j->get_signature())
 		{
@@ -42,7 +34,7 @@ void BinaryWriter::write_(const Statement &st)
 		case StringType::signature: write_string(j->get<StringType::Store>()); break;
 		case BoolType::signature:   write_int   (j->get<BoolType::Store>()); break;
 		case FloatType::signature:  write_float (j->get<FloatType::Store>()); break;
-		case SymbolType::signature: write_enum  (j->get<SymbolType::Store>()); break;
+		case SymbolType::signature: write_symbol(j->get<SymbolType::Store>()); break;
 		}
 
 	write_int(st.sub.size());
@@ -97,9 +89,9 @@ void BinaryWriter::collect_keywords(const Statement &st)
 		collect_keywords(*i);
 }
 
-void BinaryWriter::write_int(long long n)
+void BinaryWriter::write_int(IntType::Store n)
 {
-	unsigned i = sizeof(long long)-1;
+	unsigned i = sizeof(IntType::Store)-1;
 
 	if(n>=0)
 		for(; (i>0 && (n>>(i*7-1))==0); --i) ;
@@ -110,7 +102,7 @@ void BinaryWriter::write_int(long long n)
 		out.put((n>>(i*7) & 0x7F) | (i?0x80:0));
 }
 
-void BinaryWriter::write_string(const string &s)
+void BinaryWriter::write_string(const StringType::Store &s)
 {
 	StringMap::const_iterator i = strings.find(s);
 	if(i!=strings.end())
@@ -122,7 +114,7 @@ void BinaryWriter::write_string(const string &s)
 	}
 }
 
-void BinaryWriter::write_float(float f)
+void BinaryWriter::write_float(FloatType::Store f)
 {
 	union
 	{
@@ -140,12 +132,9 @@ void BinaryWriter::write_float(float f)
 #endif
 }
 
-void BinaryWriter::write_enum(const string &e)
+void BinaryWriter::write_symbol(const SymbolType::Store &s)
 {
-	StringMap::const_iterator i = strings.find(e);
-	if(i==strings.end())
-		throw InvalidParameterValue("Unknown enum");
-	write_int(i->second);
+	write_int(get_item(strings, s.name));
 }
 
 } // namespace DataFile