Read NIL stores correctly

diff --git a/reader.cc b/reader.cc
index 1f60ce8fe31041fda6ebb15c5f740ed5022bf474..f53e30a8e896035d8a769d2de4cf10b27c9e8d33 100644 (file)
--- a/reader.cc
+++ b/reader.cc
@@ -120,6 +120,14 @@ Store* Reader::readStore() {
 //                     kind: SHORTCHAR; path: TypePath; type: TypeName;
 //                     save: ReaderState;
 Store *Reader::readNilStore() {
 //                     kind: SHORTCHAR; path: TypePath; type: TypeName;
 //                     save: ReaderState;
 Store *Reader::readNilStore() {

+       INTEGER comment = readInt();
+       std::streamoff next = readInt();
+       d_state->end = d_rider.tellg();
+       if (next > 0 || (next == 0 && comment % 2 == 1)) {
+               d_state->next = d_state->end + next;
+       } else {
+               d_state->next = 0;
+       }

        return 0;
 }
 //             IF kind = nil THEN
        return 0;
 }
 //             IF kind = nil THEN