Work on substitution of generic members.

Author: VladD2

Nitra/DotNetLang/Scopes/TopSubstScope.n

@@ -40,13 +40,33 @@ namespace DotNet
 
     private TrySubst(type : TypeSymbol) : TypeSymbol
     {
-      // Это может быть сконструированный тип (у которого параметров типы уже подставлены или отсутствуют).
-      // Возможно здесь имеет смысл сделать проверку на это и не делать для них подмены.
-      mutable result;
-      if (_typeParamsMap.TryGetValue(type.Id, out result))
-        result
-      else
-        type
+      match (type)
+      {
+        | TypeParameterSymbol =>
+          mutable result;
+          if (_typeParamsMap.TryGetValue(type.Id, out result))
+            result
+          else
+          {
+            assert2(false, "Unmapped TypeParameterSymbol!");
+            type
+          }
+
+        | ConstructedTypeSymbol as cts =>
+          def typeInfo      = cts.TypeInfo;
+          def args          = cts.Args;
+          def substArgs     = TrySubsts(args);
+          def isNotChanged  = args.Equals(substArgs);
+          match (cts)
+          {
+            | TopConstructedTypeSymbol when isNotChanged => cts
+            | TopConstructedTypeSymbol           => AstUtils.CreateConstructedTypeSymbol(typeInfo, substArgs, DependentPropertyEvalContext(null))
+            //| NestedConstructedTypeSymbol as cts when isNotChanged
+            | NestedConstructedTypeSymbol as cts =>  AstUtils.CreateNestedConstructedTypeSymbol(cts.Parent, typeInfo, substArgs, DependentPropertyEvalContext(null))
+          }
+
+        | _ => type
+      }
     }
 
     private TrySubsts(types : ImmutableArray[TypeSymbol]) : ImmutableArray[TypeSymbol]

Nitra/DotNetLang/Utils/AstUtils.n

@@ -215,6 +215,11 @@ namespace DotNet
     }
 
     public CreateNestedConstructedTypeSymbol(_loc : Location, parentTypeSubst : TypeSymbol, typeInfo : GenericTypeSymbol, arguments : ImmutableArray[TypeSymbol], context : DependentPropertyEvalContext) : ConstructedTypeSymbol
+    {
+      CreateNestedConstructedTypeSymbol(parentTypeSubst, typeInfo, arguments, context)
+    }
+
+    public CreateNestedConstructedTypeSymbol(parentTypeSubst : TypeSymbol, typeInfo : GenericTypeSymbol, arguments : ImmutableArray[TypeSymbol], context : DependentPropertyEvalContext) : ConstructedTypeSymbol
     {
       def resultSymbol       = NestedConstructedTypeSymbol();
       resultSymbol.Parent    = parentTypeSubst;
@@ -225,7 +230,7 @@ namespace DotNet
       resultSymbol
     }
 
-    public CreateConstructedTypeSymbol(_loc : Location, typeInfo : GenericTypeSymbol, arguments : ImmutableArray[TypeSymbol], context : DependentPropertyEvalContext) : ConstructedTypeSymbol
+    public CreateConstructedTypeSymbol(typeInfo : GenericTypeSymbol, arguments : ImmutableArray[TypeSymbol], context : DependentPropertyEvalContext) : ConstructedTypeSymbol
     {
       def resultSymbol      = TopConstructedTypeSymbol();
       resultSymbol.TypeInfo = typeInfo;
@@ -234,6 +239,11 @@ namespace DotNet
       resultSymbol
     }
 
+    public CreateConstructedTypeSymbol(_loc : Location, typeInfo : GenericTypeSymbol, arguments : ImmutableArray[TypeSymbol], context : DependentPropertyEvalContext) : ConstructedTypeSymbol
+    {
+      CreateConstructedTypeSymbol(typeInfo, arguments, context)
+    }
+
     public MakeConstructedType(ast : ILocated, args : ImmutableArray[Ref[DeclarationSymbol]], context : DependentPropertyEvalContext) : ResolutionAlgorithm[DeclarationSymbol, DeclarationSymbol]
     {
       def loc = ast.Location;