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

Merge branch 'FixVisibility' into 'main'

Browse Source 
Fix for visibility information when a function is a publish declaration.

See merge request freepascal.org/fpc/source!920
This commit is contained in:
Henrique Gottardi Werlang 2025-04-03 20:48:25 -03:00
commit 395b9d9857
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/pastojs/src/fppas2js.pp
View File

@ -20945,11 +20945,14 @@ var
ResultTypeInfo: TJSElement; ResultTypeInfo: TJSElement;
Call: TJSCallExpression; Call: TJSCallExpression;
Flags: Integer; Flags: Integer;
ExtVis: word; ExtVis: Integer;
procedure AddExtRTTIVisibility; procedure AddExtRTTIVisibility;
begin begin
Call.AddArg(CreateLiteralNumber(Proc,ExtVis)); if ExtVis > -1 then
Call.AddArg(CreateLiteralNumber(Proc,ExtVis));
ExtVis := -1;
end; end;
procedure AddOption(const aName: String; JS: TJSElement); procedure AddOption(const aName: String; JS: TJSElement);
@ -20959,8 +20962,7 @@ var
if JS=nil then exit; if JS=nil then exit;
if OptionsEl=nil then if OptionsEl=nil then
begin begin
if ExtVis=ExtRTTIVisDefaultMethod then AddExtRTTIVisibility;
AddExtRTTIVisibility;
OptionsEl:=TJSObjectLiteral(CreateElement(TJSObjectLiteral,Proc)); OptionsEl:=TJSObjectLiteral(CreateElement(TJSObjectLiteral,Proc));
Call.AddArg(OptionsEl); Call.AddArg(OptionsEl);
end; end;
@ -21054,10 +21056,19 @@ begin
ResultEl:=TPasFunction(Proc).FuncType.ResultEl; ResultEl:=TPasFunction(Proc).FuncType.ResultEl;
ResultTypeInfo:=CreateTypeInfoRef(ResultEl.ResultType,AContext,ResultEl); ResultTypeInfo:=CreateTypeInfoRef(ResultEl.ResultType,AContext,ResultEl);
if ResultTypeInfo<>nil then if ResultTypeInfo<>nil then
begin
AddExtRTTIVisibility;
Call.AddArg(ResultTypeInfo); Call.AddArg(ResultTypeInfo);
end;
end; end;
if (ResultTypeInfo=nil) and ((Flags>0) or (length(Attr)>0)) then if (ResultTypeInfo=nil) and ((Flags>0) or (length(Attr)>0)) then
begin
AddExtRTTIVisibility;
Call.AddArg(CreateLiteralNull(Proc)); Call.AddArg(CreateLiteralNull(Proc));
end;
// flags if needed // flags if needed
if (Flags>0) or (length(Attr)>0) then if (Flags>0) or (length(Attr)>0) then