Skip to content

Relocate vm.issubclass to obj.is_subclass #3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Oct 23, 2021
Merged

Relocate vm.issubclass to obj.is_subclass #3345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4273805
Relocate vm.issubclass to obj.is_subclass
ChJR Oct 19, 2021
7cf54ea
Replace vm.issubclass to obj.is_subclass
ChJR Oct 19, 2021
2cd6e88
Fix build error
ChJR Oct 23, 2021
c56dd90
Relocate internal methods used by obj.is*
ChJR Oct 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 132 additions & 4 deletions vm/src/protocol/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//! https://docs.python.org/3/c-api/object.html

use crate::{
builtins::{pystr::IntoPyStrRef, PyBytes, PyInt, PyStrRef, PyTupleRef},
builtins::{pystr::IntoPyStrRef, PyBytes, PyInt, PyStrRef, PyTupleRef, PyTypeRef},
bytesinner::ByteInnerNewOptions,
common::{hash::PyHash, str::to_ascii},
function::{IntoPyObject, OptionalArg},
Expand Down Expand Up @@ -227,8 +227,136 @@ impl PyObject {
}
}

// Equivalent to check_class. Masks Attribute errors (into TypeErrors) and lets everything
// else go through.
fn check_cls<F>(&self, cls: &PyObject, vm: &VirtualMachine, msg: F) -> PyResult
where
F: Fn() -> String,
{
cls.to_owned().get_attr("__bases__", vm).map_err(|e| {
// Only mask AttributeErrors.
if e.class().is(&vm.ctx.exceptions.attribute_error) {
vm.new_type_error(msg())
} else {
e
}
})
}

