Override IsEnum on TypeDef and TypeRef

Override Type.IsEnum to correctly handle different corelibs Issue: #121
MSDN-WhiteKnight · Apr 1, 2023 · 1f706fd · 1f706fd
1 parent 01e4b32
commit 1f706fd
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 0 deletions.
diff --git a/CilTools.Metadata/TypeDef.cs b/CilTools.Metadata/TypeDef.cs
@@ -765,6 +765,19 @@ public override bool IsGenericType
 
         public override bool IsGenericTypeDefinition => this.IsGenericType;
 
+        public override bool IsEnum
+        {
+            get
+            {
+                // Overridden to return correct result when inspected type's corelib does not match current runtime corelib
+                Type bt = this.BaseType;
+
+                if (bt == null) return false;
+
+                return Utils.StrEquals(bt.FullName, "System.Enum") && Utils.IsCoreAssembly(bt.Assembly);
+            }
+        }
+
         public override Type[] GetGenericArguments()
         {
             GenericParameterHandleCollection hcoll = type.GetGenericParameters();

diff --git a/CilTools.Metadata/TypeRef.cs b/CilTools.Metadata/TypeRef.cs
@@ -383,6 +383,19 @@ public override Type DeclaringType
             }
         }
 
+        public override bool IsEnum
+        {
+            get
+            {
+                // Overridden to return correct result when inspected type's corelib does not match current runtime corelib
+                Type bt = this.BaseType;
+
+                if (bt == null) return false;
+
+                return Utils.StrEquals(bt.FullName, "System.Enum") && Utils.IsCoreAssembly(bt.Assembly);
+            }
+        }
+
         public override bool IsAssignableFrom(Type c)
         {
             if (c.IsInterface || this.IsInterface)

diff --git a/tests/CilTools.Metadata.Tests/TypeDefTests.cs b/tests/CilTools.Metadata.Tests/TypeDefTests.cs
@@ -970,5 +970,23 @@ public void Test_IsValueType_Class(Type t)
         {
             Assert.IsFalse(t.IsValueType);
         }
+
+        [TestMethod]
+        [TypeTestData(typeof(BytecodeProviders), BytecodeProviders.Metadata)]
+        public void Test_IsEnum(Type t)
+        {
+            Assert.IsTrue(t.IsEnum);
+            Assert.IsTrue(t.IsValueType);
+            Assert.IsFalse(t.IsClass);
+            Assert.IsFalse(t.IsInterface);
+        }
+
+        [TestMethod]
+        [TypeTestData(typeof(Attribute), BytecodeProviders.Metadata)]
+        public void Test_IsEnum_Negative(Type t)
+        {
+            Assert.IsFalse(t.IsEnum);            
+            Assert.IsTrue(t.IsClass);
+        }
     }
 }
diff --git a/tests/CilTools.Metadata.Tests/TypeRefTests.cs b/tests/CilTools.Metadata.Tests/TypeRefTests.cs
@@ -94,6 +94,16 @@ public void Test_IsValueType_Interface()
             Assert.IsFalse(t.IsValueType);
             Assert.IsTrue(t.IsInterface);
         }
+
+        [TestMethod]
+        public void Test_IsEnum()
+        {
+            Type t = TypeRefTests_Data.GetTypeRef(typeof(AttributeTargets).FullName);
+            Assert.IsTrue(t.IsEnum);
+
+            t = TypeRefTests_Data.GetTypeRef(typeof(Console).FullName);
+            Assert.IsFalse(t.IsEnum);
+        }
     }
 
     public class TypeRefTests_Data