Skip to content

Refactor Number Protocol BinaryOps & HeapTypeExt #4720

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

Closed
qingshi163 wants to merge 16 commits into from
Closed

Refactor Number Protocol BinaryOps & HeapTypeExt #4720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a3565d0
move PyNumberSlots to protocol::number
qingshi163 Mar 15, 2023
044c0ba
refactor PyNumberBinaryFunc
qingshi163 Mar 15, 2023
674975d
replace PyNumber with PyObject::pynumber methods
qingshi163 Mar 18, 2023
19d6293
refactor binary_op*
qingshi163 Mar 18, 2023
d456f4a
change as_number to NON_ATOMIC_SLOTS
qingshi163 Mar 18, 2023
a71c6c9
fix update_slots
qingshi163 Mar 19, 2023
521da91
pass compile
qingshi163 Mar 19, 2023
7f2a197
fill number_slots when creating type
qingshi163 Mar 20, 2023
0ca8d0d
fix array not implement with AsSequence
qingshi163 Mar 20, 2023
be09ec9
impl number_or for genericalias
qingshi163 Mar 20, 2023
ffd0f43
fixup
qingshi163 Mar 20, 2023
c7c44e9
fix right_op_wrapper
qingshi163 Mar 20, 2023
34077cf
fix binary_op1 subclass check
qingshi163 Mar 20, 2023
b6df537
clippy & fmt
qingshi163 Mar 20, 2023
130ef1d
clearup
qingshi163 Mar 20, 2023
feb7deb
remove Option wrap for as_number
qingshi163 Mar 21, 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
Prev Previous commit
Next Next commit
fill number_slots when creating type
  • Loading branch information
@qingshi163
qingshi163 committed Mar 20, 2023
commit 7f2a1976d1ff1a4b946568d48a039a84012c591a
2 changes: 1 addition & 1 deletion stdlib/src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
let array = module
.get_attr("array", vm)
.expect("Expect array has array type.");
array.init_builtin_number_slots(&vm.ctx);
// array.init_builtin_number_slots(&vm.ctx);

