Use negative integers for built-in statements for better extensibility

[libs/datafile.git] / source / binarywriter.cpp

diff --git a/source/binarywriter.cpp b/source/binarywriter.cpp
index c1e53fb5f23e7ca3622697c4e5e829383aeafd2f..9c9c893e890354bc1198c0cfdd4603ede61b3270 100644 (file)
--- a/source/binarywriter.cpp
+++ b/source/binarywriter.cpp
@@ -9,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)
@@ -24,7 +24,7 @@ void BinaryWriter::write(const Statement &st)
 
 void BinaryWriter::write_(const Statement &st)
 {
-       unsigned id = get_item(dict, DictEntry(st.keyword, st.get_signature()));
+       int id = get_item(dict, DictEntry(st.keyword, st.get_signature()));
 
        write_int(id);
        for(Statement::Arguments::const_iterator j = st.args.begin(); j!=st.args.end(); ++j)