fixed bad equality comparisons

lostmsu · lostmsu · commit 62e193ad8d4f · 2021-10-19T17:10:33.000-07:00
diff --git a/src/embed_tests/TestCustomMarshal.cs b/src/embed_tests/TestCustomMarshal.cs
@@ -27,7 +27,7 @@ public static void GetManagedStringTwice()
             string s1 = Runtime.Runtime.GetManagedString(op.BorrowOrThrow());
             string s2 = Runtime.Runtime.GetManagedString(op.Borrow());
 
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(op.Borrow()));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(op.Borrow()));
             Assert.AreEqual(expected, s1);
             Assert.AreEqual(expected, s2);
         }
diff --git a/src/embed_tests/TestPyObject.cs b/src/embed_tests/TestPyObject.cs
@@ -92,7 +92,7 @@ public void GetAttrDefault_IgnoresAttributeErrorOnly()
             var typeErrResult = Assert.Throws<PythonException>(
                 () => ob.GetAttr(nameof(PyObjectTestMethods.RaisesTypeError), fallback)
             );
-            Assert.AreEqual(Exceptions.TypeError, typeErrResult.Type.Handle);
+            Assert.AreEqual(Exceptions.TypeError, typeErrResult.Type);
         }
     }
 
diff --git a/src/embed_tests/TestPySequence.cs b/src/embed_tests/TestPySequence.cs
@@ -87,9 +87,9 @@ public void TestIndex()
         {
             var t1 = new PyString("FooBar");
 
-            Assert.AreEqual(4, t1.Index(new PyString("a")));
-            Assert.AreEqual(5, t1.Index(new PyString("r")));
-            Assert.AreEqual(-1, t1.Index(new PyString("z")));
+            Assert.AreEqual(4, t1.Index32(new PyString("a")));
+            Assert.AreEqual(5L, t1.Index64(new PyString("r")));
+            Assert.AreEqual(-(nint)1, t1.Index(new PyString("z")));
         }
     }
 }
diff --git a/src/embed_tests/TestRuntime.cs b/src/embed_tests/TestRuntime.cs
@@ -39,26 +39,26 @@ public static void RefCountTest()
             using var op = Runtime.Runtime.PyString_FromString("FooBar");
 
             // New object RefCount should be one
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(op.BorrowOrThrow()));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(op.BorrowOrThrow()));
 
             // Checking refcount didn't change refcount
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(op.Borrow()));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(op.Borrow()));
 
             // Borrowing a reference doesn't increase refcount
             BorrowedReference p = op.Borrow();
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(p));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(p));
 
             // Py_IncRef/Py_DecRef increase and decrease RefCount
             Runtime.Runtime.Py_IncRef(op.Borrow());
-            Assert.AreEqual(2, Runtime.Runtime.Refcount(p));
+            Assert.AreEqual(2, Runtime.Runtime.Refcount32(p));
             Runtime.Runtime.Py_DecRef(StolenReference.DangerousFromPointer(op.DangerousGetAddress()));
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(p));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(p));
 
             // XIncref/XDecref increase and decrease RefCount
             Runtime.Runtime.XIncref(p);
-            Assert.AreEqual(2, Runtime.Runtime.Refcount(p));
+            Assert.AreEqual(2, Runtime.Runtime.Refcount32(p));
             Runtime.Runtime.XDecref(p);
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(p));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(p));
 
             op.Dispose();
 
diff --git a/src/runtime/Codecs/TupleCodecs.cs b/src/runtime/Codecs/TupleCodecs.cs
@@ -42,7 +42,8 @@ public bool CanEncode(Type type)
         }
 
         public bool CanDecode(PyType objectType, Type targetType)
-            => objectType == Runtime.PyTupleType && this.CanEncode(targetType);
+            => PythonReferenceComparer.Instance.Equals(objectType, Runtime.PyTupleType)
+            && this.CanEncode(targetType);
 
         public bool TryDecode<T>(PyObject pyObj, out T? value)
         {
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -732,6 +732,8 @@ internal static unsafe nint Refcount(BorrowedReference op)
             var p = (nint*)(op.DangerousGetAddress() + ABI.RefCountOffset);
             return *p;
         }
+        [Pure]
+        internal static int Refcount32(BorrowedReference op) => checked((int)Refcount(op));
 
         /// <summary>
         /// Call specified function, and handle PythonDLL-related failures.

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static void GetManagedStringTwice()`
`27`	`27`	`string s1 = Runtime.Runtime.GetManagedString(op.BorrowOrThrow());`
`28`	`28`	`string s2 = Runtime.Runtime.GetManagedString(op.Borrow());`
`29`	`29`
`30`		`- Assert.AreEqual(1, Runtime.Runtime.Refcount(op.Borrow()));`
	`30`	`+ Assert.AreEqual(1, Runtime.Runtime.Refcount32(op.Borrow()));`
`31`	`31`	`Assert.AreEqual(expected, s1);`
`32`	`32`	`Assert.AreEqual(expected, s2);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void GetAttrDefault_IgnoresAttributeErrorOnly()`
`92`	`92`	`var typeErrResult = Assert.Throws<PythonException>(`
`93`	`93`	`() => ob.GetAttr(nameof(PyObjectTestMethods.RaisesTypeError), fallback)`
`94`	`94`	`);`
`95`		`- Assert.AreEqual(Exceptions.TypeError, typeErrResult.Type.Handle);`
	`95`	`+ Assert.AreEqual(Exceptions.TypeError, typeErrResult.Type);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ public void TestIndex()`
`87`	`87`	`{`
`88`	`88`	`var t1 = new PyString("FooBar");`
`89`	`89`
`90`		`- Assert.AreEqual(4, t1.Index(new PyString("a")));`
`91`		`- Assert.AreEqual(5, t1.Index(new PyString("r")));`
`92`		`- Assert.AreEqual(-1, t1.Index(new PyString("z")));`
	`90`	`+ Assert.AreEqual(4, t1.Index32(new PyString("a")));`
	`91`	`+ Assert.AreEqual(5L, t1.Index64(new PyString("r")));`
	`92`	`+ Assert.AreEqual(-(nint)1, t1.Index(new PyString("z")));`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ public bool CanEncode(Type type)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public bool CanDecode(PyType objectType, Type targetType)`
`45`		`- => objectType == Runtime.PyTupleType && this.CanEncode(targetType);`
	`45`	`+ => PythonReferenceComparer.Instance.Equals(objectType, Runtime.PyTupleType)`
	`46`	`+ && this.CanEncode(targetType);`
`46`	`47`
`47`	`48`	`public bool TryDecode<T>(PyObject pyObj, out T? value)`
`48`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -732,6 +732,8 @@ internal static unsafe nint Refcount(BorrowedReference op)`
`732`	`732`	`var p = (nint*)(op.DangerousGetAddress() + ABI.RefCountOffset);`
`733`	`733`	`return *p;`
`734`	`734`	`}`
	`735`	`+ [Pure]`
	`736`	`+ internal static int Refcount32(BorrowedReference op) => checked((int)Refcount(op));`
`735`	`737`
`736`	`738`	`/// <summary>`
`737`	`739`	`/// Call specified function, and handle PythonDLL-related failures.`