fixed compile errors in TypeMethod (untested)

lostmsu · lostmsu · commit 672aef6132ff · 2021-10-18T23:38:57.000-07:00
diff --git a/src/runtime/typemethod.cs b/src/runtime/typemethod.cs
@@ -21,24 +21,25 @@ public TypeMethod(Type type, string name, MethodInfo[] info, bool allow_threads)
         public override NewReference Invoke(BorrowedReference ob, BorrowedReference args, BorrowedReference kw)
         {
             MethodInfo mi = info[0];
-            var arglist = new object[3];
-            arglist[0] = ob;
-            arglist[1] = args;
-            arglist[2] = kw;
+            var arglist = new object?[3];
+            arglist[0] = PyObject.FromNullableReference(ob);
+            arglist[1] = PyObject.FromNullableReference(args);
+            arglist[2] = PyObject.FromNullableReference(kw);
 
             try
             {
-                object inst = null;
-                if (ob != IntPtr.Zero)
+                object? inst = null;
+                if (ob != null)
                 {
                     inst = GetManagedObject(ob);
                 }
-                return (IntPtr)mi.Invoke(inst, BindingFlags.Default, null, arglist, null);
+                var result = (PyObject)mi.Invoke(inst, BindingFlags.Default, null, arglist, null);
+                return new NewReference(result);
             }
             catch (Exception e)
             {
                 Exceptions.SetError(e);
-                return IntPtr.Zero;
+                return default;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -21,24 +21,25 @@ public TypeMethod(Type type, string name, MethodInfo[] info, bool allow_threads)`
`21`	`21`	`public override NewReference Invoke(BorrowedReference ob, BorrowedReference args, BorrowedReference kw)`
`22`	`22`	`{`
`23`	`23`	`MethodInfo mi = info[0];`
`24`		`- var arglist = new object[3];`
`25`		`- arglist[0] = ob;`
`26`		`- arglist[1] = args;`
`27`		`- arglist[2] = kw;`
	`24`	`+ var arglist = new object?[3];`
	`25`	`+ arglist[0] = PyObject.FromNullableReference(ob);`
	`26`	`+ arglist[1] = PyObject.FromNullableReference(args);`
	`27`	`+ arglist[2] = PyObject.FromNullableReference(kw);`
`28`	`28`
`29`	`29`	`try`
`30`	`30`	`{`
`31`		`- object inst = null;`
`32`		`- if (ob != IntPtr.Zero)`
	`31`	`+ object? inst = null;`
	`32`	`+ if (ob != null)`
`33`	`33`	`{`
`34`	`34`	`inst = GetManagedObject(ob);`
`35`	`35`	`}`
`36`		`- return (IntPtr)mi.Invoke(inst, BindingFlags.Default, null, arglist, null);`
	`36`	`+ var result = (PyObject)mi.Invoke(inst, BindingFlags.Default, null, arglist, null);`
	`37`	`+ return new NewReference(result);`
`37`	`38`	`}`
`38`	`39`	`catch (Exception e)`
`39`	`40`	`{`
`40`	`41`	`Exceptions.SetError(e);`
`41`		`- return IntPtr.Zero;`
	`42`	`+ return default;`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`