Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/ceval.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
use crate::pyframe::PyFrameObject;
use crate::pystate::with_vm;
use crate::unicodeobject::decode_fsdefault_and_size;
use core::ffi::{CStr, c_char, c_int};
use core::ptr::NonNull;
use rustpython_vm::builtins::{PyCode, PyDict};
use rustpython_vm::function::ArgMapping;
use rustpython_vm::scope::Scope;
use rustpython_vm::version;
use rustpython_vm::{AsObject, PyObject, TryFromObject};
use rustpython_vm::{PyObjectRef, version};

#[unsafe(no_mangle)]
pub unsafe extern "C" fn Py_CompileString(
Expand Down Expand Up @@ -42,6 +43,16 @@ pub unsafe extern "C" fn PyEval_EvalCode(
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyEval_EvalFrame(f: *mut PyFrameObject) -> *mut PyObject {
unsafe { PyEval_EvalFrameEx(f, 0) }
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyEval_EvalFrameEx(f: *mut PyFrameObject, _exc: c_int) -> *mut PyObject {
with_vm(|vm| vm.run_frame(unsafe { &*f }.to_owned()))
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetBuiltins() -> *mut PyObject {
with_vm(|vm| {
Expand All @@ -52,6 +63,82 @@ pub extern "C" fn PyEval_GetBuiltins() -> *mut PyObject {
})
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetFrame() -> *mut PyFrameObject {
with_vm(|vm| -> *mut PyObject {
vm.current_frame()
.map(|frame| frame.as_object().as_raw().cast_mut())
.unwrap_or_default()
})
.cast()
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetFrameBuiltins() -> *mut PyObject {
with_vm(|vm| {
vm.current_frame().map_or_else(
|| vm.builtins.as_object().to_owned(),
|frame| frame.builtins.as_object().to_owned(),
)
})
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetFrameGlobals() -> *mut PyObject {
with_vm(|vm| {
vm.current_frame()
.map(|frame| frame.globals.as_object().to_owned().into_raw().as_ptr())
.unwrap_or_default()
})
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetFrameLocals() -> *mut PyObject {
with_vm(|vm| {
let Some(frame) = vm.current_frame() else {
return Ok(core::ptr::null_mut());
};
let locals: PyObjectRef = frame.locals(vm)?.into();
Ok(locals.into_raw().as_ptr())
})
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetGlobals() -> *mut PyObject {
with_vm(|vm| {
vm.current_frame()
.map(|frame| frame.globals.as_object().as_raw())
.unwrap_or_default()
})
}

#[unsafe(no_mangle)]
pub extern "C" fn PyEval_GetLocals() -> *mut PyObject {
with_vm(|vm| {
let Some(frame) = vm.current_frame() else {
return Ok(core::ptr::null_mut());
};
let _ = frame.locals(vm)?;
Ok(frame.locals.as_object(vm).as_raw().cast_mut())
})
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyEval_GetFuncDesc(func: *mut PyObject) -> *const c_char {
with_vm(|vm| {
let func = unsafe { &*func };
let cls = func.class();
if cls.is(vm.ctx.types.bound_method_type)
|| cls.is(vm.ctx.types.function_type)
|| cls.is(vm.ctx.types.builtin_function_or_method_type)
{
c"()"
} else {
c" object"
}
})
}

#[cfg(test)]
mod tests {
use pyo3::exceptions::PyException;
Expand Down
22 changes: 12 additions & 10 deletions crates/capi/src/pyframe.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
use crate::PyObject;
use crate::pystate::with_vm;
use core::ffi::c_int;
use rustpython_vm::Py;
use rustpython_vm::builtins::PyCode;
use rustpython_vm::frame::Frame;

pub type PyFrameObject = Py<Frame>;
pub type PyCodeObject = Py<PyCode>;

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyFrame_GetCode(frame: *mut PyObject) -> *mut PyObject {
with_vm(|vm| {
let frame = unsafe { &*frame }.try_downcast_ref::<Frame>(vm)?;
Ok(frame.f_code())
})
pub unsafe extern "C" fn PyFrame_GetCode(frame: *mut PyFrameObject) -> *mut PyCodeObject {
with_vm(|_vm| Ok(unsafe { &*frame }.f_code()))
}

#[unsafe(no_mangle)]
pub unsafe extern "C" fn PyFrame_GetLineNumber(frame: *mut PyObject) -> core::ffi::c_int {
with_vm(|vm| {
let frame = unsafe { &*frame }.try_downcast_ref::<Frame>(vm)?;
Ok(frame.f_lineno() as core::ffi::c_int)
pub unsafe extern "C" fn PyFrame_GetLineNumber(frame: *mut PyFrameObject) -> c_int {
with_vm(|_vm| {
let lineno = unsafe { &*frame }.f_lineno();
Ok(lineno.try_into().unwrap_or(c_int::MAX))
})
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
23 changes: 21 additions & 2 deletions crates/capi/src/util.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::PyObject;
use core::convert::Infallible;
use core::ffi::{c_char, c_double, c_int, c_long, c_ulong, c_void};
use rustpython_vm::{PyObjectRef, PyRef, PyResult, VirtualMachine};
use core::ffi::{CStr, c_char, c_double, c_int, c_long, c_ulong, c_void};
use rustpython_vm::{Py, PyObjectRef, PyRef, PyResult, VirtualMachine};

pub(crate) trait FfiResult<Output = Self> {
const ERR_VALUE: Output;
Expand Down Expand Up @@ -36,6 +36,17 @@ where
}
}

impl<T> FfiResult<*mut Py<T>> for PyRef<T>
where
Self: Into<PyObjectRef>,
{
const ERR_VALUE: *mut Py<T> = core::ptr::null_mut();

fn into_output(self, _vm: &VirtualMachine) -> *mut Py<T> {
self.into().into_raw().as_ptr().cast()
}
}

impl FfiResult<*mut PyObject> for PyObjectRef {
const ERR_VALUE: *mut PyObject = core::ptr::null_mut();

Expand Down Expand Up @@ -92,6 +103,14 @@ impl FfiResult for *const c_char {
}
}

impl FfiResult<*const c_char> for &CStr {
const ERR_VALUE: *const c_char = core::ptr::null_mut();

fn into_output(self, _vm: &VirtualMachine) -> *const c_char {
self.as_ptr()
}
}

impl FfiResult<isize> for usize {
const ERR_VALUE: isize = -1;

Expand Down
Loading