let collections_abc = vm
.import("collections.abc", None, 0)
Expand Down
127 changes: 65 additions & 62 deletions vm/src/builtins/type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl PyType {
let heaptype_ext = HeapTypeExt {
name: PyRwLock::new(name),
slots: None,
number_methods: PyNumberMethods::default(),
number_slots: PyNumberSlots::default(),
sequence_methods: PySequenceMethods::default(),
mapping_methods: PyMappingMethods::default(),
};
Expand Down Expand Up @@ -755,6 +755,9 @@ impl PyType {
base.slots.member_count + heaptype_slots.as_ref().map(|x| x.len()).unwrap_or(0);

let flags = PyTypeFlags::heap_type_flags() | PyTypeFlags::HAS_DICT;

let number_slots = base.slots.as_number.map(|x| x.into()).unwrap_or_default();

let (slots, heaptype_ext) = unsafe {
// # Safety
// `slots.name` live long enough because `heaptype_ext` is alive.
Expand All @@ -765,7 +768,7 @@ impl PyType {
let heaptype_ext = HeapTypeExt {
name: PyRwLock::new(name),
slots: heaptype_slots.to_owned(),
number_methods: PyNumberMethods::default(),
number_slots,
sequence_methods: PySequenceMethods::default(),
mapping_methods: PyMappingMethods::default(),
};
Expand Down Expand Up @@ -1377,63 +1380,63 @@ mod tests {
}
}

impl crate::PyObject {
// temporary tool to fill missing number protocols for builtin types
pub fn init_builtin_number_slots(&self, ctx: &Context) {
let typ = self
.downcast_ref::<PyType>()
.expect("not called from a type");
macro_rules! call_update_slot {
($name:ident) => {
let id = identifier!(ctx, $name);
if typ.has_attr(id) {
typ.update_slot::<true>(identifier!(ctx, $name), ctx);
}
};
}
call_update_slot!(__add__);
call_update_slot!(__radd__);
call_update_slot!(__iadd__);
call_update_slot!(__sub__);
call_update_slot!(__rsub__);
call_update_slot!(__isub__);
call_update_slot!(__mul__);
call_update_slot!(__rmul__);
call_update_slot!(__imul__);
call_update_slot!(__mod__);
call_update_slot!(__rmod__);
call_update_slot!(__imod__);
call_update_slot!(__div__);
call_update_slot!(__rdiv__);
call_update_slot!(__idiv__);
call_update_slot!(__divmod__);
call_update_slot!(__rdivmod__);
call_update_slot!(__pow__);
call_update_slot!(__rpow__);
call_update_slot!(__ipow__);
call_update_slot!(__lshift__);
call_update_slot!(__rlshift__);
call_update_slot!(__ilshift__);
call_update_slot!(__rshift__);
call_update_slot!(__rrshift__);
call_update_slot!(__irshift__);
call_update_slot!(__and__);
call_update_slot!(__rand__);
call_update_slot!(__iand__);
call_update_slot!(__xor__);
call_update_slot!(__rxor__);
call_update_slot!(__ixor__);
call_update_slot!(__or__);
call_update_slot!(__ror__);
call_update_slot!(__ior__);
call_update_slot!(__floordiv__);
call_update_slot!(__rfloordiv__);
call_update_slot!(__ifloordiv__);
call_update_slot!(__truediv__);
call_update_slot!(__rtruediv__);
call_update_slot!(__itruediv__);
call_update_slot!(__matmul__);
call_update_slot!(__rmatmul__);
call_update_slot!(__imatmul__);
}
}
// impl crate::PyObject {
// // temporary tool to fill missing number protocols for builtin types
// pub fn init_builtin_number_slots(&self, ctx: &Context) {
// let typ = self
// .downcast_ref::<PyType>()
// .expect("not called from a type");
// macro_rules! call_update_slot {
// ($name:ident) => {
// let id = identifier!(ctx, $name);
// if typ.has_attr(id) {
// typ.update_slot::<true>(identifier!(ctx, $name), ctx);
// }
// };
// }
// call_update_slot!(__add__);
// call_update_slot!(__radd__);
// call_update_slot!(__iadd__);
// call_update_slot!(__sub__);
// call_update_slot!(__rsub__);
// call_update_slot!(__isub__);
// call_update_slot!(__mul__);
// call_update_slot!(__rmul__);
// call_update_slot!(__imul__);
// call_update_slot!(__mod__);
// call_update_slot!(__rmod__);
// call_update_slot!(__imod__);
// call_update_slot!(__div__);
// call_update_slot!(__rdiv__);
// call_update_slot!(__idiv__);
// call_update_slot!(__divmod__);
// call_update_slot!(__rdivmod__);
// call_update_slot!(__pow__);
// call_update_slot!(__rpow__);
// call_update_slot!(__ipow__);
// call_update_slot!(__lshift__);
// call_update_slot!(__rlshift__);
// call_update_slot!(__ilshift__);
// call_update_slot!(__rshift__);
// call_update_slot!(__rrshift__);
// call_update_slot!(__irshift__);
// call_update_slot!(__and__);
// call_update_slot!(__rand__);
// call_update_slot!(__iand__);
// call_update_slot!(__xor__);
// call_update_slot!(__rxor__);
// call_update_slot!(__ixor__);
// call_update_slot!(__or__);
// call_update_slot!(__ror__);
// call_update_slot!(__ior__);
// call_update_slot!(__floordiv__);
// call_update_slot!(__rfloordiv__);
// call_update_slot!(__ifloordiv__);
// call_update_slot!(__truediv__);
// call_update_slot!(__rtruediv__);
// call_update_slot!(__itruediv__);
// call_update_slot!(__matmul__);
// call_update_slot!(__rmatmul__);
// call_update_slot!(__imatmul__);
// }
// }
10 changes: 5 additions & 5 deletions vm/src/stdlib/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,11 +946,11 @@ pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {
crate::protocol::VecBuffer::make_class(&vm.ctx);

builtins::extend_module(vm, &module);
use crate::AsObject;
ctx.types
.generic_alias_type
.as_object()
.init_builtin_number_slots(&vm.ctx);
// use crate::AsObject;
// ctx.types
// .generic_alias_type
// .as_object()
// .init_builtin_number_slots(&vm.ctx);

let debug_mode: bool = vm.state.settings.optimize == 0;
extend_module!(vm, module, {
Expand Down