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

In preprocessor expressions, always replace identifiers with constant 0.

Browse Source 
This was not happening for declared identifiers (variables and functions) or for enum constants, as demonstrated in the following example:

enum {a,b,c};
#if b
#error "bad b"
#endif

int x = 0;
#if x
#error "bad x"
#endif
This commit is contained in:
Stephen Heumann 2020-02-05 12:47:30 -06:00
parent c7371b6709
commit 41cb879936
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Expression.pas
View File

@ -805,8 +805,14 @@ var
fToken := token; fToken := token;
NextToken; NextToken;
{in the preprocessor, all identifiers (post macro replacement) become 0}
if kind = preprocessorExpression then begin
stack^.token.kind := longconst;
stack^.token.lval := 0;
end {if}
{if the id is not declared, create a function returning integer} {if the id is not declared, create a function returning integer}
if id = nil then begin else if id = nil then begin
if token.kind = lparench then begin if token.kind = lparench then begin
fnPtr := pointer(GCalloc(sizeof(typeRecord))); fnPtr := pointer(GCalloc(sizeof(typeRecord)));
{fnPtr^.size := 0;} {fnPtr^.size := 0;}
@ -827,10 +833,6 @@ var
if ((lint & lintUndefFn) <> 0) or ((lint & lintC99Syntax) <> 0) then if ((lint & lintUndefFn) <> 0) or ((lint & lintC99Syntax) <> 0) then
Error(51); Error(51);
end {if} end {if}
else if kind = preprocessorExpression then begin
stack^.token.kind := intconst;
stack^.token.ival := 0;
end {else if}
else begin else begin
Error(31); Error(31);
errorFound := true; errorFound := true;

2
cc.notes
View File

@ -965,6 +965,8 @@ int foo(int[42]);
125. Within character constants, /* or // should not start a comment. 125. Within character constants, /* or // should not start a comment.
126. In a proprocessor expression, any identifiers remaining after macro expansion should be replaced with the constant 0. This did not work correctly for declared variable or function names, nor for enumeration constants.
-- Bugs from C 2.1.0 that have been fixed ----------------------------------- -- Bugs from C 2.1.0 that have been fixed -----------------------------------
1. In some situations, fread() reread the first 1K or so of the file. 1. In some situations, fread() reread the first 1K or so of the file.