Fixed Generic object file reading and added some assertions.

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7043 8c9fc860-2736-0410-a75d-ab315db34111

source/GenericLinker.Mod

@@ -492,9 +492,13 @@ BEGIN
 	requires := NIL;
 	IF version >= 4 THEN
 		IF ~binary THEN 
-			reader.String(string); ObjectFile.ReadNameList(reader, offers, binary, poolMap);
+			reader.String(string); 
+			ASSERT(string = "offers");
+			ObjectFile.ReadNameList(reader, offers, binary, poolMap);
 			reader.SkipWhitespace;
-			reader.String(string); ObjectFile.ReadNameList(reader, requires, binary, poolMap);
+			reader.String(string); 
+			ASSERT(string = "requires");
+			ObjectFile.ReadNameList(reader, requires, binary, poolMap);
 			reader.SkipWhitespace;
 		ELSE
 			ObjectFile.ReadNameList(reader, offers, binary, poolMap);

source/ObjectFile.Mod

@@ -669,6 +669,7 @@ VAR
 				ReadIdentifier(nameList[i]);
 			END;
 		ELSE
+			reader.SkipWhitespace;
 			reader.Int(len,FALSE);
 			NEW(nameList, len);
 			FOR i := 0 TO len-1 DO