paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-29 09:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: fixed no hint when published method hides ancestor method

Browse Source
This commit is contained in:
mattias 2021-03-17 18:22:40 +00:00
parent 2e409dda39
commit 412a9b37df
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/packages/fcl-passrc/src/pasresolver.pp
View File

@ -5485,7 +5485,9 @@ begin
if (Proc.Visibility=visStrictPrivate) if (Proc.Visibility=visStrictPrivate)
or ((Proc.Visibility=visPrivate) or ((Proc.Visibility=visPrivate)
and (Proc.GetModule<>Data^.Proc.GetModule)) then and (Proc.GetModule<>Data^.Proc.GetModule)) then
// a private private is hidden by definition -> no hint // a private method is hidden by definition -> no hint
else if (Proc.Visibility=visPublished) then
// a published can hide (used for overloading rtti) -> no hint
else if (ProcScope.ImplProc<>nil) // not abstract, external else if (ProcScope.ImplProc<>nil) // not abstract, external
and (not ProcHasImplElements(ProcScope.ImplProc)) then and (not ProcHasImplElements(ProcScope.ImplProc)) then
// hidden method has implementation, but no statements -> useless // hidden method has implementation, but no statements -> useless

54
compiler/packages/pastojs/tests/tcmodules.pas
View File

@ -811,6 +811,7 @@ type
Procedure TestRTTI_DynArray; Procedure TestRTTI_DynArray;
Procedure TestRTTI_ArrayNestedAnonymous; Procedure TestRTTI_ArrayNestedAnonymous;
Procedure TestRTTI_PublishedMethodOverloadFail; Procedure TestRTTI_PublishedMethodOverloadFail;
Procedure TestRTTI_PublishedMethodHideNoHint;
Procedure TestRTTI_PublishedMethodExternalFail; Procedure TestRTTI_PublishedMethodExternalFail;
Procedure TestRTTI_PublishedClassPropertyFail; Procedure TestRTTI_PublishedClassPropertyFail;
Procedure TestRTTI_PublishedClassFieldFail; Procedure TestRTTI_PublishedClassFieldFail;
@ -29450,6 +29451,59 @@ begin
ConvertProgram; ConvertProgram;
end; end;
procedure TTestModule.TestRTTI_PublishedMethodHideNoHint;
begin
WithTypeInfo:=true;
StartUnit(false);
Add([
'interface',
'type',
' TObject = class',
' end;',
' {$M+}',
' TBird = class',
' procedure Fly;',
' end;',
' {$M-}',
'type',
' TEagle = class(TBird)',
' procedure Fly;',
' end;',
'implementation',
'procedure TBird.Fly;',
'begin',
'end;',
'procedure TEagle.Fly;',
'begin',
'end;',
'']);
ConvertUnit;
CheckSource('TestRTTI_PublishedMethodHideNoHint',
LinesToStr([ // statements
'rtl.createClass(this, "TObject", null, function () {',
' this.$init = function () {',
' };',
' this.$final = function () {',
' };',
'});',
'rtl.createClass(this, "TBird", this.TObject, function () {',
' this.Fly = function () {',
' };',
' var $r = this.$rtti;',
' $r.addMethod("Fly", 0, null);',
'});',
'rtl.createClass(this, "TEagle", this.TBird, function () {',
' this.Fly = function () {',
' };',
' var $r = this.$rtti;',
' $r.addMethod("Fly", 0, null);',
'});',
'']),
LinesToStr([ // $mod.$main
]));
CheckResolverUnexpectedHints(true);
end;
procedure TTestModule.TestRTTI_PublishedMethodExternalFail; procedure TTestModule.TestRTTI_PublishedMethodExternalFail;
begin begin
WithTypeInfo:=true; WithTypeInfo:=true;