Skip to content

Implement number protocol for PyBytes #3903

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
merged 6 commits into from
Jul 19, 2022
Merged

Implement number protocol for PyBytes #3903

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f85380b
Add number protocol for PyBytes
Karatuss Jul 16, 2022
65f6600
cargo fmt
Karatuss Jul 16, 2022
ee10db3
Resolve clippy
Karatuss Jul 16, 2022
c0aae15
Update vm/src/builtins/bytes.rs
Karatuss Jul 16, 2022
e988ffb
Refactor remainder in number protocol
Karatuss Jul 18, 2022
540b6f5
Refactor remainder
Karatuss Jul 18, 2022
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
20 changes: 16 additions & 4 deletions vm/src/builtins/bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ use crate::{
function::Either,
function::{ArgBytesLike, ArgIterable, OptionalArg, OptionalOption, PyComparisonValue},
protocol::{
BufferDescriptor, BufferMethods, PyBuffer, PyIterReturn, PyMappingMethods,
BufferDescriptor, BufferMethods, PyBuffer, PyIterReturn, PyMappingMethods, PyNumberMethods,
PySequenceMethods,
},
sliceable::{SequenceIndex, SliceableSequenceOp},
types::{
AsBuffer, AsMapping, AsSequence, Callable, Comparable, Constructor, Hashable, IterNext,
IterNextIterable, Iterable, PyComparisonOp, Unconstructible,
AsBuffer, AsMapping, AsNumber, AsSequence, Callable, Comparable, Constructor, Hashable,
IterNext, IterNextIterable, Iterable, PyComparisonOp, Unconstructible,
},
AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult,
TryFromBorrowedObject, TryFromObject, VirtualMachine,
Expand Down Expand Up @@ -108,7 +108,8 @@ impl PyBytes {
Comparable,
AsBuffer,
Iterable,
Constructor
Constructor,
AsNumber
)
)]
impl PyBytes {
Expand Down Expand Up @@ -606,6 +607,17 @@ impl AsSequence for PyBytes {
};
}

impl AsNumber for PyBytes {
const AS_NUMBER: PyNumberMethods = PyNumberMethods {
remainder: Some(|number, other, vm| {
Self::number_downcast(number)
.mod_(other.to_owned(), vm)
.to_pyresult(vm)
}),
..PyNumberMethods::NOT_IMPLEMENTED
};
}

impl Hashable for PyBytes {
#[inline]
fn hash(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<PyHash> {
Expand Down