Skip to content

_ctypes addressof and Structure #5573

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 4 commits into from
Mar 1, 2025
Merged

_ctypes addressof and Structure #5573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2baeb3e
_ctypes.addressof
arihant2math Feb 28, 2025
66c40c6
ctypes.Structure implementation
arihant2math Feb 28, 2025
2c6e126
clippy fix
arihant2math Feb 28, 2025
19505b5
formatting
arihant2math Feb 28, 2025
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
10 changes: 10 additions & 0 deletions vm/src/stdlib/ctypes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,16 @@ pub(crate) mod _ctypes {
}
}

#[pyfunction]
fn addressof(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
if obj.is_instance(PyCSimple::static_type().as_ref(), vm)? {
let simple = obj.downcast_ref::<PyCSimple>().unwrap();
Ok(simple.value.as_ptr() as usize)
} else {
Err(vm.new_type_error("expected a ctypes instance".to_string()))
}
}

#[pyfunction]
fn get_errno() -> i32 {
errno::errno().0
Expand Down
58 changes: 57 additions & 1 deletion vm/src/stdlib/ctypes/structure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,61 @@
use crate::builtins::{PyList, PyStr, PyTuple, PyTypeRef};
use crate::function::FuncArgs;
use crate::types::GetAttr;
use crate::{AsObject, Py, PyObjectRef, PyPayload, PyResult, VirtualMachine};
use rustpython_common::lock::PyRwLock;
use rustpython_vm::types::Constructor;
use std::collections::HashMap;
use std::fmt::Debug;

#[pyclass(name = "Structure", module = "_ctypes")]
pub struct PyCStructure {}
#[derive(PyPayload, Debug)]
pub struct PyCStructure {
#[allow(dead_code)]
field_data: PyRwLock<HashMap<String, PyObjectRef>>,
data: PyRwLock<HashMap<String, PyObjectRef>>,
}

impl Constructor for PyCStructure {
type Args = FuncArgs;

fn py_new(cls: PyTypeRef, _args: Self::Args, vm: &VirtualMachine) -> PyResult {
let fields_attr = cls
.get_class_attr(vm.ctx.interned_str("_fields_").unwrap())
.ok_or_else(|| {
vm.new_attribute_error("Structure must have a _fields_ attribute".to_string())
})?;
// downcast into list
let fields = fields_attr.downcast_ref::<PyList>().ok_or_else(|| {
vm.new_type_error("Structure _fields_ attribute must be a list".to_string())
})?;
let fields = fields.borrow_vec();
let mut field_data = HashMap::new();
for field in fields.iter() {
let field = field
.downcast_ref::<PyTuple>()
.ok_or_else(|| vm.new_type_error("Field must be a tuple".to_string()))?;
let name = field
.first()
.unwrap()
.downcast_ref::<PyStr>()
.ok_or_else(|| vm.new_type_error("Field name must be a string".to_string()))?;
let typ = field.get(1).unwrap().clone();
field_data.insert(name.as_str().to_string(), typ);
}
todo!("Implement PyCStructure::py_new")
}
}

impl GetAttr for PyCStructure {
fn getattro(zelf: &Py<Self>, name: &Py<PyStr>, vm: &VirtualMachine) -> PyResult {
let name = name.to_string();
let data = zelf.data.read();
match data.get(&name) {
Some(value) => Ok(value.clone()),
None => Err(vm.new_attribute_error(format!("No attribute named {}", name))),
}
}
}

#[pyclass(flags(BASETYPE, IMMUTABLETYPE))]
impl PyCStructure {}
Loading