paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-23 12:19:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: parse property dispid only in dispinterface

Browse Source 
git-svn-id: trunk@40638 -
This commit is contained in:
Mattias Gaertner 2018-12-25 07:18:12 +00:00
parent 70cadc7694
commit 5c5a524cd4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-passrc/src/pparser.pp
View File

@ -5233,13 +5233,14 @@ function TPasParser.ParseProperty(Parent: TPasElement; const AName: String;
end;
var
isArray , ok: Boolean;
isArray , ok, IsClass: Boolean;
ObjKind: TPasObjKind;
begin
Result:=TPasProperty(CreateElement(TPasProperty,AName,Parent,AVisibility));
if IsClassField then
Include(Result.VarModifiers,vmClass);
if (Parent<>nil) and (Parent.ClassType=TPasClassType) then
IsClass:=(Parent<>nil) and (Parent.ClassType=TPasClassType);
if IsClass then
ObjKind:=TPasClassType(Parent).ObjKind
else
ObjKind:=okClass;
@ -5272,6 +5273,8 @@ begin
Result.WriteAccessorName := GetAccessorName(Result,Result.WriteAccessor);
NextToken;
end;
if IsClass and (ObjKind=okDispInterface) then
begin
if CurTokenIsIdentifier('READONLY') then
begin
Result.DispIDReadOnly:=True;
@ -5282,7 +5285,8 @@ begin
NextToken;
Result.DispIDExpr := DoParseExpression(Result,Nil);
end;
if (ObjKind in [okClass]) and CurTokenIsIdentifier('IMPLEMENTS') then
end;
if IsClass and (ObjKind=okClass) and CurTokenIsIdentifier('IMPLEMENTS') then
ParseImplements;
if CurTokenIsIdentifier('STORED') then
begin