administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

#2595

Browse source
This commit is contained in:
Ivan Bondarev 2021-12-29 15:02:15 +01:00
parent db48b41fd0
commit 1368210c79
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
TestSuite/generics60.pas Normal file
View file

@ -0,0 +1,16 @@
type
t1<T> = class
function f<T2>(o: T2) := default(T);
end;
function f<T>: T;
begin
var o: t1<T> := new t1<T>;
Result := o.f(0);
end;
begin
assert(f&<integer> = 0);
end.

2
TreeConverter/TreeRealization/generics.cs
View file

@ -1746,7 +1746,7 @@ namespace PascalABCCompiler.TreeRealization
cmn.overrided_method = common_orig.overrided_method;
if (orig_fn.is_generic_function)
{
cmn.return_value_type = generic_convertions.determine_type(cmn.return_value_type, meth_inst_pars, true);
cmn.return_value_type = generic_convertions.determine_type(cmn.return_value_type, meth_inst_pars, true, orig_tpars);
}
if (orig_fn is common_function_node)
{