Skip to content

Add more abstract functions to c-api #8202

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
Jul 6, 2026
Merged

Add more abstract functions to c-api #8202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6037e43
Add more abstract functions to c-api
bschoenmaeckers Jun 30, 2026
3301c67
Review
bschoenmaeckers Jun 30, 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
89 changes: 88 additions & 1 deletion crates/capi/src/abstract_.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{PyObject, pystate::with_vm};
use alloc::slice;
use core::ffi::c_int;
use core::ffi::{CStr, c_char, c_int};
pub use iter::*;
pub use mapping::*;
pub use number::*;
Expand Down Expand Up @@ -57,6 +57,21 @@ pub unsafe extern "C" fn PyObject_CallNoArgs(callable: *mut PyObject) -> *mut Py
with_vm(|vm| unsafe { &*callable }.call((), vm))
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_CallObject(
callable: *mut PyObject,
args: *mut PyObject,
) -> *mut PyObject {
with_vm(|vm| {
let callable = unsafe { &*callable };
if let Some(args) = unsafe { args.as_ref() } {
callable.call(tuple_to_args(args.try_downcast_ref::<PyTuple>(vm)?), vm)
} else {
callable.call((), vm)
}
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_Vectorcall(
callable: *mut PyObject,
Expand Down Expand Up @@ -121,6 +136,42 @@ pub unsafe extern "C" fn PyObject_VectorcallMethod(
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyVectorcall_Call(
callable: *mut PyObject,
tuple: *mut PyObject,
kwargs: *mut PyObject,
) -> *mut PyObject {
with_vm(|vm| {
let callable = unsafe { &*callable };
let tuple = unsafe { &*tuple }.try_downcast_ref::<PyTuple>(vm)?;

let mut args = tuple.iter().cloned().collect::<Vec<_>>();
let num_positional_args = args.len();

let mut kwnames = Vec::new();
if let Some(kwargs) = unsafe { kwargs.as_ref() } {
let kwargs = kwargs.try_downcast_ref::<PyDict>(vm)?;
for (key, value) in kwargs.items_vec() {
let key = key
.downcast_ref::<PyStr>()
.map(ToOwned::to_owned)
.ok_or_else(|| vm.new_type_error("keywords must be strings"))?;
kwnames.push(key.into());
args.push(value);
}
}

let kwnames = if kwnames.is_empty() {
None
} else {
Some(kwnames.as_slice())
};

callable.vectorcall(args, num_positional_args, kwnames, vm)
})
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_GetItem(obj: *mut PyObject, key: *mut PyObject) -> *mut PyObject {
with_vm(|vm| {
Expand Down Expand Up @@ -153,6 +204,32 @@ pub unsafe extern "C" fn PyObject_DelItem(obj: *mut PyObject, key: *mut PyObject
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_DelItemString(obj: *mut PyObject, key: *const c_char) -> c_int {
with_vm(|vm| {
let obj = unsafe { &*obj };
let key = unsafe { CStr::from_ptr(key) }
.to_str()
.map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?;
obj.del_item(key, vm)
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_Format(
obj: *mut PyObject,
format_spec: *mut PyObject,
) -> *mut PyObject {
with_vm(|vm| {
let obj = unsafe { &*obj };
let spec = unsafe { format_spec.as_ref() }
.map(|spec| spec.try_downcast_ref::<PyStr>(vm))
.transpose()?
.unwrap_or_else(|| vm.ctx.empty_str);
Comment thread
bschoenmaeckers marked this conversation as resolved.
vm.format(obj, spec.to_owned())
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_IsSubclass(derived: *mut PyObject, cls: *mut PyObject) -> c_int {
with_vm(|vm| {
Expand All @@ -179,6 +256,16 @@ pub unsafe extern "C" fn PyObject_Size(obj: *mut PyObject) -> isize {
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_Length(obj: *mut PyObject) -> isize {
unsafe { PyObject_Size(obj) }
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyObject_Type(obj: *mut PyObject) -> *mut PyObject {
with_vm(|_vm| unsafe { &*obj }.obj_type())
}

#[cfg(test)]
mod tests {
use pyo3::prelude::*;
Expand Down
Loading