Skip to content

Add tuple support to c-api #7907

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
May 19, 2026
Merged

Add tuple support to c-api #7907

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a9396
Add tuple support to c-api
bschoenmaeckers May 8, 2026
8aebd8a
Review
bschoenmaeckers May 18, 2026
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
Review
  • Loading branch information
@bschoenmaeckers
bschoenmaeckers committed May 19, 2026
commit 8aebd8a2781701ff964fd00054e58de77d20cb13
26 changes: 17 additions & 9 deletions crates/capi/src/tupleobject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
use crate::PyObject;
use crate::object::define_py_check;
use crate::pystate::with_vm;
use core::ffi::c_int;
use core::slice;
use rustpython_vm::PyResult;
use rustpython_vm::builtins::PyTuple;
use rustpython_vm::sliceable::SliceableSequenceOp;

define_py_check!(fn PyTuple_Check, types.int_type);
define_py_check!(exact fn PyTuple_CheckExact, types.int_type);
define_py_check!(fn PyTuple_Check, types.tuple_type);
define_py_check!(exact fn PyTuple_CheckExact, types.tuple_type);

#[unsafe(no_mangle)]
pub extern "C" fn PyTuple_New(len: isize) -> *mut PyObject {
Expand All @@ -28,12 +29,15 @@ pub unsafe extern "C" fn PyTuple_FromArray(
size: isize,
) -> *mut PyObject {
with_vm(|vm| {
let slice = unsafe { slice::from_raw_parts(array, size as usize) };
let size = size
.try_into()
.map_err(|_| vm.new_system_error("negative size passed to Tuple_FromArray"))?;
let slice = unsafe { slice::from_raw_parts(array, size) };
let elements = slice
.iter()
.map(|ptr| unsafe { &**ptr }.to_owned())
.collect::<Vec<_>>();
vm.new_tuple(elements)
Ok(vm.new_tuple(elements))
})
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

Expand All @@ -42,8 +46,10 @@ pub extern "C" fn PyTuple_SetItem(
_tuple: *mut PyObject,
_pos: isize,
_value: *mut PyObject,
) -> *mut PyObject {
with_vm::<PyResult, _>(|vm| Err(vm.new_not_implemented_error("Tuple objects are immutable")))
) -> c_int {
with_vm::<PyResult<()>, _>(
|vm| Err(vm.new_not_implemented_error("Tuple objects are immutable")),
)
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

#[unsafe(no_mangle)]
Expand Down Expand Up @@ -75,9 +81,11 @@ pub unsafe extern "C" fn PyTuple_GetSlice(
high: isize,
) -> *mut PyObject {
with_vm(|vm| {
let slice = unsafe { &*tuple }
.try_downcast_ref::<PyTuple>(vm)?
.do_slice(low as usize..high as usize);
let tuple = unsafe { &*tuple }.try_downcast_ref::<PyTuple>(vm)?;
let len = tuple.__len__() as isize;
let low = low.clamp(0, len);
let high = high.clamp(low, len);
let slice = tuple.do_slice(low as usize..high as usize);
Ok(vm.ctx.new_tuple(slice))
})
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Expand Down
Loading