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

fix pascalabcnet/pascalabcnet#2438

Browse source
This commit is contained in:
Sun Serega 2021-02-08 20:10:03 +02:00
parent 83f267879e
commit 403e028cb9
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
TestSuite/partial_constructor.pas Normal file
View file

@ -0,0 +1,14 @@
var x := 1;
type
t1 = partial class end;
t0 = class
constructor := x := 2;
end;
t1 = partial class(t0) end;
begin
new t1;
Assert(x = 2);
end.

24
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -19368,12 +19368,24 @@ namespace PascalABCCompiler.TreeConverter
context.set_field_access_level(pconstr.field_access_level);
else
context.set_field_access_level(mconstr.field_access_level);
common_method_node gen_constr = context.create_function(compiler_string_consts.default_constructor_name, loc) as common_method_node;
gen_constr.polymorphic_state = ps;
gen_constr.is_overload = true;
gen_constr.is_constructor = true;
gen_constr.field_access_level = fn.field_access_level;
gen_constr.return_value_type = _ctn;
common_method_node gen_constr = null;
if (fn.parameters.Count==0)
gen_constr = _ctn.methods.FirstOrDefault(m =>
m.is_constructor && m.name==compiler_string_consts.default_constructor_name && m.parameters.Count==0
);
if (gen_constr!=null)
{
context.func_stack.push(gen_constr);
} else {
gen_constr = context.create_function(compiler_string_consts.default_constructor_name, loc) as common_method_node;
gen_constr.polymorphic_state = ps;
gen_constr.is_overload = true;
gen_constr.is_constructor = true;
gen_constr.field_access_level = fn.field_access_level;
gen_constr.return_value_type = _ctn;
}
foreach (parameter par in fn.parameters)
{