switched collection wrappers (from sample codec) to the new style references

lostmsu · lostmsu · commit 0d605009958a · 2021-10-18T17:37:34.000-07:00
diff --git a/src/runtime/CollectionWrappers/IterableWrapper.cs b/src/runtime/CollectionWrappers/IterableWrapper.cs
@@ -27,19 +27,20 @@ public IEnumerator<T> GetEnumerator()
                 iterObject = iter.MoveToPyObject();
             }
 
+            using (iterObject)
             while (true)
             {
                 using (Py.GIL())
                 {
-                    var item = Runtime.PyIter_Next(iterObject.Handle);
-                    if (item == IntPtr.Zero)
+                    using var item = Runtime.PyIter_Next(iterObject);
+                    if (item.IsNull())
                     {
                         Runtime.CheckExceptionOccurred();
                         iterObject.Dispose();
                         break;
                     }
 
-                    yield return (T)new PyObject(item).AsManagedObject(typeof(T));
+                    yield return item.MoveToPyObject().As<T>();
                 }
             }
         }
diff --git a/src/runtime/CollectionWrappers/ListWrapper.cs b/src/runtime/CollectionWrappers/ListWrapper.cs
@@ -14,14 +14,14 @@ public T this[int index]
         {
             get
             {
-                var item = Runtime.PyList_GetItem(pyObject.Reference, index);
+                var item = Runtime.PyList_GetItem(pyObject, index);
                 var pyItem = new PyObject(item);
                 return pyItem.As<T>();
             }
             set
             {
                 var pyItem = value.ToPython();
-                var result = Runtime.PyList_SetItem(pyObject.Handle, index, pyItem.Handle);
+                var result = Runtime.PyList_SetItem(pyObject, index, new NewReference(pyItem).Steal());
                 if (result == -1)
                     Runtime.CheckExceptionOccurred();
             }
@@ -39,7 +39,7 @@ public void Insert(int index, T item)
 
             var pyItem = item.ToPython();
 
-            var result = Runtime.PyList_Insert(pyObject.Reference, index, pyItem.Handle);
+            int result = Runtime.PyList_Insert(pyObject, index, pyItem);
             if (result == -1)
                 Runtime.CheckExceptionOccurred();
         }
diff --git a/src/runtime/CollectionWrappers/SequenceWrapper.cs b/src/runtime/CollectionWrappers/SequenceWrapper.cs
@@ -20,7 +20,7 @@ public int Count
                     Runtime.CheckExceptionOccurred();
                 }
 
-                return (int)size;
+                return checked((int)size);
             }
         }
 
