Browse Source

* Remove duplicate ibextraheader handling.
* Move SymAnsiStr boolean setting inside parseextraheader function.
* Only accept same CurrentPPULongVersion in parseextraheader function.

git-svn-id: trunk@43672 -

pierre 5 years ago
parent
commit
8c2aa32683
1 changed files with 3 additions and 10 deletions
  1. 3 10
      compiler/utils/ppuutils/ppudump.pp

+ 3 - 10
compiler/utils/ppuutils/ppudump.pp

@@ -4709,15 +4709,6 @@ begin
        b:=readentry;
        case b of
 
-         ibextraheader:
-           begin
-             CurUnit.LongVersion:=cardinal(getlongint);
-             Writeln(['LongVersion: ',CurUnit.LongVersion]);
-             getset(tppuset4(CurUnit.ModuleFlags));
-             if mf_symansistr in CurUnit.ModuleFlags then
-               SymAnsiStr:=true;
-           end;
-
          ibmodulename :
            begin
              CurUnit.Name:=getstring;
@@ -4908,7 +4899,9 @@ begin
   CurUnit.LongVersion:=cardinal(ppufile.getlongint);
   Writeln(['LongVersion: ',CurUnit.LongVersion]);
   ppufile.getset(tppuset4(CurUnit.ModuleFlags));
-  result:=ppufile.EndOfEntry;
+  result:=ppufile.EndOfEntry and (CurUnit.LongVersion=CurrentPPULongVersion);
+  if mf_symansistr in CurUnit.ModuleFlags then
+    SymAnsiStr:=true;
 end;
 
 procedure dofile (filename : string);