summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-05-22 16:33:22 (GMT)
committerGuido van Rossum <guido@python.org>1996-05-22 16:33:22 (GMT)
commit60be1db9a9614229626d0d0b5f003002ff725058 (patch)
treeaec56cba41fb3d0099bf9364cacc282ed5f15e72 /Include
parent0578851964e76774ea299578d97267337f05e884 (diff)
downloadcpython-60be1db9a9614229626d0d0b5f003002ff725058.zip
cpython-60be1db9a9614229626d0d0b5f003002ff725058.tar.gz
cpython-60be1db9a9614229626d0d0b5f003002ff725058.tar.bz2
Added some visual enhancements of debugging ifdefs.
Added PyNumber_Coerce decl.
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/Include/object.h b/Include/object.h
index 07f7646..5727747 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -97,12 +97,12 @@ whose size is determined when the object is allocated.
int ob_refcnt; \
struct _typeobject *ob_type;
#define PyObject_HEAD_INIT(type) 0, 0, 1, type,
-#else
+#else /* !Py_TRACE_REFS */
#define PyObject_HEAD \
int ob_refcnt; \
struct _typeobject *ob_type;
#define PyObject_HEAD_INIT(type) 1, type,
-#endif
+#endif /* !Py_TRACE_REFS */
#define PyObject_VAR_HEAD \
PyObject_HEAD \
@@ -254,6 +254,7 @@ extern int PyObject_SetAttr Py_PROTO((PyObject *, PyObject *, PyObject *));
extern long PyObject_Hash Py_PROTO((PyObject *));
extern int PyObject_IsTrue Py_PROTO((PyObject *));
extern int PyCallable_Check Py_PROTO((PyObject *));
+extern int PyNumber_Coerce Py_PROTO((PyObject **, PyObject **));
/* Flag bits for printing: */
#define Py_PRINT_RAW 1 /* No string quotes etc. */
@@ -308,33 +309,38 @@ extern void inc_count Py_PROTO((PyTypeObject *));
#endif
#ifdef Py_REF_DEBUG
+
extern long _Py_RefTotal;
+
#ifndef Py_TRACE_REFS
#ifdef COUNT_ALLOCS
#define _Py_NewReference(op) (inc_count((op)->ob_type), _Py_RefTotal++, (op)->ob_refcnt = 1)
#else
#define _Py_NewReference(op) (_Py_RefTotal++, (op)->ob_refcnt = 1)
#endif
-#endif
+#endif /* !Py_TRACE_REFS */
+
#define Py_INCREF(op) (_Py_RefTotal++, (op)->ob_refcnt++)
#define Py_DECREF(op) \
if (--_Py_RefTotal, --(op)->ob_refcnt != 0) \
; \
else \
_Py_Dealloc(op)
-#else
+#else /* !Py_REF_DEBUG */
+
#ifdef COUNT_ALLOCS
#define _Py_NewReference(op) (inc_count((op)->ob_type), (op)->ob_refcnt = 1)
#else
#define _Py_NewReference(op) ((op)->ob_refcnt = 1)
#endif
+
#define Py_INCREF(op) ((op)->ob_refcnt++)
#define Py_DECREF(op) \
if (--(op)->ob_refcnt != 0) \
; \
else \
_Py_Dealloc(op)
-#endif
+#endif /* !Py_REF_DEBUG */
/* Macros to use in case the object pointer may be NULL: */