X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarywriter.cpp;h=c1e53fb5f23e7ca3622697c4e5e829383aeafd2f;hb=818ead7b6ccef1e4d2435cc959bc07f910fcde46;hp=2ff96a457524c7a1e28a13c6e098de535bf0e006;hpb=35d0da96bad97214376f18d15078e6d731e6f219;p=libs%2Fdatafile.git

diff --git a/source/binarywriter.cpp b/source/binarywriter.cpp
index 2ff96a4..c1e53fb 100644
--- a/source/binarywriter.cpp
+++ b/source/binarywriter.cpp
@@ -34,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());
@@ -89,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) ;
@@ -102,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())
@@ -114,7 +114,7 @@ void BinaryWriter::write_string(const string &s)
 	}
 }
 
-void BinaryWriter::write_float(float f)
+void BinaryWriter::write_float(FloatType::Store f)
 {
 	union
 	{
@@ -132,9 +132,9 @@ void BinaryWriter::write_float(float f)
 #endif
 }
 
-void BinaryWriter::write_enum(const string &e)
+void BinaryWriter::write_symbol(const SymbolType::Store &s)
 {
-	write_int(get_item(strings, e));
+	write_int(get_item(strings, s.name));
 }
 
 } // namespace DataFile