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

#2886

Browse source
This commit is contained in:
Ivan Bondarev 2023-07-02 19:46:57 +02:00
parent df15ece659
commit bb8c9543cf
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
TestSuite/generics69.pas Normal file
View file

@ -0,0 +1,11 @@
procedure p2<T>;
begin
var a := new T[1];
//Ошибка: Невозможно преобразовать выражение типа array of T к не реализуемому этим типом интерфейсу IReadOnlyCollection<T>
var c := a as System.Collections.Generic.IReadOnlyCollection<T>;
assert(c.Count = 1);
end;
begin
p2&<integer>;
end.

12
TreeConverter/SystemLib/StaticSystemLib.cs
View file

@ -59,6 +59,7 @@ namespace PascalABCCompiler.SystemLibrary
private static compiled_type_node _ienumerable_interface; private static compiled_type_node _ienumerable_interface;
private static compiled_type_node _ilist1_interface; private static compiled_type_node _ilist1_interface;
private static compiled_type_node _icollection1_interface; private static compiled_type_node _icollection1_interface;
private static compiled_type_node _ireadonlycollection_interface;
private static compiled_type_node _ienumerable1_interface; private static compiled_type_node _ienumerable1_interface;
private static compiled_function_node _delegate_combine_method; private static compiled_function_node _delegate_combine_method;
@ -1177,6 +1178,9 @@ namespace PascalABCCompiler.SystemLibrary
_icollection_interface = compiled_type_node.get_type_node(typeof(ICollection)); _icollection_interface = compiled_type_node.get_type_node(typeof(ICollection));
_ienumerable_interface = compiled_type_node.get_type_node(typeof(IEnumerable)); _ienumerable_interface = compiled_type_node.get_type_node(typeof(IEnumerable));
_ilist1_interface = compiled_type_node.get_type_node(typeof(IList<>)); _ilist1_interface = compiled_type_node.get_type_node(typeof(IList<>));
var t = Type.GetType("System.Collections.Generic.IReadOnlyCollection`1");
if (t != null)
_ireadonlycollection_interface = compiled_type_node.get_type_node(t);
_icollection1_interface = compiled_type_node.get_type_node(typeof(ICollection<>)); _icollection1_interface = compiled_type_node.get_type_node(typeof(ICollection<>));
_ienumerable1_interface = compiled_type_node.get_type_node(typeof(IEnumerable<>)); _ienumerable1_interface = compiled_type_node.get_type_node(typeof(IEnumerable<>));
_assert_method = compiled_function_node.get_compiled_method(typeof(System.Diagnostics.Debug).GetMethod("Assert",new Type[1]{typeof(bool)})); _assert_method = compiled_function_node.get_compiled_method(typeof(System.Diagnostics.Debug).GetMethod("Assert",new Type[1]{typeof(bool)}));
@ -5260,6 +5264,14 @@ namespace PascalABCCompiler.SystemLibrary
} }
} }
public static compiled_type_node ireadonlycollection_interface
{
get
{
return _ireadonlycollection_interface;
}
}
public static compiled_function_node assert_method public static compiled_function_node assert_method
{ {
get get

2
TreeConverter/TreeConversion/type_constructor.cs
View file

@ -109,6 +109,8 @@ namespace PascalABCCompiler.TreeConverter
comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.ilist1_interface.get_instance(type_params)); comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.ilist1_interface.get_instance(type_params));
comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.icollection1_interface.get_instance(type_params)); comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.icollection1_interface.get_instance(type_params));
comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.ienumerable1_interface.get_instance(type_params)); comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.ienumerable1_interface.get_instance(type_params));
if (SystemLibrary.SystemLibrary.ireadonlycollection_interface != null)
comtn.ImplementingInterfaces.Add(SystemLibrary.SystemLibrary.ireadonlycollection_interface.get_instance(type_params));
} }
//SystemLibrary.SystemLibrary.ic //SystemLibrary.SystemLibrary.ic
//(ssyy) Убрал 18.05.08 //(ssyy) Убрал 18.05.08