[pypy-commit] pypy py3.5: Update typeobjectdefs.py to match object.h

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r89064:6821bcbfa71b
Date: 2016-12-14 20:10 +0000
http://bitbucket.org/pypy/pypy/changeset/6821bcbfa71b/

Log:	Update typeobjectdefs.py to match object.h

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
@@ -34,12 +34,8 @@
 ternaryfunc = P(FT([PyO, PyO, PyO], PyO))
 inquiry = P(FT([PyO], rffi.INT_real))
 lenfunc = P(FT([PyO], Py_ssize_t))
-intargfunc = P(FT([PyO, rffi.INT_real], PyO))
-intintargfunc = P(FT([PyO, rffi.INT_real, rffi.INT], PyO))
 ssizeargfunc = P(FT([PyO, Py_ssize_t], PyO))
 ssizessizeargfunc = P(FT([PyO, Py_ssize_t, Py_ssize_t], PyO))
-intobjargproc = P(FT([PyO, rffi.INT_real, PyO], rffi.INT))
-intintobjargproc = P(FT([PyO, rffi.INT_real, rffi.INT, PyO], rffi.INT))
 ssizeobjargproc = P(FT([PyO, Py_ssize_t, PyO], rffi.INT_real))
 ssizessizeobjargproc = P(FT([PyO, Py_ssize_t, Py_ssize_t, PyO], rffi.INT_real))
 objobjargproc = P(FT([PyO, PyO, PyO], rffi.INT_real))
@@ -70,7 +66,6 @@
     ("nb_add", binaryfunc),
     ("nb_subtract", binaryfunc),
     ("nb_multiply", binaryfunc),
-    ("nb_divide", binaryfunc),
     ("nb_remainder", binaryfunc),
     ("nb_divmod", binaryfunc),
     ("nb_power", ternaryfunc),
@@ -85,12 +80,11 @@
     ("nb_xor", binaryfunc),
     ("nb_or", binaryfunc),
     ("nb_int", unaryfunc),
-    ("nb_long", unaryfunc),
+    ("nb_reserved", rffi.VOIDP),
     ("nb_float", unaryfunc),
     ("nb_inplace_add", binaryfunc),
     ("nb_inplace_subtract", binaryfunc),
     ("nb_inplace_multiply", binaryfunc),
-    ("nb_inplace_divide", binaryfunc),
     ("nb_inplace_remainder", binaryfunc),
     ("nb_inplace_power", ternaryfunc),
     ("nb_inplace_lshift", binaryfunc),
@@ -105,6 +99,8 @@
     ("nb_inplace_true_divide", binaryfunc),
 
     ("nb_index", unaryfunc),
+    ("nb_matrix_multiply", binaryfunc),
+    ("nb_inplace_matrix_multiply", binaryfunc),
 ))
 
 PySequenceMethods = cpython_struct("PySequenceMethods", (
@@ -124,6 +120,12 @@
     ("mp_ass_subscript", objobjargproc),
 ))
 
+PyAsyncMethods = cpython_struct("PyAsyncMethods", (
+    ("am_await", unaryfunc),
+    ("am_aiter", unaryfunc),
+    ("am_anext", unaryfunc),
+))
+
 PyBufferProcs = cpython_struct("PyBufferProcs", (
     ("bf_getbuffer", getbufferproc),
     ("bf_releasebuffer", releasebufferproc),
@@ -155,7 +157,7 @@
     ("tp_print", printfunc),      #U
     ("tp_getattr", getattrfunc),  #U
     ("tp_setattr", setattrfunc),  #U
-    ("tp_compare", cmpfunc),      #N
+    ("tp_as_async", Ptr(PyAsyncMethods)),      #N
     ("tp_repr", reprfunc),        #N
 
     # Method suites for standard classes