X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=store.cc;h=6f44e8525457c8135b7eafc9c773753fc93a545f;hb=e2fd5debfd8b94a6ec77a514962851594f0690f0;hp=fe5fa62c66ac91ad384da4f305c7696bfa600717;hpb=8987976196a50e3e9639879990c7473610ff5369;p=odcread.git

diff --git a/store.cc b/store.cc
index fe5fa62..6f44e85 100644
--- a/store.cc
+++ b/store.cc
@@ -1,5 +1,6 @@
 #include <store.h>
 #include <reader.h>
+#include <visitor.h>
 
 #include <iostream>
 
@@ -25,8 +26,7 @@ std::string TypePath::toString() const {
 }
 
 const std::string Store::TYPENAME("Stores.Store^");
-const TypeProxy<Store> Store::PROXY;
-TypePath *Store::s_typePath = 0;
+const TopTypeProxy<Store> Store::PROXY;
 
 Store::Store(INTEGER id): d_id(id) {}
 
@@ -34,35 +34,22 @@ INTEGER Store::getId() {
 	return d_id;
 }
 
-const std::string &Store::getType() {
-	return Store::TYPENAME;
-}
-
-const std::string *Store::getSuper() {
-	return 0;
-}
-
 const std::string &Store::getTypeName() const {
-	return Store::getType();
+	return Store::TYPENAME;
 }
 
