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

Fix recursive typeclass instances deduction

Browse source
This commit is contained in:
Voloshin Bogdan 2019-02-28 01:38:15 +03:00
parent 7fe98d826c
commit 42bfa72b59
1 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
TreeConverter/TreeRealization/generics.cs
View file

@ -924,32 +924,7 @@ namespace PascalABCCompiler.TreeRealization
if (isTypeclassRestricted) if (isTypeclassRestricted)
{ {
foreach (var tc in typeclasses) DeduceTypeclassInstances(context, deduced, typeclasses, loc);
{
var instances = context.typeclassInstances.Where(ti =>
(ti.ImplementingInterfaces[0] as common_generic_instance_type_node).original_generic ==
(tc.ImplementingInterfaces[0] as common_generic_instance_type_node).original_generic);
var appropriateInstances = instances.Where(ti =>
(ti.ImplementingInterfaces[0] as common_generic_instance_type_node).instance_params.SequenceEqual(
(tc.ImplementingInterfaces[0] as common_generic_instance_type_node).instance_params.Select(ip => deduced[ip.generic_param_index])));
if (appropriateInstances.Count() == 1)
{
var foundInstance = appropriateInstances.First() as common_type_node;
if (foundInstance.generic_params?.Count > 0 is true)
{
type_node[] deducedInstances = new type_node[foundInstance.generic_params.Count];
DeduceTypeclassInstances(context, deducedInstances, foundInstance.generic_params.OfType<type_node>());
deduced[tc.generic_param_index] = foundInstance.get_instance(deducedInstances.ToList());
}
else
{
deduced[tc.generic_param_index] = appropriateInstances.First();
}
}
}
} }
var current_deduce_state = deduced //текущее состояние выведенных типов var current_deduce_state = deduced //текущее состояние выведенных типов
@ -1019,7 +994,7 @@ namespace PascalABCCompiler.TreeRealization
return func.get_instance(deduced_list, alone, loc); return func.get_instance(deduced_list, alone, loc);
} }
private static void DeduceTypeclassInstances(compilation_context context, type_node[] deduced, IEnumerable<type_node> typeclasses) private static void DeduceTypeclassInstances(compilation_context context, type_node[] deduced, IEnumerable<type_node> typeclasses, location loc)
{ {
foreach (var tc in typeclasses) foreach (var tc in typeclasses)
{ {
@ -1029,15 +1004,24 @@ namespace PascalABCCompiler.TreeRealization
var appropriateInstances = instances.Where(ti => var appropriateInstances = instances.Where(ti =>
(ti.ImplementingInterfaces[0] as common_generic_instance_type_node).instance_params.SequenceEqual( (ti.ImplementingInterfaces[0] as common_generic_instance_type_node).instance_params.SequenceEqual(
(tc.ImplementingInterfaces[0] as common_generic_instance_type_node).instance_params)); (tc.ImplementingInterfaces[0] as common_generic_instance_type_node).instance_params.Select(ip =>
{
if (ip.is_generic_parameter)
return deduced[ip.generic_param_index];
else
return ip;
})));
if (appropriateInstances.Count() == 1) if (appropriateInstances.Count() == 1)
{ {
var foundInstance = appropriateInstances.First() as common_type_node; var foundInstance = appropriateInstances.First() as common_type_node;
if (foundInstance.generic_params?.Count > 0 is true) if (foundInstance.generic_params?.Count > 0 is true)
{ {
List<type_node> instanceTypes = null; type_node[] instanceTypes = new type_node[foundInstance.generic_params.Count];
deduced[tc.generic_param_index] = foundInstance.get_instance(instanceTypes);
DeduceTypeclassInstances(context, instanceTypes, foundInstance.generic_params.OfType<type_node>(), loc);
deduced[tc.generic_param_index] = foundInstance.get_instance(instanceTypes.ToList());
} }
else else
{ {
@ -1046,7 +1030,14 @@ namespace PascalABCCompiler.TreeRealization
} }
else else
{ {
// TODO: typeclasses add error message if (appropriateInstances.Count() == 0)
{
throw new SimpleSemanticError(loc, "NO_INSTANCES_FOR_TYPECLASS_{0}", null/*TypeclassHelper.GetTypeclassName(tc)*/);
}
else
{
throw new SimpleSemanticError(loc, "TC_SEVERAL_INSTANCES_FOR_TYPECLASS_{0}", null /*TypeclassHelper.GetTypeclassName(tc)*/);
}
} }
} }
} }