paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 21:49:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: TPasResolver.ProcHasSelf

Browse Source 
git-svn-id: trunk@47272 -
(cherry picked from commit c4f8070035)
This commit is contained in:
Mattias Gaertner 2020-11-01 18:31:53 +00:00 committed by Florian Klämpfl
parent 5b24dcfba6
commit dd594dedb2
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2341,8 +2341,9 @@ type
function IsClassMethod(El: TPasElement): boolean; function IsClassMethod(El: TPasElement): boolean;
function IsClassField(El: TPasElement): boolean; function IsClassField(El: TPasElement): boolean;
function GetFunctionType(El: TPasElement): TPasFunctionType; function GetFunctionType(El: TPasElement): TPasFunctionType;
function MethodIsStatic(El: TPasProcedure): boolean; function MethodIsStatic(El: TPasProcedure): boolean; // does not check if El is a method
function IsMethod(El: TPasProcedure): boolean; function IsMethod(El: TPasProcedure): boolean;
function IsMethod_SelfIsClass(El: TPasElement): boolean;
function IsHelperMethod(El: TPasElement): boolean; virtual; function IsHelperMethod(El: TPasElement): boolean; virtual;
function IsHelper(El: TPasElement): boolean; function IsHelper(El: TPasElement): boolean;
function IsExternalClass_Name(aClass: TPasClassType; const ExtName: string): boolean; function IsExternalClass_Name(aClass: TPasClassType; const ExtName: string): boolean;
@ -2372,6 +2373,7 @@ type
function GetAttributeCallsEl(El: TPasElement): TPasExprArray; virtual; function GetAttributeCallsEl(El: TPasElement): TPasExprArray; virtual;
function GetAttributeCalls(Members: TFPList; Index: integer): TPasExprArray; virtual; function GetAttributeCalls(Members: TFPList; Index: integer): TPasExprArray; virtual;
function ProcNeedsParams(El: TPasProcedureType): boolean; function ProcNeedsParams(El: TPasProcedureType): boolean;
function ProcHasSelf(El: TPasProcedure): boolean; // returns false for local procs
function IsProcOverride(AncestorProc, DescendantProc: TPasProcedure): boolean; function IsProcOverride(AncestorProc, DescendantProc: TPasProcedure): boolean;
function GetTopLvlProc(El: TPasElement): TPasProcedure; function GetTopLvlProc(El: TPasElement): TPasProcedure;
function GetParentProc(El: TPasElement; GetDeclProc: boolean): TPasProcedure; function GetParentProc(El: TPasElement; GetDeclProc: boolean): TPasProcedure;
@ -28418,7 +28420,7 @@ end;
function TPasResolver.MethodIsStatic(El: TPasProcedure): boolean; function TPasResolver.MethodIsStatic(El: TPasProcedure): boolean;
begin begin
Result:=(ptmStatic in El.ProcType.Modifiers) Result:=El.IsStatic
or (El.ClassType=TPasClassConstructor) or (El.ClassType=TPasClassConstructor)
or (El.ClassType=TPasClassDestructor); or (El.ClassType=TPasClassDestructor);
end; end;
@ -28435,6 +28437,16 @@ begin
Result:=IsMethod(ProcScope.DeclarationProc); Result:=IsMethod(ProcScope.DeclarationProc);
end; end;
function TPasResolver.IsMethod_SelfIsClass(El: TPasElement): boolean;
var
C: TClass;
begin
if (El=nil) then exit(false);
C:=El.ClassType;
Result:=((C=TPasClassProcedure) or (C=TPasClassFunction) or (C=TPasClassOperator))
and not TPasProcedure(El).IsStatic;
end;
function TPasResolver.IsHelperMethod(El: TPasElement): boolean; function TPasResolver.IsHelperMethod(El: TPasElement): boolean;
begin begin
Result:=(El is TPasProcedure) and (El.Parent is TPasClassType) Result:=(El is TPasProcedure) and (El.Parent is TPasClassType)
@ -28995,6 +29007,21 @@ begin
Result:=(El.Args.Count>0) and (TPasArgument(El.Args[0]).ValueExpr=nil); Result:=(El.Args.Count>0) and (TPasArgument(El.Args[0]).ValueExpr=nil);
end; end;
function TPasResolver.ProcHasSelf(El: TPasProcedure): boolean;
var
C: TClass;
begin
if El.IsStatic then
exit(false);
C:=El.Parent.ClassType;
if C.InheritsFrom(TPasSection) or (C=TProcedureBody) then
exit(false);
C:=El.ClassType;
if (C=TPasClassConstructor) or (C=TPasClassDestructor) then
exit(false);
Result:=true;
end;
function TPasResolver.IsProcOverride(AncestorProc, DescendantProc: TPasProcedure function TPasResolver.IsProcOverride(AncestorProc, DescendantProc: TPasProcedure
): boolean; ): boolean;
var var