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

Fix for including system headers via macros.

Browse Source 
This makes something like the following work:

#define STDIO_H <stdio.h>
#include STDIO_H

It didn't previously, because workString would be overwritten by NextToken. The effect in this case was that it would erroneously try to include the header <hh>, rather than <stdio.h>.

Detected based on a couple programs from FizzBuzz-C.
This commit is contained in:
Stephen Heumann 2018-09-13 21:59:46 -05:00
parent 95f5ec9c13
commit 60484d6f69
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Scanner.pas
View File

@ -1531,6 +1531,7 @@ const
var
i,j: integer; {string index & loop vars}
tempString: stringPtr;
procedure Expand (var name: pString);
@ -1706,20 +1707,23 @@ else begin
{expand a macro to create a <filename> form name}
NextToken;
workString[0] := chr(0);
new(tempString);
tempString^[0] := chr(0);
while
(token.class in [reservedWord,intconstant,longconstant,doubleconstant])
or (token.kind in [dotch,ident]) do begin
if token.kind = ident then
workstring := concat(workstring, token.name^)
tempString^ := concat(tempString^, token.name^)
else if token.kind = dotch then
workstring := concat(workstring, '.')
tempString^ := concat(tempString^, '.')
else if token.class = reservedWord then
workstring := concat(workstring, reservedWords[token.kind])
tempString^ := concat(tempString^, reservedWords[token.kind])
else {if token.class in [intconst,longconst,doubleconst] then}
workstring := concat(workstring, token.numstring^);
tempString^ := concat(tempString^, token.numstring^);
NextToken;
end; {while}
workString := tempString^;
dispose(tempString);
CheckDelimiters(workString);
if mustExist then begin
if not GetLibraryName(workString) then