X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=textmodel.cc;h=cfd7730256ff2d0045cfd1ed63e83e1b497a8575;hb=a3724718862ea28a70f2c6c330cdc729451d6510;hp=281042002423e99527fa8677237c2f6034d93ff0;hpb=9199c6da801c1555dadb23b230b400e3f1364abc;p=odcread.git

diff --git a/textmodel.cc b/textmodel.cc
index 2810420..cfd7730 100644
--- a/textmodel.cc
+++ b/textmodel.cc
@@ -10,20 +10,12 @@
 namespace odc {
 
 const std::string TextModel::TYPENAME("TextModels.Model^");
-const TypeProxy<TextModel> TextModel::PROXY;
+const TypeProxy<TextModel, ContainerModel> 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();
+	return TYPENAME;
 }
 
 void TextModel::internalize(Reader &reader) {
@@ -33,20 +25,12 @@ void TextModel::internalize(Reader &reader) {
 }
 
 const std::string StdTextModel::TYPENAME("TextModels.StdModel^");
-const TypeProxy<StdTextModel> StdTextModel::PROXY;
+const TypeProxy<StdTextModel, TextModel> StdTextModel::PROXY;
 
 StdTextModel::StdTextModel(INTEGER id) : TextModel(id), d_pieces() {}
 
-const std::string &StdTextModel::getType() {
-	return TYPENAME;
-}
-
-const std::string *StdTextModel::getSuper() {
-	return &TextModel::getType();
-}
-
 const std::string &StdTextModel::getTypeName() const {
-	return getType();
+	return TYPENAME;
 }
 
 /*
@@ -89,8 +73,8 @@ void StdTextModel::internalize(Reader &reader) {
 //				INC(org, len) -- increment org by len ?
 		} else { // embedded view
 			//std::cout << "Found View piece" << std::endl;
-			reader.readInt(); reader.readInt();
-			Store *view = reader.readStore(); // fixme: save somewhere
+			reader.readInt(); reader.readInt(); // view width + height: ignore
+			Store *view = reader.readStore();
 //				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));
@@ -157,47 +141,84 @@ std::string StdTextModel::toString() {
 	return sofar + "}";
 }
 
+void StdTextModel::accept(Visitor &visitor) const {
+	visitor.partStart();
+	for (int i = 0; i < d_pieces.size(); ++i) {
+		d_pieces[i]->accept(visitor);
+	}
+	visitor.partEnd();
+}
+
 TextPiece::TextPiece(size_t len): d_len(len) {}
 
-LongPiece::LongPiece(size_t len): TextPiece(len) {}
+LongPiece::LongPiece(size_t len): TextPiece(len * 2) {}
+
+LongPiece::~LongPiece() {
+	delete d_buf;
+}
 
 void LongPiece::read(Reader &reader) {
-	CHAR *buf = new CHAR[d_len];
-	reader.readLChar(buf, d_len);
-	delete buf;
+	d_buf = new CHAR[d_len / 2 + 1];
+	reader.readLChar(d_buf, d_len / 2);
+	d_buf[d_len / 2] = 0;
+}
+
+std::string LongPiece::toString() const {
+	return std::string("LongPiece(FIXME)");// + std::wstring((wchar_t*)d_buf) + std::string(")");
+}
+
+std::wstring LongPiece::getText() const {
+	return std::wstring((wchar_t*)d_buf);
 }
 
-std::string LongPiece::toString() {
-	return std::string("LongPiece");
+void LongPiece::accept(Visitor &visitor) const {
+	visitor.textLongPiece(this);
 }
 
 ShortPiece::ShortPiece(size_t len): TextPiece(len) {}
 
+ShortPiece::~ShortPiece() {
+	delete d_buf;
+}
+
 void ShortPiece::read(Reader &reader) {
-//	static char piece[] = "pieceA";
-	SHORTCHAR *buf = new SHORTCHAR[d_len + 1];
-	reader.readSChar(buf, d_len);
-	buf[d_len] = 0;
-	std::cout.write(buf, d_len);
-//	std::ofstream ofs(piece, std::ios::out);
-//	ofs.write(buf, d_len);
-//	ofs.close();
-//	++piece[5];
-	delete buf;
+	d_buf = new SHORTCHAR[d_len + 1];
+	reader.readSChar(d_buf, d_len);
+	d_buf[d_len] = 0;
+}
+
+std::string ShortPiece::toString() const {
+	return std::string("ShortPiece(") + std::string(d_buf) + std::string(")");
+}
+
+std::string ShortPiece::getText() const {
+	std::string str(d_buf);
+	for (std::string::iterator it = str.begin(); it < str.end(); ++it) {
+		if (*it == '\r') *it = '\n';
+	}
+	return str;
 }
 
-std::string ShortPiece::toString() {
-	return std::string("ShortPiece");
+void ShortPiece::accept(Visitor &visitor) const {
+	visitor.textShortPiece(this);
 }
 
-ViewPiece::ViewPiece(Store *view): TextPiece(0), d_view(view) {}
+ViewPiece::ViewPiece(Store *view): TextPiece(1), d_view(view) {}
+
+ViewPiece::~ViewPiece() {
+	delete d_view;
+}
 
 void ViewPiece::read(Reader &reader) {
 	reader.readByte();
 }
 
-std::string ViewPiece::toString() {
+std::string ViewPiece::toString() const {
 	return std::string("ViewPiece { ") + d_view->toString() + " }";
 }
 
+void ViewPiece::accept(Visitor &visitor) const {
+	return d_view->accept(visitor);
+}
+
 } // namespace odc