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

fix #2924

Browse source
This commit is contained in:
Ivan Bondarev 2023-11-13 21:43:01 +01:00
parent 20f618b7aa
commit 475af1cb30
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
TestSuite/lambda_capture_const.pas Normal file
View file

@ -0,0 +1,23 @@
var i: integer;
type
c1 = class
en1: (const1, const2);
procedure pr1;
begin
var v1: c1 := self;
en1 := const2;
var f: ()-> ();
f := ()-> begin
assert(v1.en1 = const2);
i := 1;
end;
f;
end;
end;
begin
var o := new c1;
o.pr1;
assert(i = 1);
end.

9
TreeConverter/LambdaExpressions/Closure/CapturedVariablesTreeBuilder.cs
View file

@ -216,7 +216,7 @@ namespace TreeConverter.LambdaExpressions.Closure
si.sym_info.semantic_node_type == semantic_node_type.template_type || si.sym_info.semantic_node_type == semantic_node_type.template_type ||
si.sym_info.semantic_node_type == semantic_node_type.ref_type_node || si.sym_info.semantic_node_type == semantic_node_type.ref_type_node ||
si.sym_info.semantic_node_type == semantic_node_type.generic_indicator || si.sym_info.semantic_node_type == semantic_node_type.generic_indicator ||
si.sym_info.semantic_node_type == semantic_node_type.class_constant_definition || //si.sym_info.semantic_node_type == semantic_node_type.class_constant_definition ||
si.sym_info.semantic_node_type == semantic_node_type.function_constant_definition || // SSM 03.11.18 bug fix #1449 si.sym_info.semantic_node_type == semantic_node_type.function_constant_definition || // SSM 03.11.18 bug fix #1449
si.sym_info.semantic_node_type == semantic_node_type.basic_function_node && (idName == "exit" || idName == "continue" || idName == "break")) si.sym_info.semantic_node_type == semantic_node_type.basic_function_node && (idName == "exit" || idName == "continue" || idName == "break"))
{ {
@ -235,6 +235,7 @@ namespace TreeConverter.LambdaExpressions.Closure
// Добавил такое же переименование для статичесских полей класса. Теперь захват работает // Добавил такое же переименование для статичесских полей класса. Теперь захват работает
if ((si.sym_info.semantic_node_type == semantic_node_type.class_field || si.sym_info.semantic_node_type == semantic_node_type.common_method_node if ((si.sym_info.semantic_node_type == semantic_node_type.class_field || si.sym_info.semantic_node_type == semantic_node_type.common_method_node
|| si.sym_info.semantic_node_type == semantic_node_type.common_event || si.sym_info.semantic_node_type == semantic_node_type.common_property_node || si.sym_info.semantic_node_type == semantic_node_type.common_event || si.sym_info.semantic_node_type == semantic_node_type.common_property_node
|| si.sym_info.semantic_node_type == semantic_node_type.class_constant_definition
|| si.sym_info.semantic_node_type == semantic_node_type.basic_property_node) && InLambdaContext) || si.sym_info.semantic_node_type == semantic_node_type.basic_property_node) && InLambdaContext)
{ {
dot_node dn = null; dot_node dn = null;
@ -252,11 +253,17 @@ namespace TreeConverter.LambdaExpressions.Closure
return new ident(classNode.name); return new ident(classNode.name);
} }
}; };
if (si.sym_info is class_field classField && classField.IsStatic) if (si.sym_info is class_field classField && classField.IsStatic)
{ {
dn = new dot_node(getClassIdent(classField.cont_type), dn = new dot_node(getClassIdent(classField.cont_type),
new ident(id.name, id.source_context), id.source_context); new ident(id.name, id.source_context), id.source_context);
} }
else if (si.sym_info is class_constant_definition ccd)
{
dn = new dot_node(getClassIdent(ccd.comperehensive_type),
new ident(id.name, id.source_context), id.source_context);
}
else if (si.sym_info is common_method_node commonMethodNode && commonMethodNode.IsStatic) else if (si.sym_info is common_method_node commonMethodNode && commonMethodNode.IsStatic)
{ {
dn = new dot_node(getClassIdent(commonMethodNode.cont_type), dn = new dot_node(getClassIdent(commonMethodNode.cont_type),