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

fix #1512

Browse source
This commit is contained in:
Бондарев Иван 2020-08-23 13:57:30 +02:00
parent 46ce289724
commit acaabbb319
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
TestSuite/delegates15.pas Normal file
View file

@ -0,0 +1,13 @@
function f1(b: byte) := b;
function f2 := 2;
type fnc = function(b: byte): byte;
begin
var o1: object := f1;
var f: fnc := fnc(o1);
assert(f(2) = 2);
var o2: object := f2;
assert(integer(o2) = 2);
o1 := f1;
f := fnc(o1);
assert(f(2) = 2);
end.

7
TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs
View file

@ -662,7 +662,12 @@ namespace PascalABCCompiler.TreeConverter
} }
en.location = loc; en.location = loc;
if (en.type is delegated_methods dm && dm.proper_methods[0].parameters.Count == 0 && dm.proper_methods[0].ret_type != null) if (en.type is delegated_methods dm && dm.proper_methods[0].parameters.Count == 0 && dm.proper_methods[0].ret_type != null)
AddError(new CanNotConvertTypes(en, dm.proper_methods[0].ret_type, to, loc)); // SSM 18/06/20 #2261 {
if (to != SystemLibrary.SystemLibrary.object_type)
AddError(new CanNotConvertTypes(en, dm.proper_methods[0].ret_type, to, loc)); // SSM 18/06/20 #2261
else
return en;
}
else if (en.type is undefined_type && en is base_function_call bfc) else if (en.type is undefined_type && en is base_function_call bfc)
throw new SimpleSemanticError(loc, "RETURN_TYPE_UNDEFINED_{0}", bfc.function.name); throw new SimpleSemanticError(loc, "RETURN_TYPE_UNDEFINED_{0}", bfc.function.name);
else AddError(new CanNotConvertTypes(en, en.type, to, loc)); else AddError(new CanNotConvertTypes(en, en.type, to, loc));