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

#2416

Browse source
This commit is contained in:
Ivan Bondarev 2021-01-31 12:08:33 +01:00
parent 7614999ea4
commit dbab1c4d2b
5 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
TestSuite/lambdas_generics13.pas Normal file
View file

@ -0,0 +1,14 @@
type
t0 = class
end;
procedure p1<T>;
where T: t0;
begin
var o: T;
var p := procedure -> o := o;
end;
begin
p1&<t0>;
end.

15
TestSuite/lambdas_generics14.pas Normal file
View file

@ -0,0 +1,15 @@
type
t0 = class
//constructor := exit;
end;
procedure p1<T>;
where T: t0, constructor;
begin
var o: T;
var p := procedure -> o := o;
end;
begin
p1&<t0>;
end.

6
TreeConverter/LambdaExpressions/Closure/CapturedVariablesSubstitutor.cs
View file

@ -1079,7 +1079,7 @@ namespace TreeConverter.LambdaExpressions.Closure
whereDef.types.Add(d);
}
if (el.has_default_ctor)
if (el.has_explicit_default_ctor)
{
var d = new declaration_specificator(DeclarationSpecificator.WhereDefConstructor, "constructor");
whereDef.types.Add(d);
@ -1116,7 +1116,11 @@ namespace TreeConverter.LambdaExpressions.Closure
List<generic_parameter_eliminations> lst = generic_parameter_eliminations.make_eliminations_common(_visitor.context._ctn.generic_params);
for (int i = 0; i < lst.Count; i++)
if (!lst[i].has_default_ctor && _visitor.context._ctn.generic_params[i] is common_type_node)
{
lst[i].has_default_ctor = (_visitor.context._ctn.generic_params[i] as common_type_node).has_default_constructor;
lst[i].has_explicit_default_ctor = (_visitor.context._ctn.generic_params[i] as common_type_node).has_explicit_default_constructor;
}
genericParameterEliminations.AddRange(lst);
}

6
TreeConverter/TreeRealization/generics.cs
View file

@ -43,6 +43,7 @@ namespace PascalABCCompiler.TreeRealization
public bool is_class = false;
public bool is_value = false;
public bool has_default_ctor = false;
public bool has_explicit_default_ctor = false;
public type_node base_class = null;
public List<type_node> implementing_interfaces = null;
@ -56,6 +57,7 @@ namespace PascalABCCompiler.TreeRealization
param.methods.AddElement(cnode);
param.add_name(compiler_string_consts.default_constructor_name, new SymbolInfo(cnode));
param.has_default_constructor = true;
param.has_explicit_default_constructor = true;
}
public static List<generic_parameter_eliminations> make_eliminations_common(List<SemanticTree.ICommonTypeNode> generic_params)
@ -65,6 +67,8 @@ namespace PascalABCCompiler.TreeRealization
{
generic_parameter_eliminations gpe = new generic_parameter_eliminations();
gpe.has_default_ctor = generic_convertions.type_has_default_ctor(t, false);
if (t is common_type_node && (t as common_type_node).has_explicit_default_constructor)
gpe.has_explicit_default_ctor = true;
gpe.is_class = t.is_class;
gpe.is_value = t.is_value;
gpe.base_class = t.base_type;
@ -87,6 +91,8 @@ namespace PascalABCCompiler.TreeRealization
gpe.has_default_ctor =
((t.GenericParameterAttributes &
GenericParameterAttributes.DefaultConstructorConstraint) != 0);
if (gpe.has_default_ctor)
gpe.has_explicit_default_ctor = true;
gpe.is_class =
((t.GenericParameterAttributes &
GenericParameterAttributes.ReferenceTypeConstraint) != 0);

1
TreeConverter/TreeRealization/types.cs
View file

@ -1270,6 +1270,7 @@ namespace PascalABCCompiler.TreeRealization
private SymbolTable.ClassScope _scope;
public bool has_default_constructor = false;
public bool has_explicit_default_constructor = false;
public bool has_user_defined_constructor = false;
private bool _has_static_constructor = false;