Author: Antonio Cuni <[email protected]>
Branch: ffistruct
Changeset: r47148:65841158be6f
Date: 2011-09-07 17:38 +0200
http://bitbucket.org/pypy/pypy/changeset/65841158be6f/
Log: merge heads
diff --git a/pypy/module/_ffi/interp_struct.py
b/pypy/module/_ffi/interp_struct.py
--- a/pypy/module/_ffi/interp_struct.py
+++ b/pypy/module/_ffi/interp_struct.py
@@ -65,15 +65,17 @@
size = 0
alignment = 0 # XXX
fields_w = space.fixedview(w_fields)
+ fields_w2 = [] # its items are annotated as W_Field
field_types = []
for w_field in fields_w:
w_field = space.interp_w(W_Field, w_field)
w_field.offset = size # XXX: alignment!
size += w_field.w_ffitype.sizeof()
+ fields_w2.append(w_field)
field_types.append(w_field.w_ffitype.ffitype)
#
ffistruct = clibffi.make_struct_ffitype_e(size, alignment, field_types)
- return W__StructDescr(space, name, fields_w, ffistruct)
+ return W__StructDescr(space, name, fields_w2, ffistruct)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
