Apple-2gs-SW/ORCA-C
1
0
Fork 0
mirror of https://github.com/byteworksinc/ORCA-C.git synced 2025-01-02 19:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Show "Including ..." lines for all headers when using a sym file.

Browse Source 
Previously, only the last header from a group of headers represented together would be listed.
This commit is contained in:
Stephen Heumann 2023-03-20 17:22:13 -05:00
parent cc36e9929f
commit be291b2423
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Header.pas
View File

@ -1204,7 +1204,7 @@ type
var
done: boolean; {for loop termination test}
typeDispList: typeDispPtr; {type displacement/pointer table}
includeFileName: gsosInStringPtr; {name of include file}
includesPtr: ptr; {ptr to includes section from sym file}
i: 1..maxint; {loop/index variable}
@ -1305,7 +1305,6 @@ var
while len > 0 do begin
giRec.pCount := 7;
giRec.pathname := pointer(ReadLongString);
includeFileName := giRec.pathname; {save name to print later}
len := len - (giRec.pathname^.size + 18);
GetFileInfoGS(giRec);
if ToolError = 0 then begin
@ -1323,6 +1322,34 @@ var
end; {DatesMatch}
procedure PrintIncludes;
{ Print "Including ..." lines for the headers }
type
longptr = ^longint;
var
dataPtr: ptr; {pointer to data from sym file}
endPtr: ptr; {pointer to end of includes section}
i: 1..maxint; {loop/index variable}
includeNamePtr: gsosInStringPtr; {pointer to an include file name}
begin {PrintIncludes}
dataPtr := includesPtr;
endPtr := pointer(ord4(dataPtr) + longptr(dataPtr)^ + 4);
dataPtr := pointer(ord4(dataPtr) + 4);
while dataPtr <> endPtr do begin
includeNamePtr := gsosInStringPtr(dataPtr);
write('Including ');
for i := 1 to includeNamePtr^.size do
write(includeNamePtr^.theString[i]);
writeln;
dataPtr := pointer(ord4(dataPtr) + includeNamePtr^.size + 18);
end; {while}
end; {PrintIncludes}
procedure ReadMacroTable;
{ Read macros from the symbol file }
@ -1980,14 +2007,11 @@ if not ignoreSymbols then begin
PurgeSymbols;
typeDispList := nil;
while not done do begin
includesPtr := symPtr;
if DatesMatch then begin
if SourceMatches then begin
if progress then begin
write('Including ');
for i := 1 to includeFileName^.size do
write(includeFileName^.theString[i]);
writeln;
end; {if}
if progress then
PrintIncludes;
ReadMacroTable;
ReadSymbolTable;
ReadPragmas;

2
cc.notes
View File

@ -2150,6 +2150,8 @@ int foo(int[42]);
239. If a listing was produced using the +L option when a Defaults.h file was present, an extra blank first line would be listed (in ORCA/C 2.1) or the first line of the source file would be listed twice (in ORCA/C 2.2 betas).
240. If a .sym file was in use, ORCA/C might not print "Including ..." messages for certain header files.
-- Bugs from C 2.1.0 that have been fixed -----------------------------------
1. In some situations, fread() reread the first 1K or so of the file.