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

bug fix #2134

Browse source
This commit is contained in:
Бондарев Иван 2020-06-28 12:19:55 +02:00
parent bb75fb5231
commit 2eed396ef7
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
TestSuite/delegates14.pas Normal file
View file

@ -0,0 +1,19 @@
uses System;
var i: integer;
procedure Test;
begin
Inc(i);
end;
type TProc = procedure(i: integer);
begin
var d: Delegate := ()->Test();
Action(d);
assert(i = 1);
var d2: Delegate := ()->Test();
TProc(d2);
assert(i = 2);
end.

13
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -5823,6 +5823,7 @@ namespace PascalABCCompiler.TreeConverter
case general_node_type.type_node:
{
type_node tn = (type_node)sn;
check_for_type_allowed(tn, get_location(id_right));
SyntaxTree.operator_name_ident oni_right = id_right as SyntaxTree.operator_name_ident;
if (oni_right != null)
@ -5896,6 +5897,7 @@ namespace PascalABCCompiler.TreeConverter
if (to_type != null)
{
subexpr2 = convertion_data_and_alghoritms.explicit_convert_type(exprs[0], to_type);
}
else
@ -7060,6 +7062,14 @@ namespace PascalABCCompiler.TreeConverter
{
AddError(get_location(_method_call), "ONLY_ONE_PARAMETER_OF_TYPE_CONVERSION_ALLOWED");
}
if (proc_wait && to_type.IsDelegate)
{
var mc = new SyntaxTree.method_call(new SyntaxTree.expression_list());
mc.dereferencing_value = _method_call;
procedure_wait = true;
visit(mc);
return;
}
}
if (_method_call.parameters != null)
@ -7099,11 +7109,14 @@ namespace PascalABCCompiler.TreeConverter
//(ssyy) К вызову функции здесь явно не приводим, т.к. это излишне.
expression_node ee = exprs[0];
bool del = to_type is common_type_node && (to_type as common_type_node).IsDelegate;
if (!del)
try_convert_typed_expression_to_function_call(ref ee);
else
ee = convert_strong(_method_call.parameters.expressions[0]);
expr_node = convertion_data_and_alghoritms.explicit_convert_type(ee, to_type);
//expression_node expr = convert_if_typed_expression_to_function_call(exprs[0]);
//expr_node = convertion_data_and_alghoritms.explicit_convert_type(expr, to_type);
}