Apple-2gs-SW/ORCA-C
1
0
Fork 0
mirror of https://github.com/byteworksinc/ORCA-C.git synced 2024-12-22 23:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Prevent output values of DeclarationSpecifiers from being corrupted by a recursive call to it.

Browse Source 
This could happen in a declaration like "char _Alignas(long) c;", where typeSpec wound up specifying long rather than char.

Also, tweak error checks for _Alignas and _Atomic.
This commit is contained in:
Stephen Heumann 2020-01-12 16:24:31 -06:00
parent 8341f71ffc
commit 84767f3340
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Parser.pas
View File

@ -2568,6 +2568,9 @@ var
typeSpecifiers: tokenSet; {set of tokens specifying the type} typeSpecifiers: tokenSet; {set of tokens specifying the type}
typeDone: boolean; {no more type specifiers can be accepted} typeDone: boolean; {no more type specifiers can be accepted}
myIsForwardDeclared: boolean; {value of isForwardDeclared to generate}
mySkipDeclarator: boolean; {value of skipDeclarator to generate}
myTypeSpec: typePtr; {value of typeSpec to generate}
procedure FieldList (tp: typePtr; kind: typeKind); procedure FieldList (tp: typePtr; kind: typeKind);
@ -2728,57 +2731,57 @@ var
begin {ResolveType} begin {ResolveType}
{See C17 6.7.2} {See C17 6.7.2}
if typeSpecifiers = [voidsy] then if typeSpecifiers = [voidsy] then
typeSpec := voidPtr myTypeSpec := voidPtr
else if typeSpecifiers = [charsy] then else if typeSpecifiers = [charsy] then
typeSpec := uBytePtr myTypeSpec := uBytePtr
else if typeSpecifiers = [signedsy,charsy] then else if typeSpecifiers = [signedsy,charsy] then
typeSpec := bytePtr myTypeSpec := bytePtr
else if typeSpecifiers = [unsignedsy,charsy] then else if typeSpecifiers = [unsignedsy,charsy] then
typeSpec := uBytePtr myTypeSpec := uBytePtr
else if (typeSpecifiers = [shortsy]) else if (typeSpecifiers = [shortsy])
or (typeSpecifiers = [signedsy,shortsy]) or (typeSpecifiers = [signedsy,shortsy])
or (typeSpecifiers = [shortsy,intsy]) or (typeSpecifiers = [shortsy,intsy])
or (typeSpecifiers = [signedsy,shortsy,intsy]) then or (typeSpecifiers = [signedsy,shortsy,intsy]) then
typeSpec := wordPtr myTypeSpec := wordPtr
else if (typeSpecifiers = [unsignedsy,shortsy]) else if (typeSpecifiers = [unsignedsy,shortsy])
or (typeSpecifiers = [unsignedsy,shortsy,intsy]) then or (typeSpecifiers = [unsignedsy,shortsy,intsy]) then
typeSpec := uWordPtr myTypeSpec := uWordPtr
else if (typeSpecifiers = [intsy]) else if (typeSpecifiers = [intsy])
or (typeSpecifiers = [signedsy]) or (typeSpecifiers = [signedsy])
or (typeSpecifiers = [signedsy,intsy]) then begin or (typeSpecifiers = [signedsy,intsy]) then begin
if unix_1 then if unix_1 then
typeSpec := longPtr myTypeSpec := longPtr
else else
typeSpec := wordPtr; myTypeSpec := wordPtr;
end {else if} end {else if}
else if (typeSpecifiers = [unsignedsy]) else if (typeSpecifiers = [unsignedsy])
or (typeSpecifiers = [unsignedsy,intsy]) then begin or (typeSpecifiers = [unsignedsy,intsy]) then begin
if unix_1 then if unix_1 then
typeSpec := uLongPtr myTypeSpec := uLongPtr
else else
typeSpec := uWordPtr; myTypeSpec := uWordPtr;
end {else if} end {else if}
else if (typeSpecifiers = [longsy]) else if (typeSpecifiers = [longsy])
or (typeSpecifiers = [signedsy,longsy]) or (typeSpecifiers = [signedsy,longsy])
or (typeSpecifiers = [longsy,intsy]) or (typeSpecifiers = [longsy,intsy])
or (typeSpecifiers = [signedsy,longsy,intsy]) then or (typeSpecifiers = [signedsy,longsy,intsy]) then
typeSpec := longPtr myTypeSpec := longPtr
else if (typeSpecifiers = [unsignedsy,longsy]) else if (typeSpecifiers = [unsignedsy,longsy])
or (typeSpecifiers = [unsignedsy,longsy,intsy]) then or (typeSpecifiers = [unsignedsy,longsy,intsy]) then
typeSpec := uLongPtr myTypeSpec := uLongPtr
else if typeSpecifiers = [floatsy] then else if typeSpecifiers = [floatsy] then
typeSpec := realPtr myTypeSpec := realPtr
else if typeSpecifiers = [doublesy] then else if typeSpecifiers = [doublesy] then
typeSpec := doublePtr myTypeSpec := doublePtr
else if typeSpecifiers = [longsy,doublesy] then else if typeSpecifiers = [longsy,doublesy] then
typeSpec := extendedPtr myTypeSpec := extendedPtr
else if typeSpecifiers = [compsy] then else if typeSpecifiers = [compsy] then
typeSpec := compPtr myTypeSpec := compPtr
else if typeSpecifiers = [extendedsy] then else if typeSpecifiers = [extendedsy] then
typeSpec := extendedPtr myTypeSpec := extendedPtr
else if typeSpecifiers = [_Boolsy] then begin else if typeSpecifiers = [_Boolsy] then begin
Error(135); Error(135);
typeSpec := wordPtr; myTypeSpec := wordPtr;
end {else if} end {else if}
else else
Error(9); Error(9);
@ -2786,8 +2789,9 @@ var
begin {DeclarationSpecifiers} begin {DeclarationSpecifiers}
isForwardDeclared := false; {not doing a forward reference (yet)} myTypeSpec := typeSpec;
skipDeclarator := false; {declarations are required (so far)} myIsForwardDeclared := false; {not doing a forward reference (yet)}
mySkipDeclarator := false; {declarations are required (so far)}
typeSpecifiers := []; typeSpecifiers := [];
typeDone := false; typeDone := false;
while token.kind in specifierQualifierListElement do begin while token.kind in specifierQualifierListElement do begin
@ -2811,10 +2815,11 @@ while token.kind in specifierQualifierListElement do begin
NextToken; NextToken;
if token.kind = lparench then begin if token.kind = lparench then begin
{_Atomic(typename) as type specifier} {_Atomic(typename) as type specifier}
if typeDone then if typeDone or (typeSpecifiers <> []) then
Error(9); Error(9);
NextToken; NextToken;
TypeName; TypeName;
myTypeSpec := typeSpec;
Match(rparench, 12); Match(rparench, 12);
end; {if} end; {if}
typeDone := true; typeDone := true;
@ -2909,7 +2914,7 @@ while token.kind in specifierQualifierListElement do begin
SkipStatement; SkipStatement;
end; {else} end; {else}
end; {if} end; {if}
1: skipDeclarator := token.kind = semicolonch; 1: mySkipDeclarator := token.kind = semicolonch;
typeDone := true; typeDone := true;
end; end;
@ -2937,7 +2942,7 @@ while token.kind in specifierQualifierListElement do begin
if structPtr <> nil then if structPtr <> nil then
structTypePtr := structPtr^.itype structTypePtr := structPtr^.itype
else begin else begin
isForwardDeclared := true; myIsForwardDeclared := true;
globalStruct := doingParameters and (token.kind <> lbracech); globalStruct := doingParameters and (token.kind <> lbracech);
if globalStruct then begin if globalStruct then begin
lUseGlobalPool := useGlobalPool; lUseGlobalPool := useGlobalPool;
@ -2995,14 +3000,14 @@ while token.kind in specifierQualifierListElement do begin
end; {if} end; {if}
if globalStruct then if globalStruct then
useGlobalPool := lUseGlobalPool; useGlobalPool := lUseGlobalPool;
typeSpec := structTypePtr; myTypeSpec := structTypePtr;
skipDeclarator := token.kind = semicolonch; mySkipDeclarator := token.kind = semicolonch;
typeDone := true; typeDone := true;
end; end;
typedef: begin {named type definition} typedef: begin {named type definition}
if (typeSpecifiers = []) and not typeDone then begin if (typeSpecifiers = []) and not typeDone then begin
typeSpec := token.symbolPtr^.itype; myTypeSpec := token.symbolPtr^.itype;
NextToken; NextToken;
typeDone := true; typeDone := true;
end {if} end {if}
@ -3016,7 +3021,9 @@ while token.kind in specifierQualifierListElement do begin
Match(lparench, 13); Match(lparench, 13);
if token.kind in specifierQualifierListElement then begin if token.kind in specifierQualifierListElement then begin
TypeName; TypeName;
{TODO} with typeSpec^ do
if (size = 0) or ((kind = arrayType) and (elements = 0)) then
Error(133);
end {if} end {if}
else begin else begin
Expression(arrayExpression, [rparench]); Expression(arrayExpression, [rparench]);
@ -3033,6 +3040,9 @@ while token.kind in specifierQualifierListElement do begin
end; {case} end; {case}
end; {while} end; {while}
3: 3:
isForwardDeclared := myIsForwardDeclared;
skipDeclarator := mySkipDeclarator;
typeSpec := myTypeSpec;
if isconstant then begin {handle a constant type} if isconstant then begin {handle a constant type}
new(tPtr); new(tPtr);
if typeSpec^.kind in [structType,unionType] then begin if typeSpec^.kind in [structType,unionType] then begin