Apple-2gs-SW
/
ORCA-C
mirror of https://github.com/byteworksinc/ORCA-C.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip tokens following preprocessing directives on lines that are skipped. 

This allows code like the following to compile:

#if 0
#if some bogus stuff !
#endif
#endif

This is what the C standards require. The change affects #if, #ifdef, and #ifndef directives.

This may be needed to handle code targeted at other compilers that allow pseudo-functions such as "__has_feature" in preprocessor expressions.
This commit is contained in:
Stephen Heumann 2017-06-18 00:03:56 -05:00
parent db2a09bd1d
commit 6ea43d34a1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Scanner.pas
View File

@ -1857,7 +1857,8 @@ var
begin {ProcessIf}
if token.kind <> eolsy then {check for extra stuff on the line}
Error(11);
if not tSkipping then
Error(11);
new(ip); {create a new if record}
ip^.next := ifList;
ifList := ip;
@ -2517,7 +2518,8 @@ if ch in ['a','d','e','i','l','p','u'] then begin
NextToken;
case token.kind of
ifsy: begin
NumericDirective;
if not tSkipping then
NumericDirective;
ProcessIf(expressionValue = 0);
goto 2;
end;
@ -2559,16 +2561,23 @@ if ch in ['a','d','e','i','l','p','u'] then begin
end; {else if}
'i':
if token.name^ = 'if' then begin
NumericDirective;
if not tSkipping then
NumericDirective;
ProcessIf(expressionValue = 0);
goto 2;
end {if}
else if token.name^ = 'ifdef' then begin
ProcessIf(not Defined);
if tSkipping then
ProcessIf(false)
else
ProcessIf(not Defined);
goto 2;
end {else}
else if token.name^ = 'ifndef' then begin
ProcessIf(Defined);
if tSkipping then
ProcessIf(false)
else
ProcessIf(Defined);
goto 2;
end {else}
else if token.name^ = 'include' then begin