Fix PyFloat_Check to check for subclasses, drop PyLong_Check

filmor · filmor · commit 5db80c3a59cf · 2022-09-19T17:46:17.000+02:00
diff --git a/src/runtime/Converter.cs b/src/runtime/Converter.cs
@@ -710,7 +710,7 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec
                     {
                         if (Runtime.Is32Bit)
                         {
-                            if (!Runtime.PyLong_Check(value))
+                            if (!Runtime.PyInt_Check(value))
                             {
                                 goto type_error;
                             }
@@ -777,6 +777,10 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec
 
                 case TypeCode.Single:
                     {
+                        if (!Runtime.PyFloat_Check(value) && !Runtime.PyInt_Check(value))
+                        {
+                            goto type_error;
+                        }
                         double num = Runtime.PyFloat_AsDouble(value);
                         if (Exceptions.ErrorOccurred())
                         {
@@ -795,6 +799,10 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec
 
                 case TypeCode.Double:
                     {
+                        if (!Runtime.PyFloat_Check(value) && !Runtime.PyInt_Check(value))
+                        {
+                            goto type_error;
+                        }
                         double num = Runtime.PyFloat_AsDouble(value);
                         if (Exceptions.ErrorOccurred())
                         {
diff --git a/src/runtime/Runtime.cs b/src/runtime/Runtime.cs
@@ -1101,11 +1101,6 @@ internal static bool PyBool_Check(BorrowedReference ob)
 
         internal static NewReference PyInt_FromInt64(long value) => PyLong_FromLongLong(value);
 
-        internal static bool PyLong_Check(BorrowedReference ob)
-        {
-            return PyObject_TYPE(ob) == PyLongType;
-        }
-
         internal static NewReference PyLong_FromLongLong(long value) => Delegates.PyLong_FromLongLong(value);
 
 
@@ -1145,9 +1140,7 @@ internal static NewReference PyLong_FromString(string value, int radix)
         }
 
         internal static bool PyFloat_Check(BorrowedReference ob)
-        {
-            return PyObject_TYPE(ob) == PyFloatType;
-        }
+            => PyObject_TypeCheck(ob, PyFloatType);
 
         /// <summary>
         /// Return value: New reference.

Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,7 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec`
`710`	`710`	`{`
`711`	`711`	`if (Runtime.Is32Bit)`
`712`	`712`	`{`
`713`		`- if (!Runtime.PyLong_Check(value))`
	`713`	`+ if (!Runtime.PyInt_Check(value))`
`714`	`714`	`{`
`715`	`715`	`goto type_error;`
`716`	`716`	`}`
`@@ -777,6 +777,10 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec`
`777`	`777`
`778`	`778`	`case TypeCode.Single:`
`779`	`779`	`{`
	`780`	`+ if (!Runtime.PyFloat_Check(value) && !Runtime.PyInt_Check(value))`
	`781`	`+ {`
	`782`	`+ goto type_error;`
	`783`	`+ }`
`780`	`784`	`double num = Runtime.PyFloat_AsDouble(value);`
`781`	`785`	`if (Exceptions.ErrorOccurred())`
`782`	`786`	`{`
`@@ -795,6 +799,10 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec`
`795`	`799`
`796`	`800`	`case TypeCode.Double:`
`797`	`801`	`{`
	`802`	`+ if (!Runtime.PyFloat_Check(value) && !Runtime.PyInt_Check(value))`
	`803`	`+ {`
	`804`	`+ goto type_error;`
	`805`	`+ }`
`798`	`806`	`double num = Runtime.PyFloat_AsDouble(value);`
`799`	`807`	`if (Exceptions.ErrorOccurred())`
`800`	`808`	`{`