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

#2594

Browse source
This commit is contained in:
Ivan Bondarev 2021-12-29 12:24:38 +01:00
parent 5c4f818994
commit 60754de5f3
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
NETGenerator/NETGenerator.cs
View file

@ -1272,6 +1272,7 @@ namespace PascalABCCompiler.NETGenerator
private void CloseTypes()
{
//(ssyy) TODO: подумать, в каком порядке создавать типы
List<TypeBuilder> closed_types = new List<TypeBuilder>();
for (int i = 0; i < types.Count; i++)
if (types[i].IsInterface)
try
@ -1298,10 +1299,34 @@ namespace PascalABCCompiler.NETGenerator
}
catch (TypeLoadException ex)
{
SemanticTree.ICommonTypeNode ctn = helper.GetTypeNodeByTypeBuilder(value_types[i]);
if (ctn != null)
{
if (ctn.is_generic_type_definition)
{
bool has_class_contrains = false;
foreach (var gp in ctn.generic_params)
{
if (!(gp.base_type is ICommonTypeNode))
continue;
TypeBuilder tb = helper.GetTypeReference(gp.base_type).tp as TypeBuilder;
if (tb != null)
{
try
{
tb.CreateType();
closed_types.Add(tb);
has_class_contrains = true;
}
catch (TypeLoadException ex2)
{
}
}
}
if (has_class_contrains)
continue;
}
IAttributeNode[] attrs = ctn.Attributes;
if (attrs.Length > 0 && attrs[0].AttributeType is ICompiledTypeNode && (attrs[0].AttributeType as ICompiledTypeNode).compiled_type == typeof(System.Runtime.InteropServices.StructLayoutAttribute))
{
@ -1317,7 +1342,7 @@ namespace PascalABCCompiler.NETGenerator
}
List<TypeBuilder> failed_types = new List<TypeBuilder>();
for (int i = 0; i < types.Count; i++)
if (!types[i].IsInterface)
if (!types[i].IsInterface && !closed_types.Contains(types[i]))
{
try
{

13
TestSuite/genericrecords3.pas Normal file
View file

@ -0,0 +1,13 @@
type
t1 = class end;
t2<T> = record
where T: t1;
a: T;
end;
begin
var r: t2<t1>;
r.a := new t1;
assert(r.a <> nil);
end.