@@ -38,7 +38,7 @@ public void Clear()
         {
             if (IsReadOnly)
                 throw new NotImplementedException();
-            var result = Runtime.PySequence_DelSlice(pyObject.Handle, 0, Count);
+            int result = Runtime.PySequence_DelSlice(pyObject, 0, Count);
             if (result == -1)
             {
                 Runtime.CheckExceptionOccurred();
@@ -49,7 +49,7 @@ public bool Contains(T item)
         {
             //not sure if IEquatable is implemented and this will work!
             foreach (var element in this)
-                if (element.Equals(item)) return true;
+                if (object.Equals(element, item)) return true;
 
             return false;
         }
@@ -77,7 +77,7 @@ protected bool removeAt(int index)
             if (index >= Count || index < 0)
                 return false;
 
-            var result = Runtime.PySequence_DelItem(pyObject.Handle, index);
+            int result = Runtime.PySequence_DelItem(pyObject, index);
 
             if (result == 0)
                 return true;
@@ -91,7 +91,7 @@ protected int indexOf(T item)
             var index = 0;
             foreach (var element in this)
             {
-                if (element.Equals(item)) return index;
+                if (object.Equals(element, item)) return index;
                 index++;
             }
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1536,7 +1536,7 @@ internal static bool PyList_Check(BorrowedReference ob)
 
         internal static NewReference PyList_New(nint size) => Delegates.PyList_New(size);
 
-        private static BorrowedReference PyList_GetItem(BorrowedReference pointer, IntPtr index) => Delegates.PyList_GetItem(pointer, index);
+        internal static BorrowedReference PyList_GetItem(BorrowedReference pointer, nint index) => Delegates.PyList_GetItem(pointer, index);
 
         internal static int PyList_SetItem(BorrowedReference pointer, nint index, StolenReference value) => Delegates.PyList_SetItem(pointer, index, value);
 

Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,20 @@ public IEnumerator<T> GetEnumerator()`
`27`	`27`	`iterObject = iter.MoveToPyObject();`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ using (iterObject)`
`30`	`31`	`while (true)`
`31`	`32`	`{`
`32`	`33`	`using (Py.GIL())`
`33`	`34`	`{`
`34`		`- var item = Runtime.PyIter_Next(iterObject.Handle);`
`35`		`- if (item == IntPtr.Zero)`
	`35`	`+ using var item = Runtime.PyIter_Next(iterObject);`
	`36`	`+ if (item.IsNull())`
`36`	`37`	`{`
`37`	`38`	`Runtime.CheckExceptionOccurred();`
`38`	`39`	`iterObject.Dispose();`
`39`	`40`	`break;`
`40`	`41`	`}`
`41`	`42`
`42`		`- yield return (T)new PyObject(item).AsManagedObject(typeof(T));`
	`43`	`+ yield return item.MoveToPyObject().As<T>();`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ public T this[int index]`
`14`	`14`	`{`
`15`	`15`	`get`
`16`	`16`	`{`
`17`		`- var item = Runtime.PyList_GetItem(pyObject.Reference, index);`
	`17`	`+ var item = Runtime.PyList_GetItem(pyObject, index);`
`18`	`18`	`var pyItem = new PyObject(item);`
`19`	`19`	`return pyItem.As<T>();`
`20`	`20`	`}`
`21`	`21`	`set`
`22`	`22`	`{`
`23`	`23`	`var pyItem = value.ToPython();`
`24`		`- var result = Runtime.PyList_SetItem(pyObject.Handle, index, pyItem.Handle);`
	`24`	`+ var result = Runtime.PyList_SetItem(pyObject, index, new NewReference(pyItem).Steal());`
`25`	`25`	`if (result == -1)`
`26`	`26`	`Runtime.CheckExceptionOccurred();`
`27`	`27`	`}`
`@@ -39,7 +39,7 @@ public void Insert(int index, T item)`
`39`	`39`
`40`	`40`	`var pyItem = item.ToPython();`
`41`	`41`
`42`		`- var result = Runtime.PyList_Insert(pyObject.Reference, index, pyItem.Handle);`
	`42`	`+ int result = Runtime.PyList_Insert(pyObject, index, pyItem);`
`43`	`43`	`if (result == -1)`
`44`	`44`	`Runtime.CheckExceptionOccurred();`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public int Count`
`20`	`20`	`Runtime.CheckExceptionOccurred();`
`21`	`21`	`}`
`22`	`22`
`23`		`- return (int)size;`
	`23`	`+ return checked((int)size);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`@@ -38,7 +38,7 @@ public void Clear()`
`38`	`38`	`{`
`39`	`39`	`if (IsReadOnly)`
`40`	`40`	`throw new NotImplementedException();`
`41`		`- var result = Runtime.PySequence_DelSlice(pyObject.Handle, 0, Count);`
	`41`	`+ int result = Runtime.PySequence_DelSlice(pyObject, 0, Count);`
`42`	`42`	`if (result == -1)`
`43`	`43`	`{`
`44`	`44`	`Runtime.CheckExceptionOccurred();`
`@@ -49,7 +49,7 @@ public bool Contains(T item)`
`49`	`49`	`{`
`50`	`50`	`//not sure if IEquatable is implemented and this will work!`
`51`	`51`	`foreach (var element in this)`
`52`		`- if (element.Equals(item)) return true;`
	`52`	`+ if (object.Equals(element, item)) return true;`
`53`	`53`
`54`	`54`	`return false;`
`55`	`55`	`}`
`@@ -77,7 +77,7 @@ protected bool removeAt(int index)`
`77`	`77`	`if (index >= Count \|\| index < 0)`
`78`	`78`	`return false;`
`79`	`79`
`80`		`- var result = Runtime.PySequence_DelItem(pyObject.Handle, index);`
	`80`	`+ int result = Runtime.PySequence_DelItem(pyObject, index);`
`81`	`81`
`82`	`82`	`if (result == 0)`
`83`	`83`	`return true;`
`@@ -91,7 +91,7 @@ protected int indexOf(T item)`
`91`	`91`	`var index = 0;`
`92`	`92`	`foreach (var element in this)`
`93`	`93`	`{`
`94`		`- if (element.Equals(item)) return index;`
	`94`	`+ if (object.Equals(element, item)) return index;`
`95`	`95`	`index++;`
`96`	`96`	`}`
`97`	`97`