Add owners to TypeParameter-s.

Author: VladD2

Nitra/DotNetLang/Type/GenericType.nitra

@@ -11,25 +11,27 @@ using SCG = System.Collections.Generic;
 namespace DotNet
 {
 
-  abstract declaration GenericEntity : BindableAst
+  abstract declaration GenericEntity : BindableAst, Container
   {
     symbol
     {
-      out TypeParametersCount : int = AstUtils.GetTypeParametersCount(this.FirstDeclarationOrDefault);
-      out TypeParameters      : ImmutableArray[TypeSymbol] = AstUtils.CreateTypeParameters(TypeParametersCount);
+      in TypeParametersCount : int;
+      in TypeParameters      : ImmutableArray[TypeSymbol];
     }
 
 
     // Local scope. Type parameters can have different names. We should use alias to reflect it.
     out TypeParameterAliasesScope : TableScope = TableScope("type parameters");
 
-    TypeParameterAliases.TypeParameterSymbols  = Symbol.TypeParameters;
-    TypeParameterAliases.IndexIn               = 0;
-    TypeParameterAliases.ContainingTable       = TypeParameterAliasesScope;
-    TypeParameterAliases.Scope                 = Scope;
-    TypeParameterConstraints.Scope             = Scope.HideWith(TypeParameterAliasesScope);
+    Symbol.TypeParametersCount                      = TypeParameterAliases.Count;
+    Symbol.TypeParameters                           = AstUtils.CreateTypeParameters(context, Symbol.MemberTable, TypeParameterAliases);
+    TypeParameterAliases.TypeParameterSymbols       = Symbol.TypeParameters;
+    TypeParameterAliases.IndexIn                    = 0;
+    TypeParameterAliases.ContainingTable            = TypeParameterAliasesScope;
+    TypeParameterAliases.Scope                      = Scope;
+    TypeParameterConstraints.Scope                  = Scope.HideWith(TypeParameterAliasesScope);
     TypeParameterConstraints.ConstraintedParameters = SCG.HashSet();
-    TypeParameterAliases.DeclaringMember       = Symbol;
+    TypeParameterAliases.DeclaringMember            = Symbol;
 
     TypeParameterAliases     : TypeParameterAlias*;
     TypeParameterConstraints : TypeParameterConstraintsClause*;

Nitra/DotNetLang/Utils/AstUtils.n

@@ -308,15 +308,23 @@ namespace DotNet
 
     public NoTypeParameters : array[TypeParameterSymbol] = array(0);
 
-    public CreateTypeParameters(count : int) : ImmutableArray[TypeSymbol]
+    public CreateTypeParameters(context : DependentPropertyEvalContext, table : TableScope, aliases : DotNet.TypeParameterAlias.IAstList) : ImmutableArray[TypeSymbol]
     {
+      def count : int = aliases.Count;
       if (count == 0)
         ImmutableArray.Empty
       else
       {
         def result = ImmutableArray.CreateBuilder(count);
         for (mutable i = 0; i < count; ++i)
-          result.Add(TypeParameterSymbol());
+        {
+          def alias  = aliases[i];
+          def name   = Name(alias.Name.Location);
+          // TODO: Подумать не надо ли собрать все атрибуты, со всех частей вместо использования первого попавшегося alias.Attributes
+          def decl   = TypeParameter(alias.Location, name, alias.Attributes, false);
+          def symbol = table.Define(decl, context);
+          result.Add(symbol);
+        }
         result.MoveToImmutable()
       }
     }

Nitra/Nitra.Grammar/AST/DotNet/CompilationUnit.n

@@ -551,13 +551,12 @@ namespace DotNet
           def name          = NRB.Name(loc, "#Tuple");
           def symbol        = ExternalTypeDeclaration.[TypeAliasSymbol](name, realDecl.NemerleTypeInfo).DefineSymbol(declaredIn.MemberTable);
           symbol.TypeParametersCount = i;
-          symbol.TypeParameters      = AstUtils.CreateTypeParameters(i);
+          symbol.TypeParameters      = realSymbol.TypeParameters;
           symbol.DeclaredIn          = declaredIn;
           symbol.EvalProperties(context);
         }
       }
 
-
       makeTuples();
 
       def res1 = bind(rootNamespace.MemberTable, "Nemerle");

Nitra/Nitra.Runtime/Nitra.Runtime.Stage2.nproj

@@ -11,4 +11,7 @@
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="..\Nitra.Runtime\Nitra.Runtime.nproj" />
+  <PropertyGroup>
+    <RunDebugger>true</RunDebugger>  
+  </PropertyGroup>
 </Project>