X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=reader.cc;h=1f60ce8fe31041fda6ebb15c5f740ed5022bf474;hb=63b438eb6e7c0e06bf37614c5de3c03f25301af5;hp=581917197f2c9bdbcbcbd3e6dc130193784e1263;hpb=ca3a2a107aa425fe4b8afb0d1fd988a887ac8f40;p=odcread.git

diff --git a/reader.cc b/reader.cc
index 5819171..1f60ce8 100644
--- a/reader.cc
+++ b/reader.cc
@@ -2,6 +2,7 @@
 #include <alien.h>
 
 #include <string>
+#include <assert.h>
 
 namespace odc {
 
@@ -14,15 +15,55 @@ SHORTCHAR Reader::readSChar() {
 	return out;
 }
 
+void Reader::readSChar(SHORTCHAR *buf, size_t len) {
+	d_rider.read(buf, len);
+}
+
+CHAR Reader::readLChar() {
+	CHAR buf;
+	char *bufPtr = (char *)&buf;
+	d_rider.read(bufPtr, 2);
+	if (isLittleEndian()) {
+		return buf;
+	} else {
+		CHAR out;
+		char *outPtr = (char *)&out;
+		outPtr[0] = bufPtr[1]; outPtr[1] = bufPtr[0];
+		return out;
+	}
+}
+
+void Reader::readLChar(CHAR *buf, size_t len) {
+	char *bufPtr = (char *)buf;
+	int len2 = len * 2;
+	d_rider.read(bufPtr, len2);
+	if (isBigEndian()) {
+		char tmp;
+		for (int i = 0; i < len2; i += 2) {
+			tmp = bufPtr[i];
+			bufPtr[i] = bufPtr[i + 1];
+			bufPtr[i + 1] = tmp;
+		}
+	}
+}
+
+BYTE Reader::readByte() {
+	BYTE out;
+	d_rider.read((char*)&out, 1);
+	return out;
+}
+
 INTEGER Reader::readInt() {
-	char *buf = new char[4];
-	d_rider.read(buf, 4);
+	INTEGER buf;
+	char *bufPtr = (char*)&buf;
+	d_rider.read(bufPtr, 4);
 	if (isLittleEndian()) {
-		return *(INTEGER *)buf;
+		return buf;
 	} else {
-		char *out = new char[4];
-		out[0] = buf[3]; out[1] = buf[2]; out[2] = buf[1]; out[3] = buf[0];
-		return *(INTEGER *)out;
+		INTEGER out;
+		char *outPtr = (char *)&out;
+		outPtr[0] = bufPtr[3]; outPtr[1] = bufPtr[2]; outPtr[2] = bufPtr[1]; outPtr[3] = bufPtr[0];
+		return out;
 	}
 }
 
@@ -32,6 +73,25 @@ void Reader::readSString(SHORTCHAR *out) {
 	}
 }
 
