Skip to content

Implement Number Protocol for PyType, PySet and PyFrozenSet #4619

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 2 commits into from
Mar 2, 2023
Merged

Implement Number Protocol for PyType, PySet and PyFrozenSet #4619

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a12d1e
Implement Number Protocol for PyType
xiaozhiyan Mar 2, 2023
1bec1d5
Implement Number Protocol for PySet and PyFrozenSet
xiaozhiyan Mar 2, 2023
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
Next Next commit
Implement Number Protocol for PyType
  • Loading branch information
@xiaozhiyan
xiaozhiyan committed Mar 2, 2023
commit 7a12d1e322397c33dfc8bbd70d2abf734bb0ba29
29 changes: 22 additions & 7 deletions vm/src/builtins/type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ use super::{
mappingproxy::PyMappingProxy, object, union_, PyClassMethod, PyDictRef, PyList, PyStaticMethod,
PyStr, PyStrInterned, PyStrRef, PyTuple, PyTupleRef, PyWeak,
};
use crate::common::{
ascii,
borrow::BorrowedValue,
lock::{PyRwLock, PyRwLockReadGuard},
};
use crate::{
atomic_func,
builtins::{
descriptor::{
DescrObject, MemberDef, MemberDescrObject, MemberGetter, MemberKind, MemberSetter,
Expand All @@ -17,15 +13,22 @@ use crate::{
PyBaseExceptionRef,
},
class::{PyClassImpl, StaticType},
convert::ToPyObject,
common::{
ascii,
borrow::BorrowedValue,
lock::{PyRwLock, PyRwLockReadGuard},
},
convert::{ToPyObject, ToPyResult},
function::{FuncArgs, KwArgs, OptionalArg, PySetterValue},
identifier,
protocol::{PyIterReturn, PyMappingMethods, PyNumberMethods, PySequenceMethods},
types::AsNumber,
types::{Callable, GetAttr, PyTypeFlags, PyTypeSlots, SetAttr},
AsObject, Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,
};
use indexmap::{map::Entry, IndexMap};
use itertools::Itertools;
use once_cell::sync::Lazy;
use std::{borrow::Borrow, collections::HashSet, fmt, ops::Deref, pin::Pin, ptr::NonNull};

#[pyclass(module = false, name = "type")]
Expand Down Expand Up @@ -371,7 +374,7 @@ impl Py<PyType> {
}
}

#[pyclass(with(GetAttr, SetAttr, Callable), flags(BASETYPE))]
#[pyclass(with(GetAttr, SetAttr, Callable, AsNumber), flags(BASETYPE))]
impl PyType {
// bound method for every type
pub(crate) fn __new__(zelf: PyRef<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Expand Down Expand Up @@ -1058,6 +1061,18 @@ impl Callable for PyType {
}
}

impl AsNumber for PyType {
fn as_number() -> &'static PyNumberMethods {
static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
or: atomic_func!(|num, other, vm| {
or_(num.obj.to_owned(), other.to_owned(), vm).to_pyresult(vm)
}),
..PyNumberMethods::NOT_IMPLEMENTED
});
&AS_NUMBER
}
}

fn find_base_dict_descr(cls: &Py<PyType>, vm: &VirtualMachine) -> Option<PyObjectRef> {
cls.iter_base_chain().skip(1).find_map(|cls| {
// TODO: should actually be some translation of:
Expand Down