Remove redundant declarations. Fix serialization.

Author: someone-with-default-username

DotNet.BackEnd.CCI/CciBackEnd.n

@@ -580,8 +580,8 @@ namespace Nitra.BackEnd.Cci
 
     CreateGenericParameter(genericParam : IGenericParameter, context : DependentPropertyEvalContext) : TypeSymbol
     {
-      def name  = NRB.Name(NoLocation, genericParam.Name.Value); // TODO: type.Name.UniqueKey
-      def tps   = TypeParameterDeclaration(name, genericParam).DefineSymbol();
+      def tps   = TypeParameterSymbol();
+      tps.UpdateName(genericParam.Name.Value); // TODO: type.Name.UniqueKey
       tps.EvalProperties(context);
       tps
     }
@@ -625,8 +625,8 @@ namespace Nitra.BackEnd.Cci
 
     MakeArrayTypeParameter(context : DependentPropertyEvalContext) : TypeSymbol
     {
-      def name  = NRB.Name(NoLocation, "T");
-      def tps   = ArrayTypeParameterDeclaration(name).DefineSymbol();
+      def tps = TypeParameterSymbol();
+      tps.UpdateName("T");
       tps.EvalProperties(context);
       tps
     }
@@ -744,19 +744,6 @@ namespace Nitra.BackEnd.Cci
     public Type : INestedTypeDefinition { get; private set; }
   }
 
-  [Record]
-  public class TypeParameterDeclaration : ExternalDeclaration[TypeParameterSymbol]
-  {
-    public TypeParam : IGenericParameter;
-    public override CreateSymbol() : DeclarationSymbol { TypeParameterSymbol() }
-  }
-
-  [Record]
-  public class ArrayTypeParameterDeclaration : ExternalDeclaration[TypeParameterSymbol]
-  {
-    public override CreateSymbol() : DeclarationSymbol { TypeParameterSymbol() }
-  }
-
   [Record]
   public class ExternalPropertyDeclaration : ExternalDeclaration[Member.PropertySymbol]
   {

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

@@ -369,8 +369,8 @@ namespace DotNet
           for (mutable i = 0; i < count; ++i)
           {
             def tp    = typarms.Head;
-            def name  = NRB.Name(loc, tp.Name);
-            def tps   = TypeParameterDeclaration(name, tp).DefineSymbol();
+            def tps   = TypeParameterSymbol();
+            tps.UpdateName(tp.Name);
             tps.EvalProperties(context);
             result.Add(tps);
             typarms   = typarms.Tail;
@@ -625,19 +625,6 @@ namespace DotNet
     }
   }
 
-  [Record]
-  class TypeParameterDeclaration : ExternalDeclaration[TypeParameterSymbol]
-  {
-    public NemerleTypeParam : StaticTypeVar;
-    public override CreateSymbol() : DeclarationSymbol { TypeParameterSymbol() }
-  }
-
-  [Record]
-  class TypeParameterStubDeclaration : ExternalDeclaration[TypeParameterSymbol]
-  {
-    public override CreateSymbol() : DeclarationSymbol { TypeParameterSymbol() }
-  }
-
   interface IExternalTypeDeclaration
   {
     NemerleTypeInfo : TypeInfo { get; }