switched pytuple.cs to the new style references

lostmsu · lostmsu · commit 1d8016289fda · 2021-10-18T11:46:36.000-07:00
diff --git a/src/runtime/Util.cs b/src/runtime/Util.cs
@@ -19,6 +19,8 @@ internal static class Util
 
         internal const string UseOverloadWithReferenceTypes =
             "This API is unsafe, and will be removed in the future. Use overloads working with *Reference types";
+        internal const string UseNone =
+            $"null is not supported in this context. Use {nameof(PyObject)}.{nameof(PyObject.None)}";
 
         internal const string BadStr = "bad __str__";
 
diff --git a/src/runtime/pytuple.cs b/src/runtime/pytuple.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 namespace Python.Runtime
 {
@@ -50,33 +51,32 @@ public PyTuple(PyObject o) : base(FromObject(o))
         /// <remarks>
         /// Creates a new empty PyTuple.
         /// </remarks>
-        public PyTuple() : base(NewEmtpy().Steal()) { }
+        public PyTuple() : base(NewEmtpy()) { }
 
-        private static NewReference NewEmtpy()
+        private static StolenReference NewEmtpy()
         {
-            IntPtr ptr = Runtime.PyTuple_New(0);
-            PythonException.ThrowIfIsNull(ptr);
-            return NewReference.DangerousFromPointer(ptr);
+            var ptr = Runtime.PyTuple_New(0);
+            return ptr.StealOrThrow();
         }
 
-        private static NewReference FromArray(PyObject[] items)
+        private static StolenReference FromArray(PyObject[] items)
         {
             if (items is null) throw new ArgumentNullException(nameof(items));
+            if (items.Any(item => item is null))
+                throw new ArgumentException(message: Util.UseNone, paramName: nameof(items));
 
             int count = items.Length;
-            IntPtr val = Runtime.PyTuple_New(count);
+            var val = Runtime.PyTuple_New(count);
             for (var i = 0; i < count; i++)
             {
-                IntPtr ptr = items[i].obj;
-                Runtime.XIncref(ptr);
-                int res = Runtime.PyTuple_SetItem(val, i, ptr);
+                int res = Runtime.PyTuple_SetItem(val.Borrow(), i, items[i]);
                 if (res != 0)
                 {
-                    Runtime.Py_DecRef(val);
+                    val.Dispose();
                     throw PythonException.ThrowLastAsClrException();
                 }
             }
-            return NewReference.DangerousFromPointer(val);
+            return val.Steal();
         }
 
         /// <summary>
@@ -88,7 +88,7 @@ private static NewReference FromArray(PyObject[] items)
         /// See caveats about PyTuple_SetItem:
         /// https://www.coursehero.com/file/p4j2ogg/important-exceptions-to-this-rule-PyTupleSetItem-and-PyListSetItem-These/
         /// </remarks>
-        public PyTuple(PyObject[] items) : base(FromArray(items).Steal())
+        public PyTuple(PyObject[] items) : base(FromArray(items))
         {
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Linq;`
`2`	`3`
`3`	`4`	`namespace Python.Runtime`
`4`	`5`	`{`
`@@ -50,33 +51,32 @@ public PyTuple(PyObject o) : base(FromObject(o))`
`50`	`51`	`/// <remarks>`
`51`	`52`	`/// Creates a new empty PyTuple.`
`52`	`53`	`/// </remarks>`
`53`		`- public PyTuple() : base(NewEmtpy().Steal()) { }`
	`54`	`+ public PyTuple() : base(NewEmtpy()) { }`
`54`	`55`
`55`		`- private static NewReference NewEmtpy()`
	`56`	`+ private static StolenReference NewEmtpy()`
`56`	`57`	`{`
`57`		`- IntPtr ptr = Runtime.PyTuple_New(0);`
`58`		`- PythonException.ThrowIfIsNull(ptr);`
`59`		`- return NewReference.DangerousFromPointer(ptr);`
	`58`	`+ var ptr = Runtime.PyTuple_New(0);`
	`59`	`+ return ptr.StealOrThrow();`
`60`	`60`	`}`
`61`	`61`
`62`		`- private static NewReference FromArray(PyObject[] items)`
	`62`	`+ private static StolenReference FromArray(PyObject[] items)`
`63`	`63`	`{`
`64`	`64`	`if (items is null) throw new ArgumentNullException(nameof(items));`
	`65`	`+ if (items.Any(item => item is null))`
	`66`	`+ throw new ArgumentException(message: Util.UseNone, paramName: nameof(items));`
`65`	`67`
`66`	`68`	`int count = items.Length;`
`67`		`- IntPtr val = Runtime.PyTuple_New(count);`
	`69`	`+ var val = Runtime.PyTuple_New(count);`
`68`	`70`	`for (var i = 0; i < count; i++)`
`69`	`71`	`{`
`70`		`- IntPtr ptr = items[i].obj;`
`71`		`- Runtime.XIncref(ptr);`
`72`		`- int res = Runtime.PyTuple_SetItem(val, i, ptr);`
	`72`	`+ int res = Runtime.PyTuple_SetItem(val.Borrow(), i, items[i]);`
`73`	`73`	`if (res != 0)`
`74`	`74`	`{`
`75`		`- Runtime.Py_DecRef(val);`
	`75`	`+ val.Dispose();`
`76`	`76`	`throw PythonException.ThrowLastAsClrException();`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`- return NewReference.DangerousFromPointer(val);`
	`79`	`+ return val.Steal();`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/// <summary>`
`@@ -88,7 +88,7 @@ private static NewReference FromArray(PyObject[] items)`
`88`	`88`	`/// See caveats about PyTuple_SetItem:`
`89`	`89`	`/// https://www.coursehero.com/file/p4j2ogg/important-exceptions-to-this-rule-PyTupleSetItem-and-PyListSetItem-These/`
`90`	`90`	`/// </remarks>`
`91`		`- public PyTuple(PyObject[] items) : base(FromArray(items).Steal())`
	`91`	`+ public PyTuple(PyObject[] items) : base(FromArray(items))`
`92`	`92`	`{`
`93`	`93`	`}`
`94`	`94`