Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3334aa9

Browse filesBrowse files
darleybarretoyouknowone
darleybarreto
authored and
youknowone
committed
Adding several changes to make some tests pass
1 parent 8053d7b commit 3334aa9
Copy full SHA for 3334aa9

16 files changed

+139
-98
lines changed

‎Lib/ctypes/__init__.py

Copy file name to clipboardExpand all lines: Lib/ctypes/__init__.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,4 @@ def WinError(code=None, descr=None):
346346
elif sizeof(kind) == 8: c_uint64 = kind
347347
del(kind)
348348

349-
_reset_cache()
349+
# _reset_cache()

‎Lib/ctypes/tests/__init__.py renamed to ‎Lib/ctypes/test/__init__.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/__main__.py renamed to ‎Lib/ctypes/test/__main__.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_arrays.py renamed to ‎Lib/ctypes/test/test_arrays.py

Copy file name to clipboardExpand all lines: Lib/ctypes/test/test_arrays.py
+8-3Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,37 +177,42 @@ def test_bad_subclass(self):
177177
with self.assertRaises(AttributeError):
178178
class T(Array):
179179
pass
180+
T()
180181
with self.assertRaises(AttributeError):
181182
class T(Array):
182183
_type_ = c_int
184+
T()
183185
with self.assertRaises(AttributeError):
184186
class T(Array):
185187
_length_ = 13
186-
188+
T()
187189
def test_bad_length(self):
188190
with self.assertRaises(ValueError):
189191
class T(Array):
190192
_type_ = c_int
191193
_length_ = - sys.maxsize * 2
194+
T()
192195
with self.assertRaises(ValueError):
193196
class T(Array):
194197
_type_ = c_int
195198
_length_ = -1
199+
T()
196200
with self.assertRaises(TypeError):
197201
class T(Array):
198202
_type_ = c_int
199203
_length_ = 1.87
204+
T()
200205
with self.assertRaises(OverflowError):
201206
class T(Array):
202207
_type_ = c_int
203208
_length_ = sys.maxsize * 2
204-
209+
T()
205210
def test_zero_length(self):
206211
# _length_ can be zero.
207212
class T(Array):
208213
_type_ = c_int
209214
_length_ = 0
210-
215+
T()
211216
@unittest.skip("TODO: RUSTPYTHON, implrment Structure")
212217
def test_empty_element_struct(self):
213218
class EmptyStruct(Structure):

‎Lib/ctypes/tests/test_buffers.py renamed to ‎Lib/ctypes/test/test_buffers.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_bytes.py renamed to ‎Lib/ctypes/test/test_bytes.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_funcptr.py renamed to ‎Lib/ctypes/test/test_funcptr.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_functions.py renamed to ‎Lib/ctypes/test/test_functions.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_loading.py renamed to ‎Lib/ctypes/test/test_loading.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_strings.py renamed to ‎Lib/ctypes/test/test_strings.py

Copy file name to clipboard
File renamed without changes.

‎Lib/ctypes/tests/test_unicode.py renamed to ‎Lib/ctypes/test/test_unicode.py

Copy file name to clipboard
File renamed without changes.

‎vm/src/stdlib/ctypes/array.rs

Copy file name to clipboardExpand all lines: vm/src/stdlib/ctypes/array.rs
+57-43Lines changed: 57 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ use crate::VirtualMachine;
1919

2020
use crate::stdlib::ctypes::basics::{
2121
default_from_param, generic_get_buffer, get_size, BorrowValue as BorrowValueCData,
22-
BorrowValueMut, PyCData, PyCDataFunctions, PyCDataMethods, RawBuffer,
22+
BorrowValueMut, PyCData, PyCDataFunctions, PyCDataMethods, PyCDataSequenceMethods, RawBuffer,
2323
};
2424
use crate::stdlib::ctypes::pointer::PyCPointer;
25-
use crate::stdlib::ctypes::primitive::PySimpleType;
25+
use crate::stdlib::ctypes::primitive::{new_simple_type, PySimpleType};
2626

