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

#2599

Browse source
This commit is contained in:
Ivan Bondarev 2022-01-01 14:04:50 +01:00
parent 1368210c79
commit 1e7163e211
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
NETGenerator/NETGenerator.cs
View file

@ -1291,6 +1291,7 @@ namespace PascalABCCompiler.NETGenerator
for (int i = 0; i < enums.Count; i++)
enums[i].CreateType();
List<TypeBuilder> failed_types = new List<TypeBuilder>();
for (int i = 0; i < value_types.Count; i++)
{
try
@ -1302,9 +1303,10 @@ namespace PascalABCCompiler.NETGenerator
SemanticTree.ICommonTypeNode ctn = helper.GetTypeNodeByTypeBuilder(value_types[i]);
if (ctn != null)
{
if (ctn.is_generic_type_definition)
if (ctn.is_generic_type_definition || ctn.ImplementingInterfaces != null && ctn.ImplementingInterfaces.Count > 0)
{
bool has_class_contrains = false;
if (ctn.generic_params != null)
foreach (var gp in ctn.generic_params)
{
if (!(gp.base_type is ICommonTypeNode))
@ -1326,21 +1328,20 @@ namespace PascalABCCompiler.NETGenerator
}
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))
{
throw new PascalABCCompiler.Errors.CommonCompilerError(ex.Message, ctn.Location.document.file_name, ctn.Location.begin_line_num, ctn.Location.begin_column_num);
}
else
{
failed_types.Add(value_types[i]);
continue;
}
}
throw new PascalABCCompiler.Errors.CommonCompilerError(ex.Message, ctn.Location.document.file_name, ctn.Location.begin_line_num, ctn.Location.begin_column_num);
//throw ex;
}
else
throw ex;
}
}
List<TypeBuilder> failed_types = new List<TypeBuilder>();
for (int i = 0; i < types.Count; i++)
if (!types[i].IsInterface && !closed_types.Contains(types[i]))
{
@ -1354,8 +1355,20 @@ namespace PascalABCCompiler.NETGenerator
}
}
for (int i = 0; i < failed_types.Count; i++)
try
{
failed_types[i].CreateType();
}
catch (TypeLoadException ex)
{
SemanticTree.ICommonTypeNode ctn = helper.GetTypeNodeByTypeBuilder(failed_types[i]);
if (ctn != null)
throw new PascalABCCompiler.Errors.CommonCompilerError(ex.Message, ctn.Location.document.file_name, ctn.Location.begin_line_num, ctn.Location.begin_column_num);
else
throw ex;
}
}
//перевод тела
private void ConvertBody(IStatementNode body)

13
TestSuite/genericrecords4.pas Normal file
View file

@ -0,0 +1,13 @@
type
t1<T> = class end;
i1<T> = interface end;
//Ошибка: Could not load type '0.t1' from assembly '0, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'.
t2<T> = record(i1<t1<T>>)
end;
t3 = record(i1<t1<integer>>)
end;
begin
var r: t2<integer>;
var r2: t3;
end.