method overloading fix for enum argument

denfromufa · den-run-ai · commit 66691ff63481 · 2016-03-17T02:05:16.000-05:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -309,26 +309,38 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw,
 
 
                             if (clrtype != null) {
+                                bool typematch = false;
                                 if (pi[n].ParameterType != clrtype) {
                                     IntPtr pytype = Converter.GetPythonTypeByAlias(pi[n].ParameterType);
                                     pyoptype = Runtime.PyObject_Type(op);
                                     Exceptions.Clear();
                                     if (pyoptype != IntPtr.Zero) {
                                         if (pytype != pyoptype) {
-                                            Runtime.Decref(pyoptype);
-                                            margs = null;
-                                            break;
+                                            typematch = false;
                                         }
                                         else {
+                                            typematch = true;
                                             clrtype = pi[n].ParameterType;
                                         }
                                     }
-                                    else {
-                                        Runtime.Decref(pyoptype);
+                                    if (!typematch) {
+                                        // this takes care of enum values
+                                        TypeCode argtypecode = Type.GetTypeCode(pi[n].ParameterType);
+                                        TypeCode paramtypecode = Type.GetTypeCode(clrtype);
+                                        if (argtypecode == paramtypecode) {
+                                            typematch = true;
+                                            clrtype = pi[n].ParameterType;
+                                        }
+                                    }
+                                    Runtime.Decref(pyoptype);
+                                    if (!typematch) {
                                         margs = null;
                                         break;
                                     }
-                                    Runtime.Decref(pyoptype);
+                                }
+                                else {
+                                    typematch = true;
+                                    clrtype = pi[n].ParameterType;
                                 }
                             }
                             else {
diff --git a/src/tests/test_generic.py b/src/tests/test_generic.py
@@ -375,6 +375,12 @@ def testCorrectOverloadSelection(self):
                          atype(value1),
                          atype(value2)))
 
+        clr.AddReference("System.Runtime.InteropServices")
+        from System.Runtime.InteropServices import GCHandle, GCHandleType
+        from System import Array, Byte
+        CSArray = Array.CreateInstance(Byte, 1000) 
+        handler = GCHandle.Alloc(CSArray, GCHandleType.Pinned)
+
     def testGenericMethodOverloadSelection(self):
         """
         Test explicit overload selection with generic methods.
