Avoid use of PyObject in objcomplex.

Author: cthulahoops

vm/src/obj/objcomplex.rs

@@ -1,8 +1,8 @@
 use super::objfloat;
 use super::objint;
-use super::objtype;
+use super::objtype::{self, PyClassRef};
 use crate::pyobject::{
-    PyContext, PyFuncArgs, PyObject, PyObjectRef, PyResult, PyValue, TypeProtocol,
+    OptionalArg, PyContext, PyFuncArgs, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 use num_complex::Complex64;
@@ -12,6 +12,7 @@ use num_traits::ToPrimitive;
 pub struct PyComplex {
     value: Complex64,
 }
+type PyComplexRef = PyRef<PyComplex>;
 
 impl PyValue for PyComplex {
     fn required_type(ctx: &PyContext) -> PyObjectRef {
@@ -65,31 +66,24 @@ pub fn get_value(obj: &PyObjectRef) -> Complex64 {
     obj.payload::<PyComplex>().unwrap().value
 }
 
-fn complex_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
-    arg_check!(
-        vm,
-        args,
-        required = [(cls, None)],
-        optional = [(real, None), (imag, None)]
-    );
-
-    if !objtype::issubclass(cls, &vm.ctx.complex_type()) {
-        return Err(vm.new_type_error(format!("{:?} is not a subtype of complex", cls)));
-    }
-
+fn complex_new(
+    cls: PyClassRef,
+    real: OptionalArg<PyObjectRef>,
+    imag: OptionalArg<PyObjectRef>,
+    vm: &mut VirtualMachine,
+) -> PyResult<PyComplexRef> {
     let real = match real {
-        None => 0.0,
-        Some(value) => objfloat::make_float(vm, value)?,
+        OptionalArg::Missing => 0.0,
+        OptionalArg::Present(ref value) => objfloat::make_float(vm, value)?,
     };
 
     let imag = match imag {
-        None => 0.0,
-        Some(value) => objfloat::make_float(vm, value)?,
+        OptionalArg::Missing => 0.0,
+        OptionalArg::Present(ref value) => objfloat::make_float(vm, value)?,
     };
 
     let value = Complex64::new(real, imag);
-
-    Ok(PyObject::new(PyComplex { value }, cls.clone()))
+    PyComplex { value }.into_ref_with_type(vm, cls)
 }
 
 fn complex_real(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {