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

fix #1009

Browse source
This commit is contained in:
Бондарев Иван 2018-08-09 20:34:01 +02:00
parent 40f0e6af8c
commit ff319e3920
3 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
TestSuite/lambdas_events.pas Normal file
View file

@ -0,0 +1,31 @@
var i: integer;
procedure test;
begin
i := 1;
end;
type
t1 = class
public event Elap: procedure;
procedure p1(b:byte);
begin
var p: procedure := ()->
begin
b := 0;
if self.Elap <> nil then
self.Elap()
end;
p;
end;
end;
begin
var o := new t1;
o.Elap += test;
o.p1(2);
assert(i=1);
end.

11
TreeConverter/TreeConversion/LambdaHelper.cs
View file

@ -142,6 +142,17 @@ namespace PascalABCCompiler.TreeConverter
return id.Contains(lambdaPrefix);
}
public static bool IsCapturedSelf(expression_node ex)
{
if (ex is class_field_reference)
{
class_field fld = (ex as class_field_reference).field;
if (fld.name.Contains("<>local_variables_class"))
return true;
}
return false;
}
public static bool IsAuxiliaryLambdaName(ident id)
{
if (id == null)

4
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -9171,7 +9171,7 @@ namespace PascalABCCompiler.TreeConverter
private expression_node expression_value_reciving(SyntaxTree.ident id_right, List<SymbolInfo> sil, expression_node en, bool expected_delegate)
{
general_node_type[] node_types;
if (en is this_node)
if (en is this_node || LambdaHelper.IsCapturedSelf(en))
node_types = new general_node_type[] { general_node_type.variable_node,
general_node_type.function_node, general_node_type.property_node, general_node_type.constant_definition, general_node_type.event_node};
else
@ -16472,7 +16472,7 @@ namespace PascalABCCompiler.TreeConverter
{
if ((left as static_event_reference).en is compiled_event)
AddError(left.location, "EVENT_{0}_MUST_BE_IN_LEFT_PART", (left as static_event_reference).en.name);
if (context.converted_type != null && context.converted_type != ((left as static_event_reference).en as common_event).cont_type)
if (context.converted_type != null && context.converted_type != ((left as static_event_reference).en as common_event).cont_type && !context.converted_type.name.Contains("<>local_variables_class"))
AddError(left.location, "EVENT_{0}_MUST_BE_IN_LEFT_PART", (left as static_event_reference).en.name);
}
else if (right is static_event_reference)