-const TypePath &Store::getTypePath() const {
-	if (s_typePath == 0) {
-		s_typePath = calcTypePath(getTypeName());
-	}
-	return *s_typePath;
+TypePath Store::getTypePath() const {
+	TypePath out;
+	calcTypePath(&out, getTypeName());
+	return out;
 }
 
-TypePath *Store::calcTypePath(const std::string &name) const {
+void Store::calcTypePath(TypePath *path, const std::string &name) const {
 	const std::string *super = TypeRegister::getInstance().get(name)->getSuper();
-	TypePath *path;
 	if (super != 0) {
-		path = calcTypePath(*super);
-	} else {
-		path = new TypePath();
+		calcTypePath(path, *super);
 	}
 	path->push_back(name);
-	return path;
 }
 
 void Store::internalize(Reader &reader) {
@@ -73,159 +60,51 @@ std::string Store::toString() {
 	return getTypeName(); 
 }
 
+void Store::accept(Visitor &visitor) const {}
+
 const std::string Elem::TYPENAME("Stores.Elem^");
-const TypeProxy<Elem> Elem::PROXY;
+const TypeProxy<Elem, Store> Elem::PROXY;
 
 Elem::Elem(INTEGER id) : Store(id) {}
 
-const std::string &Elem::getType() {
-	return TYPENAME;
-}
-
-const std::string *Elem::getSuper() {
-	return &Store::getType();
-}
-
 const std::string &Elem::getTypeName() const {
-	return getType();
+	return TYPENAME;
 }
 
 void Elem::internalize(Reader &reader) {
-	Store::internalize(reader); // just being explicit
+	Store::internalize(reader);
+	if (reader.isCancelled()) return;
+	reader.readVersion(0, 0);
 }
 
 const std::string Model::TYPENAME("Models.Model^");
-const TypeProxy<Model> Model::PROXY;
+const TypeProxy<Model, Elem> Model::PROXY;
 
 Model::Model(INTEGER id) : Elem(id) {}
 
-const std::string &Model::getType() {
-	return TYPENAME;
-}
-
-const std::string *Model::getSuper() {
-	return &Elem::getType();
-}
-
 const std::string &Model::getTypeName() const {
-	return getType();
+	return TYPENAME;
 }
 
 void Model::internalize(Reader &reader) {
-	Model::internalize(reader);
+	Elem::internalize(reader);
+	if (reader.isCancelled()) return;
 	reader.readVersion(0, 0);
 }
 
 const std::string ContainerModel::TYPENAME("Containers.Model^");
-const TypeProxy<ContainerModel> ContainerModel::PROXY;
+const TypeProxy<ContainerModel, Model> ContainerModel::PROXY;
 
 ContainerModel::ContainerModel(INTEGER id) : Model(id) {}
 
-const std::string &ContainerModel::getType() {
-	return TYPENAME;
-}
-
-const std::string *ContainerModel::getSuper() {
-	return &Model::getType();
-}
-
 const std::string &ContainerModel::getTypeName() const {
-	return getType();
+	return TYPENAME;
 }
 
 void ContainerModel::internalize(Reader &reader) {
 	Model::internalize(reader);
+	if (reader.isCancelled()) return;
 	reader.readVersion(0, 0);
 }
 
-const std::string TextModel::TYPENAME("TextModels.Model^");
-const TypeProxy<TextModel> TextModel::PROXY;
-
-TextModel::TextModel(INTEGER id) : ContainerModel(id) {}
-
-const std::string &TextModel::getType() {
-	return TYPENAME;
-}
-
-const std::string *TextModel::getSuper() {
-	return &ContainerModel::getType();
-}
-
-const std::string &TextModel::getTypeName() const {
-	return getType();
-}
-
-void TextModel::internalize(Reader &reader) {
-	ContainerModel::internalize(reader);
-	reader.readVersion(0, 0);
-}
-
-const std::string StdTextModel::TYPENAME("TextModels.StdModel^");
-//const TypeProxy<StdTextModel> StdTextModel::PROXY;
-
-StdTextModel::StdTextModel(INTEGER id) : TextModel(id) {}
-
-const std::string &StdTextModel::getType() {
-	return TYPENAME;
-}
-
-const std::string *StdTextModel::getSuper() {
-	return &TextModel::getType();
-}
-
-const std::string &StdTextModel::getTypeName() const {
-	return getType();
-}
-
-void StdTextModel::internalize(Reader &reader) {
-	TextModel::internalize(reader);
-	reader.readVersion(0, 1);
-
-//	PROCEDURE (t: StdModel) Internalize (VAR rd: Stores.Reader);
-//		VAR u, un: Run; sp: Piece; lp: LPiece; v: ViewRef;
-//			org, len: INTEGER; ano: BYTE; thisVersion: INTEGER;
-//			attr: Attributes; dict: AttrDict;
-//	BEGIN
-//		ASSERT(t.Domain() = NIL, 20); ASSERT(t.len = 0, 21);
-//		t.Internalize^(rd); IF rd.cancelled THEN RETURN END;
-//		rd.ReadVersion(minVersion, maxStdModelVersion, thisVersion);
-//		IF rd.cancelled THEN RETURN END;
-//		StdInit(t);
-//		dict.len := 0; u := t.trailer;
-//		rd.ReadInt(len); org := rd.Pos() + len;
-//		rd.ReadByte(ano);
-//		WHILE ano # -1 DO
-//			IF ano = dict.len THEN
-//				ReadAttr(rd, attr); Stores.Join(t, attr);
-//				IF dict.len < dictSize THEN dict.attr[dict.len] := attr; INC(dict.len) END
-//			ELSE
-//				attr := dict.attr[ano]
-//			END;
-//			rd.ReadInt(len);
-//			IF len > 0 THEN	(* piece *)
-//				NEW(sp); sp.len := len; sp.attr := attr;
-//				sp.file := rd.rider.Base(); sp.org := org; un := sp;
-//				INC(org, len)
-//			ELSIF len < 0 THEN	(* longchar piece *)
-//				len := -len; ASSERT(~ODD(len), 100);
-//				NEW(lp); lp.len := len DIV 2; lp.attr := attr;
-//				lp.file := rd.rider.Base(); lp.org := org; un := lp;
-//				INC(org, len)
-//			ELSE	(* len = 0  =>  embedded view *)
-//				NEW(v); v.len := 1; v.attr := attr;
-//				rd.ReadInt(v.w); rd.ReadInt(v.h); Views.ReadView(rd, v.view);
-//				v.view.InitContext(NewContext(v, t));
-//				un := v; INC(org)
-//			END;
-//			INC(t.len, un.len); u.next := un; un.prev := u; u := un;
-//			rd.ReadByte(ano)
-//		END;
-//		rd.SetPos(org);
-//		u.next := t.trailer; t.trailer.prev := u
-//	END Internalize;
-//
-}
-
-
-
 } // namespace odc