Apple-2gs-SW/ORCA-C
1
0
Fork 0
mirror of https://github.com/byteworksinc/ORCA-C.git synced 2024-06-11 13:29:36 +00:00
Code Issues Projects Releases Wiki Activity

Remove an unused string representation of macro tokens.

Browse Source 
The string representation of macro tokens is needed for some preprocessor operations, but we get this in other ways (e.g. based on tokenStart/tokenEnd).
This commit is contained in:
Stephen Heumann 2022-02-21 18:39:39 -06:00
parent 8f27b8abdb
commit 6cfe8cc886
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Header.pas
View File

@ -18,7 +18,7 @@ uses CCommon, MM, Scanner, Symbol, CGI;
{$segment 'SCANNER'} {$segment 'SCANNER'}
const const
symFileVersion = 23; {version number of .sym file format} symFileVersion = 24; {version number of .sym file format}
var var
inhibitHeader: boolean; {should .sym includes be blocked?} inhibitHeader: boolean; {should .sym includes be blocked?}
@ -744,7 +744,6 @@ procedure EndInclude {chPtr: ptr};
tp := mp^.tokens; {loop over token list} tp := mp^.tokens; {loop over token list}
while tp <> nil do begin while tp <> nil do begin
WriteByte(1); {write tokenListRecord} WriteByte(1); {write tokenListRecord}
WriteLongString(tp^.tokenString);
WriteToken(tp^.token); WriteToken(tp^.token);
WriteByte(ord(tp^.expandEnabled)); WriteByte(ord(tp^.expandEnabled));
WriteChars(tp^.tokenStart, tp^.tokenEnd); WriteChars(tp^.tokenStart, tp^.tokenEnd);
@ -1387,7 +1386,6 @@ var
while ReadByte <> 0 do begin while ReadByte <> 0 do begin
tp := pointer(GMalloc(sizeof(tokenListRecord))); tp := pointer(GMalloc(sizeof(tokenListRecord)));
tp^.next := nil; tp^.next := nil;
tp^.tokenString := ReadLongString;
ReadToken(tp^.token); ReadToken(tp^.token);
tp^.expandEnabled := boolean(ReadByte); tp^.expandEnabled := boolean(ReadByte);
ReadChars(tp^.tokenStart, tp^.tokenEnd); ReadChars(tp^.tokenStart, tp^.tokenEnd);

16
Scanner.pas
View File

@ -46,7 +46,6 @@ type
tokenListRecordPtr = ^tokenListRecord; tokenListRecordPtr = ^tokenListRecord;
tokenListRecord = record {element of a list of tokens} tokenListRecord = record {element of a list of tokens}
next: tokenListRecordPtr; {next element in list} next: tokenListRecordPtr; {next element in list}
tokenString: longStringPtr; {string making up the token}
token: tokenType; {token} token: tokenType; {token}
expandEnabled: boolean; {can this token be macro expanded?} expandEnabled: boolean; {can this token be macro expanded?}
tokenStart,tokenEnd: ptr; {token start/end markers} tokenStart,tokenEnd: ptr; {token start/end markers}
@ -2459,11 +2458,6 @@ var
pnum: integer; {for counting parameters} pnum: integer; {for counting parameters}
tPtr,tk1,tk2: tokenListRecordPtr; {pointer to a token} tPtr,tk1,tk2: tokenListRecordPtr; {pointer to a token}
{for building token strings}
sptr: longStringPtr; {token string work pointer}
tcp: ptr; {temp character pointer}
slen: integer; {token string length}
begin {DoDefine} begin {DoDefine}
expandMacros := false; {block expansions} expandMacros := false; {block expansions}
saveNumber := true; {save characters in numeric tokens} saveNumber := true; {save characters in numeric tokens}
@ -2584,15 +2578,6 @@ var
tPtr^.tokenStart := tokenStart; tPtr^.tokenStart := tokenStart;
tPtr^.tokenEnd := tokenEnd; tPtr^.tokenEnd := tokenEnd;
tPtr^.expandEnabled := true; tPtr^.expandEnabled := true;
slen := ord(ord4(chPtr) - ord4(tokenStart));
sptr := pointer(GMalloc(slen+2));
sptr^.length := slen;
tcp := tokenStart;
for i := 1 to slen do begin
sptr^.str[i] := chr(tcp^);
tcp := pointer(ord4(tcp)+1);
end; {for}
tPtr^.tokenString := sptr;
NextToken; NextToken;
end; {while} end; {while}
mPtr^.readOnly := false; mPtr^.readOnly := false;
@ -4365,7 +4350,6 @@ repeat
new(mp^.tokens); new(mp^.tokens);
with mp^.tokens^ do begin with mp^.tokens^ do begin
next := nil; next := nil;
tokenString := @'';
expandEnabled := true; expandEnabled := true;
end; {with} end; {with}
token.kind := intconst; {create the default value} token.kind := intconst; {create the default value}