X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=fold.cc;h=b416401ede108ab39c71e3c7ab11c64de0560a00;hb=51b3593cbfb33c1d7b4b588f3841c3c405e3a215;hp=4be4081d8b3fd1d479b4c8fad85d7ab35be14138;hpb=5abab2c54b3da53cc9d64cbf0f369fc7486d194c;p=odcread.git

diff --git a/fold.cc b/fold.cc
index 4be4081..b416401 100644
--- a/fold.cc
+++ b/fold.cc
@@ -26,7 +26,7 @@ void View::internalize(Reader &reader) {
 	reader.readVersion(0, 0);
 }
 
-const std::string Fold::TYPENAME("Folds.Fold^");
+const std::string Fold::TYPENAME("StdFolds.Fold^");
 const TypeProxy<Fold> Fold::PROXY;
 
 Fold::Fold(INTEGER id) : View(id) {}
@@ -44,19 +44,30 @@ const std::string &Fold::getTypeName() const {
 }
 
 void Fold::internalize(Reader &reader) {
-	Store::internalize(reader);
+	View::internalize(reader);
 	if (reader.isCancelled()) return;
 	reader.readVersion(0, 0);
 	if (reader.isCancelled()) return;
-	reader.readSInt(); // FIXME IMPLEMENT
 //		rd.ReadXInt(xint);fold.leftSide := xint = 0;
+	reader.readSInt();
 //		rd.ReadXInt(xint); fold.collapsed := xint = 0;
+	reader.readSInt();
 //		rd.ReadXString(fold.label);
+	d_label = new SHORTCHAR[32];
+	reader.readSString(d_label); // the label
 //		rd.ReadStore(store);
+	d_hidden = reader.readStore(); // the hidden part
 //		IF store # NIL THEN fold.hidden := store(TextModels.Model); Stores.Join(fold.hidden, fold)
 //		ELSE fold.hidden := NIL
 //		END;
 //		fold.leftSide := store # NIL
 }
 
+std::string Fold::toString() {
+	if (d_hidden == 0) {
+		return std::string("Fold(right)");
+	}
+	return std::string("Fold(left)") + std::string(" { ") + d_hidden->toString() + std::string("  }");
+}
+
 } // namespace odc