fn abstract_issubclass(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {
let mut derived = self;
let mut first_item: PyObjectRef;
loop {
if derived.is(cls) {
return Ok(true);
}

let bases = derived.to_owned().get_attr("__bases__", vm)?;
let tuple = PyTupleRef::try_from_object(vm, bases)?;

let n = tuple.len();
match n {
0 => {
return Ok(false);
}
1 => {
first_item = tuple.fast_getitem(0).clone();
derived = &first_item;
continue;
}
_ => {
for i in 0..n {
if let Ok(true) = tuple.fast_getitem(i).abstract_issubclass(cls, vm) {
return Ok(true);
}
}
}
}

return Ok(false);
}
}

fn recursive_issubclass(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {
if let (Ok(obj), Ok(cls)) = (
PyTypeRef::try_from_object(vm, self.to_owned()),
PyTypeRef::try_from_object(vm, cls.to_owned()),
) {
Ok(obj.issubclass(cls))
} else {
self.check_cls(self, vm, || {
format!("issubclass() arg 1 must be a class, not {}", self.class())
})
.and(self.check_cls(cls, vm, || {
format!(
"issubclass() arg 2 must be a class or tuple of classes, not {}",
cls.class()
)
}))
.and(self.abstract_issubclass(cls, vm))
}
}

/// Determines if `self` is a subclass of `cls`, either directly, indirectly or virtually
/// via the __subclasscheck__ magic method.
pub fn is_subclass(&self, cls: &PyObject, 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 self.recursive_issubclass(cls, vm);
}

if let Ok(tuple) = PyTupleRef::try_from_object(vm, cls.to_owned()) {
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.to_owned(), "__subclasscheck__")? {
let ret = vm.with_recursion("in __subclasscheck__", || {
meth.invoke((self.to_owned(),), vm)
})?;
return ret.try_to_bool(vm);
}

self.recursive_issubclass(cls, vm)
}

fn abstract_isinstance(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {
if let Ok(typ) = PyTypeRef::try_from_object(vm, cls.to_owned()) {
if self.class().issubclass(typ.clone()) {
Ok(true)
} else if let Ok(icls) =
PyTypeRef::try_from_object(vm, self.to_owned().get_attr("__class__", vm)?)
{
if icls.is(&self.class()) {
Ok(false)
} else {
Ok(icls.issubclass(typ))
}
} else {
Ok(false)
}
} else {
self.check_cls(cls, vm, || {
format!(
"isinstance() arg 2 must be a type or tuple of types, not {}",
cls.class()
)
})
.and_then(|_| {
let icls: PyObjectRef = self.to_owned().get_attr("__class__", vm)?;
if vm.is_none(&icls) {
Ok(false)
} else {
icls.abstract_issubclass(cls, vm)
}
})
}
}

/// Determines if `self` is an instance of `cls`, either directly, indirectly or virtually via
Expand All @@ -241,7 +369,7 @@ impl PyObject {
}

if cls.class().is(&vm.ctx.types.type_type) {
return vm.abstract_isinstance(self, cls);
return self.abstract_isinstance(cls, vm);
}

if let Ok(tuple) = PyTupleRef::try_from_object(vm, cls.to_owned()) {
Expand All @@ -260,7 +388,7 @@ impl PyObject {
return ret.try_to_bool(vm);
}

vm.abstract_isinstance(self, cls)
self.abstract_isinstance(cls, vm)
}

pub fn hash(&self, vm: &VirtualMachine) -> PyResult<PyHash> {
Expand Down
2 changes: 1 addition & 1 deletion vm/src/stdlib/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ mod builtins {

#[pyfunction]
fn issubclass(subclass: PyObjectRef, typ: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
vm.issubclass(&subclass, &typ)
subclass.is_subclass(&typ, vm)
}

#[pyfunction]
Expand Down
133 changes: 0 additions & 133 deletions vm/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,139 +992,6 @@ impl VirtualMachine {
}
}

// Equivalent to check_class. Masks Attribute errors (into TypeErrors) and lets everything
// else go through.
fn check_cls<F>(&self, cls: &PyObject, msg: F) -> PyResult
where
F: Fn() -> String,
{
cls.to_owned().get_attr("__bases__", self).map_err(|e| {
// Only mask AttributeErrors.
if e.class().is(&self.ctx.exceptions.attribute_error) {
self.new_type_error(msg())
} else {
e
}
})
}

pub fn abstract_isinstance(&self, obj: &PyObject, cls: &PyObject) -> PyResult<bool> {
if let Ok(typ) = PyTypeRef::try_from_object(self, cls.to_owned()) {
if obj.class().issubclass(typ.clone()) {
Ok(true)
} else if let Ok(icls) =
PyTypeRef::try_from_object(self, obj.to_owned().get_attr("__class__", self)?)
{
if icls.is(&obj.class()) {
Ok(false)
} else {
Ok(icls.issubclass(typ))
}
} else {
Ok(false)
}
} else {
self.check_cls(cls, || {
format!(
"isinstance() arg 2 must be a type or tuple of types, not {}",
cls.class()
)
})
.and_then(|_| {
let icls: PyObjectRef = obj.to_owned().get_attr("__class__", self)?;
if self.is_none(&icls) {
Ok(false)
} else {
self.abstract_issubclass(icls, cls)
}
})
}
}

fn abstract_issubclass(&self, subclass: PyObjectRef, cls: &PyObject) -> PyResult<bool> {
let mut derived = subclass;
loop {
if derived.is(cls) {
return Ok(true);
}

let bases = derived.get_attr("__bases__", self)?;
let tuple = PyTupleRef::try_from_object(self, bases)?;

let n = tuple.len();
match n {
0 => {
return Ok(false);
}
1 => {
derived = tuple.fast_getitem(0);
continue;
}
_ => {
for i in 0..n {
if let Ok(true) = self.abstract_issubclass(tuple.fast_getitem(i), cls) {
return Ok(true);
}
}
}
}

return Ok(false);
}
}

fn recursive_issubclass(&self, subclass: &PyObject, cls: &PyObject) -> PyResult<bool> {
if let (Ok(subclass), Ok(cls)) = (
PyTypeRef::try_from_object(self, subclass.to_owned()),
PyTypeRef::try_from_object(self, cls.to_owned()),
) {
Ok(subclass.issubclass(cls))
} else {
self.check_cls(subclass, || {
format!(
"issubclass() arg 1 must be a class, not {}",
subclass.class()
)
})
.and(self.check_cls(cls, || {
format!(
"issubclass() arg 2 must be a class or tuple of classes, not {}",
cls.class()
)
}))
.and(self.abstract_issubclass(subclass.to_owned(), cls))
}
}

/// Determines if `subclass` is a subclass of `cls`, either directly, indirectly or virtually
/// via the __subclasscheck__ magic method.
pub fn issubclass(&self, subclass: &PyObject, cls: &PyObject) -> 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.to_owned()) {
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.to_owned(), "__subclasscheck__")? {
let ret = self.with_recursion("in __subclasscheck__", || {
meth.invoke((subclass.to_owned(),), self)
})?;
return ret.try_to_bool(self);
}

self.recursive_issubclass(subclass, cls)
}

pub fn call_get_descriptor_specific(
&self,
descr: PyObjectRef,
Expand Down