paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 10:19:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: resolver: nicer error message on invalid set element type

Browse Source 
git-svn-id: trunk@41157 -
This commit is contained in:
Mattias Gaertner 2019-01-31 22:36:47 +00:00
parent 8d368b0c21
commit e9c8d9b1b7
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/fcl-passrc/src/pasresolver.pp
View File

@ -2348,6 +2348,8 @@ begin
Result:=ExprKindNames[TBinaryExpr(El).Kind]
else if C=TPasClassType then
Result:=ObjKindNames[TPasClassType(El).ObjKind]
else if C=TPasUnresolvedSymbolRef then
Result:=El.Name
else
begin
Result:=GetElementTypeName(TPasElementBaseClass(C));
@ -5343,6 +5345,14 @@ begin
end;
procedure TPasResolver.FinishSetType(El: TPasSetType);
function GetEnumTypePosEl: TPasElement;
begin
Result:=El.EnumType;
if Result.Parent<>El then
Result:=El;
end;
var
BaseTypeData: TResElDataBaseType;
StartResolved, EndResolved: TPasResolverResult;
@ -5372,10 +5382,12 @@ begin
BaseTypeData:=TResElDataBaseType(EnumType.CustomData);
if BaseTypeData.BaseType in (btAllChars+[btBoolean,btByte]) then
exit;
RaiseXExpectedButYFound(20170216151553,'char or boolean',GetElementTypeName(EnumType),EnumType);
RaiseXExpectedButYFound(20170216151553,'char or boolean',
GetElementTypeName(EnumType),GetEnumTypePosEl);
end;
end;
RaiseXExpectedButYFound(20170216151557,'enum type',GetElementTypeName(EnumType),EnumType);
RaiseXExpectedButYFound(20170216151557,'enum type',
GetElementTypeName(EnumType),GetEnumTypePosEl);
end;
procedure TPasResolver.FinishSubElementType(Parent: TPasElement; El: TPasType);