+void Reader::turnIntoAlien(int cause) {
+	assert(cause > 0);
+	d_cancelled = true;
+	d_cause = cause;
+	d_readAlien = true;
+}
+
+bool Reader::isCancelled() {
+	return d_cancelled;
+}
+
+INTEGER Reader::readVersion(INTEGER min, INTEGER max) {
+	INTEGER version = readByte();
+	if (version < min || version > max) {
+		turnIntoAlien(ALIENVERSION);
+	}
+	return version;
+}
+
 Store* Reader::readStore() {
 	SHORTCHAR kind = readSChar();
 	if (kind == Store::NIL) {
@@ -50,6 +110,7 @@ Store* Reader::readStore() {
 		std::cout << "ELEM STORE" << std::endl;
 		return readStoreOrElemStore(true);
 	} else {
+		std::cout << std::hex << (unsigned int)kind << std::endl;
 		throw 20;
 	}
 }
@@ -85,12 +146,9 @@ Store *Reader::readNewLinkStore() {
 
 Store *Reader::readStoreOrElemStore(bool isElem) {
 	INTEGER id = isElem ? d_elemList.size() : d_storeList.size();
-	SHORTCHAR** path = newTypePath();
-	readPath(path);
-	for (int i = 0; path[i] != 0; ++i) {
-		std::cout << path[i] << std::endl;
-	}
-	SHORTCHAR* type = path[0];
+	TypePath path = readPath();
+	std::cout << path.toString() << std::endl;
+	const std::string &type = path[0];
 	INTEGER comment = readInt();
 	std::streampos pos1 = d_rider.tellg();
 	std::streamoff next = readInt();
@@ -108,32 +166,60 @@ Store *Reader::readStoreOrElemStore(bool isElem) {
 	}
 	d_state->end = pos + len;
 	d_cause = 0;
-	// FIXME: insert whole bunch of checks here
-//			ASSERT(len >= 0, 101);
-//			IF next # 0 THEN
-//				ASSERT(rd.st.next > pos1, 102);
-//				IF down # 0 THEN
-//					ASSERT(downPos < rd.st.next, 103)
-//				END
-//			END;
-//			IF down # 0 THEN
-//				ASSERT(downPos > pos1, 104);
-//				ASSERT(downPos < rd.st.end, 105)
-//			END;
+	assert(len >= 0);
+	if (next != 0) {
+		assert(d_state->next > pos1);
+		if (down != 0) {
+			assert(downPos < d_state->next);
+		}
+	}
+	if (down > 0) {
+		assert(downPos > pos1);
+		assert(downPos < d_state->end);
+	}
 
-	void *t = 0; // FIXME type lookup here
+	const TypeProxyBase *t = TypeRegister::getInstance().get(type); // FIXME type lookup here
+	Store *x = 0;
 	if (t != 0) {
-//				x := NewStore(t); x.isElem := kind = elem
+		x = t->newInstance(id);
 	} else {
-//				rd.cause := thisTypeRes; AlienTypeReport(rd.cause, type);
-//				x := NIL
+		d_cause = TYPENOTFOUND;
 	}
 
-	Store *x = 0;
 	if (x != 0) { // IF READING SUCCEEDS, INSERT MORE CHECKS HERE
+		if (true) { // samePath(x, path)
+			ReaderState *save = d_state;
+			d_state = new ReaderState();
+			x->internalize(*this);
+			delete d_state;
+			d_state = save;
+
+			if (d_cause != 0) {
+				x = 0;
+			}
+			assert(d_rider.tellg() == d_state->end);
+			assert(!d_rider.eof());
+		} else {
+//					rd.cause := inconsistentType; AlienTypeReport(rd.cause, type);
+			x = 0;
+		}
+	}
+
+	if (x != 0) {
+		if (d_store == 0) {
+			d_store = x;
+		} else {
+			// join(d_store, x)
+			std::cout << "Man, should have written join(.,.)" << std::endl;
+		}
+		if (isElem) {
+			d_elemList.push_back(x);
+		} else {
+			d_storeList.push_back(x);
+		}
 	} else {
-//				rd.SetPos(pos);
-//				ASSERT(rd.cause # 0, 107);
+		d_rider.seekg(pos); // x->internalize() could have left us anywhere
+		assert(d_cause != 0);
 		Alien *alien = new Alien(id, path); //, d_cause); //,file
 		if (d_store == 0) {
 			d_store = alien;
@@ -147,74 +233,21 @@ Store *Reader::readStoreOrElemStore(bool isElem) {
 			d_storeList.push_back(alien);
 		}
 		ReaderState *save = d_state;
-//				rd.nextTypeId := nextTypeId; rd.nextElemId := nextElemId; rd.nextStoreId := nextStoreId;
+		d_state = new ReaderState();
 		internalizeAlien(alien, downPos, save->end);
+		delete d_state;
 		d_state = save;
-//				ASSERT(rd.Pos() = rd.st.end, 108);
-//				rd.cause := 0; rd.cancelled :=  FALSE; rd.readAlien := TRUE
+		assert(d_rider.tellg() == d_state->end);
+
+		// we've just read the alien, so reset the state
+		d_cause = 0;
+		d_cancelled = false;
+		d_readAlien = true;
 		return alien;
 	}
 
 	return x;
 }
-//			t := ThisType(type);
-//			IF t # NIL THEN
-//				x := NewStore(t); x.isElem := kind = elem
-//			ELSE
-//				rd.cause := thisTypeRes; AlienTypeReport(rd.cause, type);
-//				x := NIL
-//			END;
-//			IF x # NIL THEN
-//				IF SamePath(t, path) THEN
-//					IF kind = elem THEN
-//						x.id := id; AddStore(rd.eDict, rd.eHead, x)
-//					ELSE
-//						x.id := id; AddStore(rd.sDict, rd.sHead, x)
-//					END;
-//					save := rd.st; rd.cause := 0; rd.cancelled :=  FALSE;
-//					x.Internalize(rd);
-//					rd.st := save;
-//					IF rd.cause # 0 THEN x := NIL
-//					ELSIF (rd.Pos() # rd.st.end) OR rd.rider.eof THEN
-//						rd.cause := inconsistentVersion; AlienReport(rd.cause);
-//						x := NIL
-//					END
-//				ELSE
-//					rd.cause := inconsistentType; AlienTypeReport(rd.cause, type);
-//					x := NIL
-//				END
-//			END;
-//			
-//			IF x # NIL THEN
-//				IF rd.noDomain THEN
-//					rd.store := x;
-//					rd.noDomain := FALSE
-//				ELSE
-//					Join(rd.store, x)
-//				END
-//			ELSE	(* x is an alien *)
-//				rd.SetPos(pos);
-//				ASSERT(rd.cause # 0, 107);
-//				NEW(a); a.path := path; a.cause := rd.cause; a.file := rd.rider.Base();
-//				IF rd.noDomain THEN
-//					rd.store := a;
-//					rd.noDomain := FALSE
-//				ELSE
-//					Join(rd.store, a)
-//				END;
-//				IF kind = elem THEN
-//					a.id := id; AddStore(rd.eDict, rd.eHead, a)
-//				ELSE
-//					a.id := id; AddStore(rd.sDict, rd.sHead, a)
-//				END;
-//				save := rd.st;
-//				rd.nextTypeId := nextTypeId; rd.nextElemId := nextElemId; rd.nextStoreId := nextStoreId;
-//				InternalizeAlien(rd, a.comps, downPos, pos, len);
-//				rd.st := save;
-//				x := a;
-//				ASSERT(rd.Pos() = rd.st.end, 108);
-//				rd.cause := 0; rd.cancelled :=  FALSE; rd.readAlien := TRUE
-//			END
 
 
 void Reader::internalizeAlien(Alien *alien, std::streampos down, std::streampos end) {
@@ -237,75 +270,52 @@ void Reader::internalizeAlien(Alien *alien, std::streampos down, std::streampos
 	}
 }
 
-void Reader::readPath(SHORTCHAR **path) {
+std::string &Reader::fixTypeName(std::string &name) {
+	size_t pos = name.size() - 4;
+	if (pos > 0 && name.substr(pos, 4).compare("Desc") == 0) {
+		return name.replace(pos, 4, "^");
+	}
+	return name;
+}
+
+TypePath Reader::readPath() {
+	TypePath path;
 	SHORTCHAR kind = readSChar();
+	SHORTCHAR *buf = new SHORTCHAR[64]; // TypeName has a maximum of length 64 (including terminator).
 	int i;
 	for (i = 0; kind == Store::NEWEXT; ++i) {
-		std::cout << i << std::endl;
-		readSString(path[i]);
+		readSString(buf);
+		std::string name(buf);
+		path.push_back(fixTypeName(name));
 		addPathComponent(i == 0, path[i]);
 //			IF path[i] # elemTName THEN INC(i) END;
 		kind = readSChar();
 	}
 
 	if (kind == Store::NEWBASE) {
-		std::cout << i << std::endl;
-		readSString(path[i]);
+		readSString(buf);
+		std::string name(buf);
+		path.push_back(fixTypeName(name));
 		addPathComponent(i == 0, path[i]);
 		++i;
 	} else if (kind == Store::OLDTYPE) {
 		int id = readInt();
-		d_typeList[d_typeList.size() - 1]->baseId = id;
+		if (i > 0) {
+			d_typeList[d_typeList.size() - 1]->baseId = id;
+		}
 		while (id != -1) {
-			std::cout << "old " << i << "id " << id << d_typeList[id]->name << std::endl;
-			path[i] = d_typeList[id]->name;
+			path.push_back(d_typeList[id]->name);
 			id = d_typeList[id]->baseId;
+//				IF path[i] # elemTName THEN INC(i) END
 			++i;
 		}
-//			REPEAT
-//				GetThisType(rd.tDict, id, path[i]); id := ThisBaseId(rd.tDict, id);
-//				IF path[i] # elemTName THEN INC(i) END
-//			UNTIL id = -1
 	} else {
 		throw 100;
 	}
-	std::cout << "term " << i << std::endl;
-	path[i] = 0;
+	return path;
 }
-//	PROCEDURE ReadPath (VAR rd: Reader; VAR path: TypePath);
-//		VAR h: TypeDict; id, extId: INTEGER; i: INTEGER; kind: SHORTCHAR;
-//
-//		PROCEDURE AddPathComp (VAR rd: Reader);
-//		BEGIN
-//			IF h # NIL THEN AddBaseId(h, extId, rd.nextTypeId) END;
-//			AddType(rd.tDict, rd.tHead, rd.nextTypeId, path[i]);
-//			h := rd.tHead; extId := rd.nextTypeId
-//		END AddPathComp;
-//
-//	BEGIN
-//		h := NIL; i := 0; rd.ReadSChar(kind);
-//		WHILE kind = newExt DO
-//			rd.ReadXString(path[i]);
-//			AddPathComp(rd); INC(rd.nextTypeId);
-//			IF path[i] # elemTName THEN INC(i) END;
-//			rd.ReadSChar(kind)
-//		END;
-//		IF kind = newBase THEN
-//			rd.ReadXString(path[i]);
-//			AddPathComp(rd); INC(rd.nextTypeId); INC(i)
-//		ELSE
-//			ASSERT(kind = oldType, 100);
-//			rd.ReadInt(id);
-//			IF h # NIL THEN AddBaseId(h, extId, id) END;
-//			REPEAT
-//				GetThisType(rd.tDict, id, path[i]); id := ThisBaseId(rd.tDict, id);
-//				IF path[i] # elemTName THEN INC(i) END
-//			UNTIL id = -1
-//		END;
-//		path[i] := ""
-//	END ReadPath;
 
-void Reader::addPathComponent(bool first, SHORTCHAR *typeName) {
+void Reader::addPathComponent(bool first, const std::string &typeName) {
 	int next = d_typeList.size();
 	int curr = next - 1;
 	if (!first) {