C#: Simplify CIL.GenericContext contract

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CIL/Entities/TypeSignatureDecoder.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Reflection.Metadata;
 using System.Collections.Immutable;
+using System.Linq;
 
 namespace Semmle.Extraction.CIL.Entities
 {
@@ -29,10 +30,10 @@ Type IConstructedTypeProvider<Type>.GetGenericInstantiation(Type genericType, Im
             genericType.Construct(typeArguments);
 
         Type ISignatureTypeProvider<Type, GenericContext>.GetGenericMethodParameter(GenericContext genericContext, int index) =>
-            genericContext.GetGenericMethodParameter(index);
+            genericContext.MethodParameters.ElementAt(index);
 
         Type ISignatureTypeProvider<Type, GenericContext>.GetGenericTypeParameter(GenericContext genericContext, int index) =>
-            genericContext.GetGenericTypeParameter(index);
+            genericContext.TypeParameters.ElementAt(index);
 
         Type ISignatureTypeProvider<Type, GenericContext>.GetModifiedType(Type modifier, Type unmodifiedType, bool isRequired) =>
             new ModifiedType(cx, unmodifiedType, modifier, isRequired);

csharp/extractor/Semmle.Extraction.CIL/GenericContext.cs

@@ -23,34 +23,8 @@ protected GenericContext(Context cx)
         public abstract IEnumerable<Entities.Type> TypeParameters { get; }
 
         /// <summary>
-        /// The list of generic method parameters.
+        /// The list of generic method parameters/arguments.
         /// </summary>
         public abstract IEnumerable<Entities.Type> MethodParameters { get; }
-
-        /// <summary>
-        /// Gets the `p`th type parameter.
-        /// </summary>
-        /// <param name="p">The index of the parameter.</param>
-        /// <returns>
-        /// For constructed types, the supplied type.
-        /// For unbound types, the type parameter.
-        /// </returns>
-        public Entities.Type GetGenericTypeParameter(int p)
-        {
-            return TypeParameters.ElementAt(p);
-        }
-
-        /// <summary>
-        /// Gets the `p`th method type parameter.
-        /// </summary>
-        /// <param name="p">The index of the parameter.</param>
-        /// <returns>
-        /// For constructed types, the supplied type.
-        /// For unbound types, the type parameter.
-        /// </returns>
-        public Entities.Type GetGenericMethodParameter(int p)
-        {
-            return MethodParameters.ElementAt(p);
-        }
     }
 }