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

bug fix #350

Browse source
This commit is contained in:
Бондарев Иван 2017-03-22 21:22:29 +01:00
parent 3bcb51be51
commit 65744db1fa
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
TestSuite/generics11.pas Normal file
View file

@ -0,0 +1,11 @@
var i: integer;
procedure Right;
begin
Inc(i);
end;
begin
var t1 := Arr(Right,Right);
t1[0];
t1[1];
assert(i=2);
end.

1
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -168,6 +168,7 @@ namespace PascalABCCompiler.TreeConverter
init_properties);
SystemLibrary.SystemLibrary.system_unit = _system_unit;
generic_convertions.reset_generics();
generic_convertions.visitor = this;
_record_created = false;
RefTypesForCheckPointersTypeForDotNetFramework.Clear();
reset_for_interface();

14
TreeConverter/TreeRealization/generics.cs
View file

@ -196,6 +196,7 @@ namespace PascalABCCompiler.TreeRealization
}
//Вспомогательный класс для создания псевдо-инстанций generic-типов.
//TODO: sdelat singletonom. staticheskie klassy eto gadost
public static class generic_convertions
{
//Список, хранящий все псевдо-инстанции generic-типов, нужен для NetGenerator.
@ -207,6 +208,8 @@ namespace PascalABCCompiler.TreeRealization
public static Hashtable generic_instances = new Hashtable();
public static syntax_tree_visitor visitor;
public static List<generic_type_instance_info> get_type_instances(type_node original_generic_type)
{
List<generic_type_instance_info> instances = generic_instances[original_generic_type] as List<generic_type_instance_info>;
@ -1005,12 +1008,23 @@ namespace PascalABCCompiler.TreeRealization
//Этот тип-параметр ещё не был выведен.
if (fact_type is delegated_methods && (fact_type as delegated_methods).empty_param_method != null && (fact_type as delegated_methods).empty_param_method.ret_type != null)
fact_type = (fact_type as delegated_methods).empty_param_method.ret_type;
//if (fact_type is delegated_methods)
// fact_type = visitor.CreateDelegate((fact_type as delegated_methods).proper_methods[0].simple_function_node);
deduced[par_num] = fact_type;
return true;
}
//Этот тип-параметр уже был выведен. Сравниваем с выведенным.
if (!convertion_data_and_alghoritms.eq_type_nodes(fact_type, deduced[par_num], true))
{
if (fact_type is delegated_methods && deduced[par_num].IsDelegate)
{
delegate_internal_interface d1 = deduced[par_num].get_internal_interface(internal_interface_kind.delegate_interface) as delegate_internal_interface;
return convertion_data_and_alghoritms.function_eq_params_and_result((fact_type as delegated_methods).proper_methods[0].simple_function_node, d1.invoke_method);
}
else if (fact_type is delegated_methods && deduced[par_num] is delegated_methods)
{
return convertion_data_and_alghoritms.function_eq_params_and_result((fact_type as delegated_methods).proper_methods[0].simple_function_node, (deduced[par_num] as delegated_methods).proper_methods[0].simple_function_node);
}
return false;
}
return true;