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

* fix #39903: correctly parse anonymous function references in records (and classes/objects)

Browse Source 
+ added test
This commit is contained in:
Sven/Sarah Barth 2022-09-15 22:57:05 +02:00
parent abed465c08
commit 62a57bf82e
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/pdecvar.pas
View File

@ -1711,6 +1711,7 @@ implementation
is_first_type: boolean;
{$endif powerpc or powerpc64}
old_block_type: tblock_type;
typepos : tfileposinfo;
begin
old_block_type:=block_type;
block_type:=bt_var;
@ -1773,6 +1774,7 @@ implementation
if had_generic and (sc.count=0) then
break;
consume(_COLON);
typepos:=current_filepos;
read_anon_type(hdef,false);
maybe_guarantee_record_typesym(hdef,symtablestack.top);
@ -1858,9 +1860,31 @@ implementation
maybe_parse_proc_directives(hdef);
{ Add calling convention for procvar }
if (hdef.typ=procvardef) and
(hdef.typesym=nil) then
handle_calling_convention(tprocvardef(hdef),hcc_default_actions_intf);
if (
(hdef.typ=procvardef) and
(hdef.typesym=nil)
) or is_funcref(hdef) then
begin
if po_is_function_ref in tprocvardef(hdef).procoptions then
begin
if not (m_function_references in current_settings.modeswitches) and
not (po_is_block in tprocvardef(hdef).procoptions) then
messagepos(typepos,sym_e_error_in_type_def)
else
begin
if adjust_funcref(hdef,nil,nil) then
{ the def was changed, so update it }
for i:=0 to sc.count-1 do
begin
fieldvs:=tfieldvarsym(sc[i]);
fieldvs.vardef:=hdef;
end;
if current_scanner.replay_stack_depth=0 then
hdef.register_def;
end;
end;
handle_calling_convention(hdef,hcc_default_actions_intf);
end;
if (vd_object in options) then
begin

18
tests/webtbs/tw39903.pp Normal file
View File

@ -0,0 +1,18 @@
{$mode objfpc}
{$modeswitch functionreferences}
unit tw39903;
interface
type
TCallback = record
proc: reference to procedure;
end;
TObj = class
proc: reference to procedure;
end;
implementation
end.