Add int constructor for (U)IntPtr

filmor · filmor · commit 65a6408ac772 · 2022-07-11T11:41:10.000+02:00
diff --git a/src/runtime/Types/ClassObject.cs b/src/runtime/Types/ClassObject.cs
@@ -129,7 +129,7 @@ private static NewReference NewString(BorrowedReference args, BorrowedReference
 
         /// <summary>
         /// Create a new Python object for a primitive type
-        /// 
+        ///
         /// The primitive types are Boolean, Byte, SByte, Int16, UInt16,
         /// Int32, UInt32, Int64, UInt64, IntPtr, UIntPtr, Char, Double,
         /// and Single.
@@ -170,6 +170,14 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference
                             break;
                     }
                 }
+                else if (Runtime.PyInt_Check(op))
+                {
+                    long? num = Runtime.PyLong_AsLongLong(op);
+                    if (num is long n)
+                    {
+                        result = new IntPtr(n);
+                    }
+                }
             }
 
             if (type == typeof(UIntPtr))
@@ -189,6 +197,14 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference
                             break;
                     }
                 }
+                else if (Runtime.PyInt_Check(op))
+                {
+                    ulong? num = Runtime.PyLong_AsUnsignedLongLong(op);
+                    if (num is ulong n)
+                    {
+                        result = new UIntPtr(n);
+                    }
+                }
             }
 
             if (result == null && !Converter.ToManaged(op, type, out result, true))
diff --git a/tests/test_conversion.py b/tests/test_conversion.py
@@ -689,10 +689,13 @@ def test_intptr_construction():
     assert ob.UIntPtrField == UIntPtr.Zero
 
     ob.IntPtrField = IntPtr(Int64(-1))
+    assert ob.IntPtrField == IntPtr(-1)
     assert ob.IntPtrField.ToInt64() == -1
 
     ob.IntPtrField = IntPtr(Int64(1024))
+    assert ob.IntPtrField == IntPtr(1024)
     assert ob.IntPtrField.ToInt64() == 1024
 
     ob.UIntPtrField = UIntPtr(UInt64(1024))
+    assert ob.UIntPtrField == UIntPtr(1024)
     assert ob.UIntPtrField.ToUInt64() == 1024

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private static NewReference NewString(BorrowedReference args, BorrowedReference`
`129`	`129`
`130`	`130`	`/// <summary>`
`131`	`131`	`/// Create a new Python object for a primitive type`
`132`		`- ///`
	`132`	`+ ///`
`133`	`133`	`/// The primitive types are Boolean, Byte, SByte, Int16, UInt16,`
`134`	`134`	`/// Int32, UInt32, Int64, UInt64, IntPtr, UIntPtr, Char, Double,`
`135`	`135`	`/// and Single.`
`@@ -170,6 +170,14 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference`
`170`	`170`	`break;`
`171`	`171`	`}`
`172`	`172`	`}`
	`173`	`+ else if (Runtime.PyInt_Check(op))`
	`174`	`+ {`
	`175`	`+ long? num = Runtime.PyLong_AsLongLong(op);`
	`176`	`+ if (num is long n)`
	`177`	`+ {`
	`178`	`+ result = new IntPtr(n);`
	`179`	`+ }`
	`180`	`+ }`
`173`	`181`	`}`
`174`	`182`
`175`	`183`	`if (type == typeof(UIntPtr))`
`@@ -189,6 +197,14 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference`
`189`	`197`	`break;`
`190`	`198`	`}`
`191`	`199`	`}`
	`200`	`+ else if (Runtime.PyInt_Check(op))`
	`201`	`+ {`
	`202`	`+ ulong? num = Runtime.PyLong_AsUnsignedLongLong(op);`
	`203`	`+ if (num is ulong n)`
	`204`	`+ {`
	`205`	`+ result = new UIntPtr(n);`
	`206`	`+ }`
	`207`	`+ }`
`192`	`208`	`}`
`193`	`209`
`194`	`210`	`if (result == null && !Converter.ToManaged(op, type, out result, true))`