2727
macro_rules! byte_match_type {
2828
(
@@ -111,19 +111,24 @@ pub fn make_array_with_lenght(
111111
length: usize,
112112
vm: &VirtualMachine,
113113
) -> PyResult<PyRef<PyCArray>> {
114-
if let Ok(ref outer_type) = vm.get_attribute(cls.as_object().to_owned(), "_type_") {
115-
if let Ok(_type_) = outer_type.clone().downcast_exact::<PySimpleType>(vm) {
116-
let itemsize = get_size(_type_._type_.as_str());
117-
118-
Ok(PyCArray {
119-
_type_,
120-
_length_: length,
121-
_buffer: PyRwLock::new(RawBuffer {
122-
inner: Vec::with_capacity(length * itemsize).as_mut_ptr(),
123-
size: length * itemsize,
124-
}),
114+
if let Some(outer_type) = cls.get_attr("_type_") {
115+
let length = length as usize;
116+
if let Ok(_type_) = vm.get_attribute(outer_type.clone(), "_type_") {
117+
let itemsize = get_size(_type_.downcast::<PyStr>().unwrap().to_string().as_str());
118+
119+
if length.checked_mul(itemsize).is_none() {
120+
Err(vm.new_overflow_error("Array size too big".to_string()))
121+
} else {
122+
Ok(PyCArray {
123+
_type_: new_simple_type(Either::A(&outer_type), vm)?.into_ref(vm),
124+
_length_: length,
125+
_buffer: PyRwLock::new(RawBuffer {
126+
inner: Vec::with_capacity(length * itemsize).as_mut_ptr(),
127+
size: length * itemsize,
128+
}),
129+
}
130+
.into_ref_with_type(vm, cls)?)
125131
}
126-
.into_ref_with_type(vm, cls)?)
127132
} else {
128133
Err(vm.new_type_error("_type_ must have storage info".to_string()))
129134
}
@@ -140,7 +145,7 @@ fn set_array_value(
140145
obj: PyObjectRef,
141146
vm: &VirtualMachine,
142147
) -> PyResult<()> {
143-
if obj.clone().downcast::<PyCData>().is_err() {
148+
if !obj.clone_class().issubclass(PyCData::static_type()) {
144149
let value = PyCDataMethods::from_param(zelf._type_.clone(), obj, vm)?;
145150

146151
let v_buffer = try_buffer_from_object(vm, &value)?;
@@ -247,7 +252,7 @@ impl PyCDataMethods for PyCArray {
247252
};
248253

249254
if vm.obj_len(&value)? > zelf._length_ {
250-
Err(vm.new_value_error("Invalid length".to_string()))
255+
Err(vm.new_value_error("value has size greater than the array".to_string()))
251256
} else if zelf._type_._type_.as_str() == "c"
252257
&& value.clone().downcast_exact::<PyBytes>(vm).is_err()
253258
{
@@ -266,13 +271,16 @@ impl PyCDataMethods for PyCArray {
266271
Err(vm.new_type_error("Invalid type".to_string()))
267272
}?;
268273

269-
PyCArray::init(zelf.clone(), value, vm)?;
274+
PyCArray::init(zelf.clone(), OptionalArg::Present(value), vm)?;
270275

271276
default_from_param(zelf.clone_class(), zelf.as_object().clone(), vm)
272277
}
273278
}
274279

275-
#[pyimpl(flags(BASETYPE), with(BufferProtocol))]
280+
#[pyimpl(
281+
flags(BASETYPE),
282+
with(BufferProtocol, PyCDataFunctions, PyCDataMethods)
283+
)]
276284
impl PyCArray {
277285
#[pyslot]
278286
fn tp_new(cls: PyTypeRef, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
@@ -304,31 +312,31 @@ impl PyCArray {
304312
}
305313

306314
#[pymethod(magic)]
307-
pub fn init(zelf: PyRef<Self>, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
308-
let value_lenght = vm.obj_len(&value)?;
309-
310-
if value_lenght < zelf._length_ {
311-
let value_vec: Vec<PyObjectRef> = vm.extract_elements(&value)?;
312-
for (i, v) in value_vec.iter().enumerate() {
313-
Self::setitem(zelf.clone(), Either::A(i as isize), v.clone(), vm)?
314-
}
315-
Ok(())
316-
} else if value_lenght == zelf._length_ {
317-
let py_slice = Either::B(
318-
PySlice {
319-
start: Some(vm.new_pyobj(0)),
320-
stop: vm.new_pyobj(zelf._length_),
321-
step: None,
315+
pub fn init(zelf: PyRef<Self>, value: OptionalArg, vm: &VirtualMachine) -> PyResult<()> {
316+
value.map_or(Ok(()), |value| {
317+
let value_lenght = vm.obj_len(&value)?;
318+
319+
if value_lenght < zelf._length_ {
320+
let value_vec: Vec<PyObjectRef> = vm.extract_elements(&value)?;
321+
for (i, v) in value_vec.iter().enumerate() {
322+
Self::setitem(zelf.clone(), Either::A(i as isize), v.clone(), vm)?
322323
}
323-
.into_ref(vm),
324-
);
324+
Ok(())
325+
} else if value_lenght == zelf._length_ {
326+
let py_slice = Either::B(
327+
PySlice {
328+
start: Some(vm.new_pyobj(0)),
329+
stop: vm.new_pyobj(zelf._length_),
330+
step: None,
331+
}
332+
.into_ref(vm),
333+
);
325334

326-
Self::setitem(zelf, py_slice, value, vm)
327-
} else {
328-
Err(vm.new_value_error(
329-
"number of values is greater than the size of the array".to_string(),
330-
))
331-
}
335+
Self::setitem(zelf, py_slice, value, vm)
336+
} else {
337+
Err(vm.new_value_error("value has size greater than the array".to_string()))
338+
}
339+
})
332340
}
333341

334342
#[pyproperty(name = "value")]
@@ -502,8 +510,10 @@ impl PyCArray {
502510

503511
let res = match k_or_idx {
504512
Either::A(idx) => {
505-
if idx < 0 || idx as usize > zelf._length_ {
513+
if idx < 0 {
506514
Err(vm.new_index_error("invalid index".to_string()))
515+
} else if idx as usize > zelf._length_ {
516+
Err(vm.new_index_error("index out of bounds".to_string()))
507517
} else {
508518
let idx = idx as usize;
509519
let buffer_slice = buffer_bytes[idx..idx + offset].as_ref();
@@ -548,8 +558,10 @@ impl PyCArray {
548558

549559
match k_or_idx {
550560
Either::A(idx) => {
551-
if idx < 0 || idx as usize > zelf._length_ {
561+
if idx < 0 {
552562
Err(vm.new_index_error("invalid index".to_string()))
563+
} else if idx as usize > zelf._length_ {
564+
Err(vm.new_index_error("index out of bounds".to_string()))
553565
} else {
554566
set_array_value(&zelf, &mut buffer_bytes, idx as usize, offset, obj, vm)
555567
}
@@ -617,3 +629,5 @@ impl PyCDataFunctions for PyCArray {
617629
.new_pyobj(unsafe { &*zelf.borrow_value().inner } as *const _ as *const usize as usize))
618630
}
619631
}
632+
633+
impl PyCDataSequenceMethods for PyCArray {}

‎vm/src/stdlib/ctypes/basics.rs

Copy file name to clipboardExpand all lines: vm/src/stdlib/ctypes/basics.rs
+50-38Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ use crate::common::borrow::{BorrowedValue, BorrowedValueMut};
1010
use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
1111
use crate::function::OptionalArg;
1212
use crate::pyobject::{
13-
PyObjectRef, PyRef, PyResult, PyValue, StaticType, TryFromObject, TypeProtocol,
13+
Either, PyObjectRef, PyRef, PyResult, PyValue, StaticType, TryFromObject, TypeProtocol,
1414
};
1515
use crate::slots::BufferProtocol;
1616
use crate::VirtualMachine;
1717

1818
use crate::stdlib::ctypes::array::make_array_with_lenght;
1919
use crate::stdlib::ctypes::dll::dlsym;
20+
use crate::stdlib::ctypes::primitive::{new_simple_type, PySimpleType};
2021

2122
use crossbeam_utils::atomic::AtomicCell;
2223

@@ -55,7 +56,7 @@ pub fn get_size(ty: &str) -> usize {
5556
"f" => c_float
5657
"d" | "g" => c_double
5758
"?" | "B" => c_uchar
58-
"P" | "z" | "Z" => c_void
59+
"P" | "z" | "Z" => usize
5960
)
6061
}
6162

@@ -445,50 +446,61 @@ impl PyCData {
445446
pub fn setstate(zelf: PyRef<Self>) {}
446447
}
447448

448-
pub fn sizeof_func(tp: PyObjectRef, vm: &VirtualMachine) -> PyResult {
449-
if tp.clone().downcast::<PyCData>().is_err() {
450-
Err(vm.new_type_error(format!(
451-
"sizeof() argument must be a ctypes instance, not {}",
452-
tp.class().name
453-
)))
454-
} else {
455-
let size_of_instances = vm.get_method(tp, "size_of_instances").unwrap();
456-
vm.invoke(&size_of_instances?, ())
449+
pub fn sizeof_func(tp: Either<PyTypeRef, PyObjectRef>, vm: &VirtualMachine) -> PyResult {
450+
match tp {
451+
Either::A(type_) if type_.issubclass(PySimpleType::static_type()) => {
452+
let zelf = new_simple_type(Either::B(&type_), vm)?;
453+
PyCDataFunctions::size_of_instances(zelf.into_ref(vm), vm)
454+
}
455+
Either::B(obj) if obj.has_class_attr("size_of_instances") => {
456+
let size_of = vm.get_attribute(obj, "size_of_instances").unwrap();
457+
vm.invoke(&size_of, ())
458+
}
459+
_ => Err(vm.new_type_error("this type has no size".to_string())),
457460
}
458461
}
459462

460-
pub fn alignment(tp: PyObjectRef, vm: &VirtualMachine) -> PyResult {
461-
if tp.clone().downcast::<PyCData>().is_err() {
462-
Err(vm.new_type_error(format!(
463-
"alignment() argument must be a ctypes instance, not {}",
464-
tp.class().name
465-
)))
466-
} else {
467-
let alignment_of_instances = vm.get_method(tp, "alignment_of_instances").unwrap();
468-
vm.invoke(&alignment_of_instances?, ())
463+
pub fn alignment(tp: Either<PyTypeRef, PyObjectRef>, vm: &VirtualMachine) -> PyResult {
464+
match tp {
465+
Either::A(type_) if type_.issubclass(PySimpleType::static_type()) => {
466+
let zelf = new_simple_type(Either::B(&type_), vm)?;
467+
PyCDataFunctions::alignment_of_instances(zelf.into_ref(vm), vm)
468+
}
469+
Either::B(obj) if obj.has_class_attr("alignment_of_instances") => {
470+
let size_of = vm.get_attribute(obj, "alignment_of_instances").unwrap();
471+
vm.invoke(&size_of, ())
472+
}
473+
_ => Err(vm.new_type_error("no alignment info".to_string())),
469474
}
470475
}
471476

472477
pub fn byref(tp: PyObjectRef, vm: &VirtualMachine) -> PyResult {
473-
if tp.clone().downcast::<PyCData>().is_err() {
474-
Err(vm.new_type_error(format!(
475-
"byref() argument must be a ctypes instance, not {}",
476-
tp.class().name
477-
)))
478-
} else {
479-
let ref_to = vm.get_method(tp, "ref_to").unwrap();
480-
vm.invoke(&ref_to?, ())
481-
}
478+
//@TODO: Return a Pointer when Pointer implementation is ready
479+
let class = tp.clone_class();
480+
481+
if class.issubclass(PyCData::static_type()) {
482+
if let Some(ref_to) = vm.get_method(tp, "ref_to") {
483+
return vm.invoke(&ref_to?, ());
484+
}
485+
};
486+
487+
Err(vm.new_type_error(format!(
488+
"byref() argument must be a ctypes instance, not '{}'",
489+
class.name
490+
)))
482491
}
483492

484493
pub fn addressof(tp: PyObjectRef, vm: &VirtualMachine) -> PyResult {
485-
if tp.clone().downcast::<PyCData>().is_err() {
486-
Err(vm.new_type_error(format!(
487-
"addressof() argument must be a ctypes instance, not {}",
488-
tp.class().name
489-
)))
490-
} else {
491-
let address_of = vm.get_method(tp, "address_of").unwrap();
492-
vm.invoke(&address_of?, ())
493-
}
494+
let class = tp.clone_class();
495+
496+
if class.issubclass(PyCData::static_type()) {
497+
if let Some(address_of) = vm.get_method(tp, "address_of") {
498+
return vm.invoke(&address_of?, ());
499+
}
500+
};
501+
502+
Err(vm.new_type_error(format!(
503+
"addressof() argument must be a ctypes instance, not '{}'",
504+
class.name
505+
)))
494506
}

‎vm/src/stdlib/ctypes/mod.rs

Copy file name to clipboardExpand all lines: vm/src/stdlib/ctypes/mod.rs
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use crate::pyobject::PyClassImpl;
2-
use crate::pyobject::PyObjectRef;
1+
use crate::pyobject::{PyClassImpl, PyObjectRef, PyValue};
32
use crate::VirtualMachine;
43

54
mod array;
@@ -37,6 +36,7 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
3736

3837
"POINTER" => ctx.new_function(POINTER),
3938
"pointer" => ctx.new_function(pointer_fn),
39+
"_pointer_type_cache" => ctx.new_dict(),
4040

4141
"CFuncPtr" => PyCFuncPtr::make_class(ctx),
4242
"_SimpleCData" => PySimpleType::make_class(ctx),

‎vm/src/stdlib/ctypes/pointer.rs

Copy file name to clipboardExpand all lines: vm/src/stdlib/ctypes/pointer.rs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::fmt;
22

3-
use crate::builtins::PyTypeRef;
3+
use crate::builtins::{PyDict, PyTypeRef};
44
use crate::pyobject::{PyObjectRef, PyValue, StaticType};
55
use crate::VirtualMachine;
66

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.