Replace vm.issubclass to obj.is_subclass

ChJR · ChJR · commit ba4dace35586 · 2021-10-21T00:53:54.000+09:00
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -187,8 +187,32 @@ impl PyObjectRef {
         }
     }
 
+    /// Determines if `self` is a subclass of `cls`, either directly, indirectly or virtually
+    /// via the __subclasscheck__ magic method.
     pub fn is_subclass(&self, cls: &PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
-        vm.issubclass(self, cls)
+        if cls.class().is(&vm.ctx.types.type_type) {
+            if self.is(cls) {
+                return Ok(true);
+            }
+            return vm.recursive_issubclass(self, cls);
+        }
+
+        if let Ok(tuple) = PyTupleRef::try_from_object(vm, cls.clone()) {
+            for typ in tuple.as_slice().iter() {
+                if vm.with_recursion("in __subclasscheck__", || self.is_subclass(typ, vm))? {
+                    return Ok(true);
+                }
+            }
+            return Ok(false);
+        }
+
+        if let Ok(meth) = vm.get_special_method(cls.clone(), "__subclasscheck__")? {
+            let ret =
+                vm.with_recursion("in __subclasscheck__", || meth.invoke((self.clone(),), vm))?;
+            return ret.try_to_bool(vm);
+        }
+
+        vm.recursive_issubclass(self, cls)
     }
 
     /// Determines if `self` is an instance of `cls`, either directly, indirectly or virtually via
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -1035,7 +1035,7 @@ impl VirtualMachine {
         }
     }
 
-    fn abstract_issubclass(&self, subclass: PyObjectRef, cls: &PyObjectRef) -> PyResult<bool> {
+    pub fn abstract_issubclass(&self, subclass: PyObjectRef, cls: &PyObjectRef) -> PyResult<bool> {
         let mut derived = subclass;
         loop {
             if derived.is(cls) {
@@ -1067,7 +1067,11 @@ impl VirtualMachine {
         }
     }
 
-    fn recursive_issubclass(&self, subclass: &PyObjectRef, cls: &PyObjectRef) -> PyResult<bool> {
+    pub fn recursive_issubclass(
+        &self,
+        subclass: &PyObjectRef,
+        cls: &PyObjectRef,
+    ) -> PyResult<bool> {
         if let (Ok(subclass), Ok(cls)) = (
             PyTypeRef::try_from_object(self, subclass.clone()),
             PyTypeRef::try_from_object(self, cls.clone()),
@@ -1090,35 +1094,6 @@ impl VirtualMachine {
         }
     }
 
-    /// Determines if `subclass` is a subclass of `cls`, either directly, indirectly or virtually
-    /// via the __subclasscheck__ magic method.
-    pub fn issubclass(&self, subclass: &PyObjectRef, cls: &PyObjectRef) -> PyResult<bool> {
-        if cls.class().is(&self.ctx.types.type_type) {
-            if subclass.is(cls) {
-                return Ok(true);
-            }
-            return self.recursive_issubclass(subclass, cls);
-        }
-
-        if let Ok(tuple) = PyTupleRef::try_from_object(self, cls.clone()) {
-            for typ in tuple.as_slice().iter() {
-                if self.with_recursion("in __subclasscheck__", || self.issubclass(subclass, typ))? {
-                    return Ok(true);
-                }
-            }
-            return Ok(false);
-        }
-
-        if let Ok(meth) = self.get_special_method(cls.clone(), "__subclasscheck__")? {
-            let ret = self.with_recursion("in __subclasscheck__", || {
-                meth.invoke((subclass.clone(),), self)
-            })?;
-            return ret.try_to_bool(self);
-        }
-
-        self.recursive_issubclass(subclass, cls)
-    }
-
     pub fn call_get_descriptor_specific(
         &self,
         descr: PyObjectRef,
