Author: Antonio Cuni <[email protected]>
Branch: ffistruct
Changeset: r55106:d0ad95d6f4d8
Date: 2012-05-15 16:26 +0200
http://bitbucket.org/pypy/pypy/changeset/d0ad95d6f4d8/
Log: s/w_datashape/w_structdescr
diff --git a/pypy/module/_ffi/interp_ffitype.py
b/pypy/module/_ffi/interp_ffitype.py
--- a/pypy/module/_ffi/interp_ffitype.py
+++ b/pypy/module/_ffi/interp_ffitype.py
@@ -8,12 +8,12 @@
class W_FFIType(Wrappable):
- _immutable_fields_ = ['name', 'w_datashape', 'w_pointer_to']
+ _immutable_fields_ = ['name', 'w_structdescr', 'w_pointer_to']
- def __init__(self, name, ffitype, w_datashape=None, w_pointer_to=None):
+ def __init__(self, name, ffitype, w_structdescr=None, w_pointer_to=None):
self.name = name
self._ffitype = clibffi.FFI_TYPE_NULL
- self.w_datashape = w_datashape
+ self.w_structdescr = w_structdescr
self.w_pointer_to = w_pointer_to
self.set_ffitype(ffitype)
@@ -28,7 +28,7 @@
raise ValueError("The _ffitype is already set")
self._ffitype = ffitype
if ffitype and self.is_struct():
- assert self.w_datashape is not None
+ assert self.w_structdescr is not None
def descr_deref_pointer(self, space):
if self.w_pointer_to is None:
diff --git a/pypy/module/_ffi/interp_funcptr.py
b/pypy/module/_ffi/interp_funcptr.py
--- a/pypy/module/_ffi/interp_funcptr.py
+++ b/pypy/module/_ffi/interp_funcptr.py
@@ -203,9 +203,9 @@
def get_singlefloat(self, w_ffitype):
return self.func.call(self.argchain, rffi.FLOAT)
- def get_struct(self, w_ffitype, w_datashape):
+ def get_struct(self, w_ffitype, w_structdescr):
addr = self.func.call(self.argchain, rffi.LONG, is_struct=True)
- return w_datashape.fromaddress(self.space, addr)
+ return w_structdescr.fromaddress(self.space, addr)
def get_void(self, w_ffitype):
return self.func.call(self.argchain, lltype.Void)
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
@@ -59,7 +59,7 @@
def __init__(self, space, name):
self.space = space
self.w_ffitype = W_FFIType('struct %s' % name, clibffi.FFI_TYPE_NULL,
- w_datashape=self)
+ w_structdescr=self)
self.fields_w = None
self.name2w_field = {}
self._ffistruct_owner = None
@@ -245,12 +245,12 @@
return libffi.struct_getfield_singlefloat(w_ffitype.get_ffitype(),
self.rawmem, self.offset)
- def get_struct(self, w_ffitype, w_datashape):
- assert isinstance(w_datashape, W__StructDescr)
+ def get_struct(self, w_ffitype, w_structdescr):
+ assert isinstance(w_structdescr, W__StructDescr)
innermem = rffi.ptradd(self.rawmem, self.offset)
# we return a reference to the inner struct, not a copy
# autofree=False because it's still owned by the parent struct
- return W__StructInstance(w_datashape, allocate=False, autofree=False,
+ return W__StructInstance(w_structdescr, allocate=False, autofree=False,
rawmem=innermem)
## def get_void(self, w_ffitype):
diff --git a/pypy/module/_ffi/type_converter.py
b/pypy/module/_ffi/type_converter.py
--- a/pypy/module/_ffi/type_converter.py
+++ b/pypy/module/_ffi/type_converter.py
@@ -222,9 +222,9 @@
elif w_ffitype.is_singlefloat():
return self._singlefloat(w_ffitype)
elif w_ffitype.is_struct():
- w_datashape = w_ffitype.w_datashape
- assert isinstance(w_datashape, W__StructDescr)
- return self.get_struct(w_ffitype, w_datashape)
+ w_structdescr = w_ffitype.w_structdescr
+ assert isinstance(w_structdescr, W__StructDescr)
+ return self.get_struct(w_ffitype, w_structdescr)
elif w_ffitype.is_void():
voidval = self.get_void(w_ffitype)
assert voidval is None
@@ -324,7 +324,7 @@
"""
self.error(w_ffitype)
- def get_struct(self, w_ffitype, w_datashape):
+ def get_struct(self, w_ffitype, w_structdescr):
"""
Return type: lltype.Unsigned
(the address of the structure)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
