C#: Remove marker interfaces from CIL extraction

Author: tamasvajk

…actor/Semmle.Extraction.CIL/Factories.cs …mmle.Extraction.CIL/Context.Factories.cscsharp/extractor/Semmle.Extraction.CIL/Factories.cs renamed to csharp/extractor/Semmle.Extraction.CIL/Context.Factories.cs csharp/extractor/Semmle.Extraction.CIL/Factories.cs renamed to csharp/extractor/Semmle.Extraction.CIL/Context.Factories.cs

@@ -110,7 +110,7 @@ public Entities.Type ErrorType
         /// </summary>
         /// <param name="handle">The handle of the method.</param>
         /// <returns>The debugging information, or null if the information could not be located.</returns>
-        public PDB.IMethod? GetMethodDebugInformation(MethodDefinitionHandle handle)
+        public PDB.Method? GetMethodDebugInformation(MethodDefinitionHandle handle)
         {
             return Pdb?.GetMethod(handle.ToDebugInformationHandle());
         }

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

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// An array type.
     /// </summary>
-    internal sealed class ArrayType : Type, IArrayType
+    internal sealed class ArrayType : Type
     {
         private readonly Type elementType;
         private readonly int rank;

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

@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// An assembly to extract.
     /// </summary>
-    public class Assembly : LabelledEntity, IAssembly
+    public class Assembly : LabelledEntity, ILocation
     {
         private readonly File file;
         private readonly AssemblyName assemblyName;

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

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// Entity representing a CIL attribute.
     /// </summary>
-    internal sealed class Attribute : UnlabelledEntity, IAttribute
+    internal sealed class Attribute : UnlabelledEntity
     {
         private readonly CustomAttributeHandle handle;
         private readonly CustomAttribute attrib;

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

@@ -9,11 +9,11 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// A definition method - a method defined in the current assembly.
     /// </summary>
-    internal sealed class DefinitionMethod : Method, IMember
+    internal sealed class DefinitionMethod : Method
     {
         private readonly Handle handle;
         private readonly MethodDefinition md;
-        private readonly PDB.IMethod? methodDebugInformation;
+        private readonly PDB.Method? methodDebugInformation;
         private readonly Type declaringType;
 
         private readonly string name;
@@ -120,7 +120,7 @@ public override IEnumerable<IExtractionProduct> Contents
                         }
                     }
 
-                    var jump_table = new Dictionary<int, IInstruction>();
+                    var jump_table = new Dictionary<int, Instruction>();
 
                     foreach (var c in Decode(body.GetILBytes(), jump_table))
                         yield return c;
@@ -178,7 +178,7 @@ public override IEnumerable<IExtractionProduct> Contents
             }
         }
 
-        private IEnumerable<IExtractionProduct> Decode(byte[] ilbytes, Dictionary<int, IInstruction> jump_table)
+        private IEnumerable<IExtractionProduct> Decode(byte[] ilbytes, Dictionary<int, Instruction> jump_table)
         {
             // Sequence points are stored in order of offset.
             // We use an enumerator to locate the correct sequence point for each instruction.

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

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// An event entity.
     /// </summary>
-    internal sealed class Event : LabelledEntity, IEvent
+    internal sealed class Event : LabelledEntity
     {
         private readonly EventDefinitionHandle handle;
         private readonly Type parent;

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

@@ -5,15 +5,15 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// An exception region entity.
     /// </summary>
-    internal class ExceptionRegion : UnlabelledEntity, IExceptionRegion
+    internal class ExceptionRegion : UnlabelledEntity
     {
         private readonly GenericContext gc;
         private readonly MethodImplementation method;
         private readonly int index;
         private readonly System.Reflection.Metadata.ExceptionRegion r;
-        private readonly Dictionary<int, IInstruction> jump_table;
+        private readonly Dictionary<int, Instruction> jump_table;
 
-        public ExceptionRegion(GenericContext gc, MethodImplementation method, int index, System.Reflection.Metadata.ExceptionRegion r, Dictionary<int, IInstruction> jump_table) : base(gc.Cx)
+        public ExceptionRegion(GenericContext gc, MethodImplementation method, int index, System.Reflection.Metadata.ExceptionRegion r, Dictionary<int, Instruction> jump_table) : base(gc.Cx)
         {
             this.gc = gc;
             this.method = method;

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

@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// An entity representing a field.
     /// </summary>
-    internal abstract class Field : GenericContext, IField
+    internal abstract class Field : GenericContext, IMember
     {
         protected Field(Context cx) : base(cx)
         {

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

@@ -3,7 +3,7 @@
 
 namespace Semmle.Extraction.CIL.Entities
 {
-    public class File : LabelledEntity, IFile
+    public class File : LabelledEntity, IFileOrFolder
     {
         protected string OriginalPath { get; }
         protected PathTransformer.ITransformedPath TransformedPath { get; }