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

bug fix #327

Browse source
This commit is contained in:
Бондарев Иван 2017-01-10 13:31:39 +01:00
parent 5d9c774ea0
commit 1d31faee2b
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
TestSuite/extensionmethods19.pas Normal file
View file

@ -0,0 +1,5 @@
begin
var a := Arr(1,3,5,4,3);
var b := a.Println.ToArray;
assert(b[2] = 5);
end.

24
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -8969,6 +8969,30 @@ namespace PascalABCCompiler.TreeConverter
{ {
return new indefinite_reference(dn as indefinite_definition_node, get_location(id_right)); return new indefinite_reference(dn as indefinite_definition_node, get_location(id_right));
} }
if (expected_delegate && en != null)
{
SymbolInfo tmp_si = si;
function_node tmp_fn = null;
bool has_empty_methods = false;
bool only_extension_methods = true;
while (tmp_si != null)
{
tmp_fn = tmp_si.sym_info as function_node;
if (tmp_fn != null)
{
if (!tmp_fn.is_extension_method)
only_extension_methods = false;
else
{
if (tmp_fn.parameters.Count == 1 || tmp_fn.parameters.Count == 2 && (tmp_fn.parameters[1].is_params || tmp_fn.parameters[1].default_value != null))
has_empty_methods = true;
}
}
tmp_si = tmp_si.Next;
}
if (has_empty_methods && only_extension_methods)
expected_delegate = false;
}
if (expected_delegate) if (expected_delegate)
return make_delegate_wrapper(en, si, get_location(id_right), false); return make_delegate_wrapper(en, si, get_location(id_right), false);
else else