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

fix #2191

Browse source
This commit is contained in:
Ivan Bondarev 2020-12-29 16:59:20 +01:00
parent 5d4f7091fe
commit dea6658268
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
TestSuite/errors/err0391.pas Normal file
View file

@ -0,0 +1,13 @@
type
c1<T> = class where T: c1<T>;
end;
c2 = class(c1<List<integer>>)
end;
begin
new c2;
end.

13
TestSuite/where13.pas Normal file
View file

@ -0,0 +1,13 @@
type
c1<T> = class where T: c1<T>;
end;
c2 = class(c1<c2>)
end;
begin
new c2;
end.

6
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -3705,7 +3705,9 @@ namespace PascalABCCompiler.TreeConverter
{
if (context.converted_type.IsStatic)
AddError(get_location(_class_definition), "STATIC_CLASS_CANNOT_HAVE_PARENT");
context.skip_check_where_sections = true;
type_node tn = ret.visit(_class_definition.class_parents.types[0]);
context.skip_check_where_sections = false;
//if (tn == context.converted_type)
if (type_table.original_types_equals(tn, context.converted_type))
AddError(new UndefinedNameReference(tn.name, get_location(_class_definition.class_parents.types[0])));
@ -3737,6 +3739,8 @@ namespace PascalABCCompiler.TreeConverter
//Добавляем интерфейс
used_interfs.Add(tn, tn);
type_table.AddInterface(context.converted_type, tn, get_location(_class_definition.class_parents.types[0]));
if (tn.is_generic_type_instance)
ret.visit(_class_definition.class_parents.types[0]);
}
else
{
@ -3749,6 +3753,8 @@ namespace PascalABCCompiler.TreeConverter
AddError(get_location(_class_definition.class_parents.types[0]), "CAN_NOT_INHERIT_FROM_GENERIC_PARAMETER");
}
context.converted_type.SetBaseType(tn);
if (tn.is_generic_type_instance)
ret.visit(_class_definition.class_parents.types[0]);
var type_instances = generic_convertions.get_type_instances(context.converted_type);
if (type_instances != null)
foreach (generic_type_instance_info gti in type_instances)