Author: Ronan Lamy <[email protected]>
Branch: rffi-parser-2
Changeset: r89250:f3620ea3d56d
Date: 2016-12-27 17:00 +0100
http://bitbucket.org/pypy/pypy/changeset/f3620ea3d56d/
Log: Rename api.h to api.object_h
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -601,7 +601,7 @@
% (cpyname, ))
build_exported_objects()
-h = parse_source("""
+object_h = parse_source("""
typedef ssize_t Py_ssize_t;
#define PyObject_HEAD \
@@ -658,7 +658,7 @@
""")
-Py_ssize_t = h.definitions['Py_ssize_t']
+Py_ssize_t = object_h.definitions['Py_ssize_t']
Py_ssize_tP = rffi.CArrayPtr(Py_ssize_t)
size_t = rffi.ULONG
ADDR = lltype.Signed
@@ -666,18 +666,18 @@
# Note: as a special case, "PyObject" is the pointer type in RPython,
# corresponding to "PyObject *" in C. We do that only for PyObject.
# For example, "PyTypeObject" is the struct type even in RPython.
-PyTypeObject = h.definitions['PyTypeObject']
+PyTypeObject = object_h.definitions['PyTypeObject']
PyTypeObjectPtr = lltype.Ptr(PyTypeObject)
-PyObjectStruct = h.definitions['PyObject']
+PyObjectStruct = object_h.definitions['PyObject']
PyObject = lltype.Ptr(PyObjectStruct)
PyObjectFields = (("ob_refcnt", lltype.Signed),
("ob_pypy_link", lltype.Signed),
("ob_type", PyTypeObjectPtr))
PyVarObjectFields = PyObjectFields + (("ob_size", Py_ssize_t), )
-PyVarObjectStruct = h.definitions['PyVarObject']
+PyVarObjectStruct = object_h.definitions['PyVarObject']
PyVarObject = lltype.Ptr(PyVarObjectStruct)
-Py_buffer = h.definitions['Py_buffer']
+Py_buffer = object_h.definitions['Py_buffer']
Py_bufferP = lltype.Ptr(Py_buffer)
diff --git a/pypy/module/cpyext/typeobjectdefs.py
b/pypy/module/cpyext/typeobjectdefs.py
--- a/pypy/module/cpyext/typeobjectdefs.py
+++ b/pypy/module/cpyext/typeobjectdefs.py
@@ -5,14 +5,14 @@
Py_TPFLAGS_READYING, Py_TPFLAGS_READY, Py_TPFLAGS_HEAPTYPE)
from pypy.module.cpyext.pyobject import PyObject, make_ref, from_ref
from pypy.module.cpyext.modsupport import PyMethodDef
-from pypy.module.cpyext.api import Py_bufferP, h
+from pypy.module.cpyext.api import Py_bufferP, object_h
P, FT, PyO = Ptr, FuncType, PyObject
PyOPtr = Ptr(lltype.Array(PyO, hints={'nolength': True}))
#freefunc = P(FT([rffi.VOIDP], Void))
-freefunc = h.definitions['freefunc']
+freefunc = object_h.definitions['freefunc']
destructor = P(FT([PyO], Void))
printfunc = P(FT([PyO, FILEP, rffi.INT_real], rffi.INT))
@@ -236,5 +236,3 @@
("tp_del", destructor), #N
])
cpython_struct("PyTypeObject", PyTypeObjectFields, PyTypeObject)
-
-
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
