[Python-checkins] CVS: python/dist/src/Include object.h,2.59,2.60
Tim Peters
python-dev@python.org
Fri, 7 Jul 2000 17:32:07 -0700
Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2086/src/Include
Modified Files:
object.h
Log Message:
Got RID of redundant coercions in longobject.c (as spotted by Greg
Stein -- thanks!). Incidentally removed all the Py_PROTO macros
from object.h, as they prevented my editor from magically finding
the definitions of the "coercion", "cmpfunc" and "reprfunc"
typedefs that were being redundantly applied in longobject.c.
Index: object.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/object.h,v
retrieving revision 2.59
retrieving revision 2.60
diff -C2 -r2.59 -r2.60
*** object.h 2000/06/30 23:58:04 2.59
--- object.h 2000/07/08 00:32:04 2.60
***************
*** 110,130 ****
*/
! typedef PyObject * (*unaryfunc) Py_PROTO((PyObject *));
! typedef PyObject * (*binaryfunc) Py_PROTO((PyObject *, PyObject *));
! typedef PyObject * (*ternaryfunc) Py_PROTO((PyObject *, PyObject *, PyObject *));
! typedef int (*inquiry) Py_PROTO((PyObject *));
! typedef int (*coercion) Py_PROTO((PyObject **, PyObject **));
! typedef PyObject *(*intargfunc) Py_PROTO((PyObject *, int));
! typedef PyObject *(*intintargfunc) Py_PROTO((PyObject *, int, int));
! typedef int(*intobjargproc) Py_PROTO((PyObject *, int, PyObject *));
! typedef int(*intintobjargproc) Py_PROTO((PyObject *, int, int, PyObject *));
! typedef int(*objobjargproc) Py_PROTO((PyObject *, PyObject *, PyObject *));
! typedef int (*getreadbufferproc) Py_PROTO((PyObject *, int, void **));
! typedef int (*getwritebufferproc) Py_PROTO((PyObject *, int, void **));
! typedef int (*getsegcountproc) Py_PROTO((PyObject *, int *));
! typedef int (*getcharbufferproc) Py_PROTO((PyObject *, int, const char **));
! typedef int (*objobjproc) Py_PROTO((PyObject *, PyObject *));
! typedef int (*visitproc) Py_PROTO((PyObject *, void *));
! typedef int (*traverseproc) Py_PROTO((PyObject *, visitproc, void *));
typedef struct {
--- 110,130 ----
*/
! typedef PyObject * (*unaryfunc)(PyObject *);
! typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
! typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *);
! typedef int (*inquiry)(PyObject *);
! typedef int (*coercion)(PyObject **, PyObject **);
! typedef PyObject *(*intargfunc)(PyObject *, int);
! typedef PyObject *(*intintargfunc)(PyObject *, int, int);
! typedef int(*intobjargproc)(PyObject *, int, PyObject *);
! typedef int(*intintobjargproc)(PyObject *, int, int, PyObject *);
! typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *);
! typedef int (*getreadbufferproc)(PyObject *, int, void **);
! typedef int (*getwritebufferproc)(PyObject *, int, void **);
! typedef int (*getsegcountproc)(PyObject *, int *);
! typedef int (*getcharbufferproc)(PyObject *, int, const char **);
! typedef int (*objobjproc)(PyObject *, PyObject *);
! typedef int (*visitproc)(PyObject *, void *);
! typedef int (*traverseproc)(PyObject *, visitproc, void *);
typedef struct {
***************
*** 179,191 ****
! typedef void (*destructor) Py_PROTO((PyObject *));
! typedef int (*printfunc) Py_PROTO((PyObject *, FILE *, int));
! typedef PyObject *(*getattrfunc) Py_PROTO((PyObject *, char *));
! typedef PyObject *(*getattrofunc) Py_PROTO((PyObject *, PyObject *));
! typedef int (*setattrfunc) Py_PROTO((PyObject *, char *, PyObject *));
! typedef int (*setattrofunc) Py_PROTO((PyObject *, PyObject *, PyObject *));
! typedef int (*cmpfunc) Py_PROTO((PyObject *, PyObject *));
! typedef PyObject *(*reprfunc) Py_PROTO((PyObject *));
! typedef long (*hashfunc) Py_PROTO((PyObject *));
typedef struct _typeobject {
--- 179,191 ----
! typedef void (*destructor)(PyObject *);
! typedef int (*printfunc)(PyObject *, FILE *, int);
! typedef PyObject *(*getattrfunc)(PyObject *, char *);
! typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
! typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
! typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *);
! typedef int (*cmpfunc)(PyObject *, PyObject *);
! typedef PyObject *(*reprfunc)(PyObject *);
! typedef long (*hashfunc)(PyObject *);
typedef struct _typeobject {
***************
*** 249,272 ****
/* Generic operations on objects */
! extern DL_IMPORT(int) PyObject_Print Py_PROTO((PyObject *, FILE *, int));
! extern DL_IMPORT(PyObject *) PyObject_Repr Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyObject_Str Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyObject_Compare Py_PROTO((PyObject *, PyObject *));
! extern DL_IMPORT(PyObject *) PyObject_GetAttrString Py_PROTO((PyObject *, char *));
! extern DL_IMPORT(int) PyObject_SetAttrString Py_PROTO((PyObject *, char *, PyObject *));
! extern DL_IMPORT(int) PyObject_HasAttrString Py_PROTO((PyObject *, char *));
! extern DL_IMPORT(PyObject *) PyObject_GetAttr Py_PROTO((PyObject *, PyObject *));
! extern DL_IMPORT(int) PyObject_SetAttr Py_PROTO((PyObject *, PyObject *, PyObject *));
! extern DL_IMPORT(int) PyObject_HasAttr Py_PROTO((PyObject *, PyObject *));
! extern DL_IMPORT(long) PyObject_Hash Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyObject_IsTrue Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyObject_Not Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyCallable_Check Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyNumber_Coerce Py_PROTO((PyObject **, PyObject **));
! extern DL_IMPORT(int) PyNumber_CoerceEx Py_PROTO((PyObject **, PyObject **));
/* Helpers for printing recursive container types */
! extern DL_IMPORT(int) Py_ReprEnter Py_PROTO((PyObject *));
! extern DL_IMPORT(void) Py_ReprLeave Py_PROTO((PyObject *));
/* tstate dict key for PyObject_Compare helper */
--- 249,272 ----
/* Generic operations on objects */
! extern DL_IMPORT(int) PyObject_Print(PyObject *, FILE *, int);
! extern DL_IMPORT(PyObject *) PyObject_Repr(PyObject *);
! extern DL_IMPORT(PyObject *) PyObject_Str(PyObject *);
! extern DL_IMPORT(int) PyObject_Compare(PyObject *, PyObject *);
! extern DL_IMPORT(PyObject *) PyObject_GetAttrString(PyObject *, char *);
! extern DL_IMPORT(int) PyObject_SetAttrString(PyObject *, char *, PyObject *);
! extern DL_IMPORT(int) PyObject_HasAttrString(PyObject *, char *);
! extern DL_IMPORT(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
! extern DL_IMPORT(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
! extern DL_IMPORT(int) PyObject_HasAttr(PyObject *, PyObject *);
! extern DL_IMPORT(long) PyObject_Hash(PyObject *);
! extern DL_IMPORT(int) PyObject_IsTrue(PyObject *);
! extern DL_IMPORT(int) PyObject_Not(PyObject *);
! extern DL_IMPORT(int) PyCallable_Check(PyObject *);
! extern DL_IMPORT(int) PyNumber_Coerce(PyObject **, PyObject **);
! extern DL_IMPORT(int) PyNumber_CoerceEx(PyObject **, PyObject **);
/* Helpers for printing recursive container types */
! extern DL_IMPORT(int) Py_ReprEnter(PyObject *);
! extern DL_IMPORT(void) Py_ReprLeave(PyObject *);
/* tstate dict key for PyObject_Compare helper */
***************
*** 274,279 ****
/* Helpers for hash functions */
! extern DL_IMPORT(long) _Py_HashDouble Py_PROTO((double));
! extern DL_IMPORT(long) _Py_HashPointer Py_PROTO((void*));
/* Flag bits for printing: */
--- 274,279 ----
/* Helpers for hash functions */
! extern DL_IMPORT(long) _Py_HashDouble(double);
! extern DL_IMPORT(long) _Py_HashPointer(void*);
/* Flag bits for printing: */
***************
*** 356,364 ****
#ifdef Py_TRACE_REFS
! extern DL_IMPORT(void) _Py_Dealloc Py_PROTO((PyObject *));
! extern DL_IMPORT(void) _Py_NewReference Py_PROTO((PyObject *));
! extern DL_IMPORT(void) _Py_ForgetReference Py_PROTO((PyObject *));
! extern DL_IMPORT(void) _Py_PrintReferences Py_PROTO((FILE *));
! extern DL_IMPORT(void) _Py_ResetReferences Py_PROTO((void));
#endif
--- 356,364 ----
#ifdef Py_TRACE_REFS
! extern DL_IMPORT(void) _Py_Dealloc(PyObject *);
! extern DL_IMPORT(void) _Py_NewReference(PyObject *);
! extern DL_IMPORT(void) _Py_ForgetReference(PyObject *);
! extern DL_IMPORT(void) _Py_PrintReferences(FILE *);
! extern DL_IMPORT(void) _Py_ResetReferences(void);
#endif
***************
*** 374,378 ****
#ifdef COUNT_ALLOCS
! extern DL_IMPORT(void) inc_count Py_PROTO((PyTypeObject *));
#endif
--- 374,378 ----
#ifdef COUNT_ALLOCS
! extern DL_IMPORT(void) inc_count(PyTypeObject *);
#endif
***************
*** 556,561 ****
} \
! extern DL_IMPORT(void) _PyTrash_deposit_object Py_PROTO((PyObject*));
! extern DL_IMPORT(void) _PyTrash_destroy_chain Py_PROTO(());
extern DL_IMPORT(int) _PyTrash_delete_nesting;
--- 556,561 ----
} \
! extern DL_IMPORT(void) _PyTrash_deposit_object(PyObject*);
! extern DL_IMPORT(void) _PyTrash_destroy_chain();
extern DL_IMPORT(int) _PyTrash_delete_nesting;