cpython-lru_cache-weakref: Python/traceback.c annotate

annotate Python/traceback.c @ 29223:ea2958bd4271 legacy-trunk

Remove comment with very long lines that explained what the code used to do. XXX Please be careful when checking in patches to avoid checking in junk that explains what the patched code used to do.

author	Jeremy Hylton <jeremy@alum.mit.edu>
date	Thu, 22 May 2003 15:47:02 +0000
parents	808437b83b15
children	b6c139544c16

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Traceback implementation */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	3
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	5
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	6 #include "compile.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	7 #include "frameobject.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "structmember.h"
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	9 #include "osdefs.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	10
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	11 typedef struct _tracebackobject {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	12 PyObject_HEAD
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	13 struct _tracebackobject *tb_next;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	14 PyFrameObject *tb_frame;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	15 int tb_lasti;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	16 int tb_lineno;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	17 } tracebackobject;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	18
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	19 #define OFF(x) offsetof(tracebackobject, x)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	20
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	21 static struct memberlist tb_memberlist[] = {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	22 {"tb_next", T_OBJECT, OFF(tb_next)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	23 {"tb_frame", T_OBJECT, OFF(tb_frame)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	24 {"tb_lasti", T_INT, OFF(tb_lasti)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	25 {"tb_lineno", T_INT, OFF(tb_lineno)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	26 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	27 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	28
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	29 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	30 tb_getattr(tracebackobject tb, char name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	31 {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	32 return PyMember_Get((char *)tb, tb_memberlist, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	33 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	34
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	35 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	36 tb_dealloc(tracebackobject *tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	37 {
22650 2288c724fe2b Call PyObject_GC_UnTrack before putting an object on the list of trash. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21077 diff changeset	38 PyObject_GC_UnTrack(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	39 Py_TRASHCAN_SAFE_BEGIN(tb)
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	40 Py_XDECREF(tb->tb_next);
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	41 Py_XDECREF(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	42 PyObject_GC_Del(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	43 Py_TRASHCAN_SAFE_END(tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	44 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	45
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	46 static int
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	47 tb_traverse(tracebackobject tb, visitproc visit, void arg)
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	48 {
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	49 int err = 0;
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	50 if (tb->tb_next) {
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	51 err = visit((PyObject *)tb->tb_next, arg);
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	52 if (err)
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	53 return err;
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	54 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	55 if (tb->tb_frame)
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	56 err = visit((PyObject *)tb->tb_frame, arg);
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	57 return err;
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	58 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	59
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	60 static void
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	61 tb_clear(tracebackobject *tb)
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	62 {
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	63 Py_XDECREF(tb->tb_next);
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	64 Py_XDECREF(tb->tb_frame);
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	65 tb->tb_next = NULL;
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	66 tb->tb_frame = NULL;
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	67 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	68
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	69 PyTypeObject PyTraceBack_Type = {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	70 PyObject_HEAD_INIT(&PyType_Type)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	71 0,
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	72 "traceback",
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	73 sizeof(tracebackobject),
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	74 0,
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	75 (destructor)tb_dealloc, /tp_dealloc/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	76 0, /tp_print/
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	77 (getattrfunc)tb_getattr, /tp_getattr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	78 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	79 0, /tp_compare/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	80 0, /tp_repr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	81 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	82 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	83 0, /tp_as_mapping/
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	84 0, /* tp_hash */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	85 0, /* tp_call */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	86 0, /* tp_str */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	87 0, /* tp_getattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	88 0, /* tp_setattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	89 0, /* tp_as_buffer */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	90 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	91 0, /* tp_doc */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	92 (traverseproc)tb_traverse, /* tp_traverse */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	93 (inquiry)tb_clear, /* tp_clear */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	94 0, /* tp_richcompare */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	95 0, /* tp_weaklistoffset */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	96 0, /* tp_iter */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	97 0, /* tp_iternext */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	98 0, /* tp_methods */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	99 0, /* tp_members */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	100 0, /* tp_getset */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	101 0, /* tp_base */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	102 0, /* tp_dict */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	103 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	104
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	105 static tracebackobject *
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	106 newtracebackobject(tracebackobject next, PyFrameObject frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	107 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	108 tracebackobject *tb;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	109 if ((next != NULL && !PyTraceBack_Check(next)) \|\|
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	110 frame == NULL \|\| !PyFrame_Check(frame)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	111 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	112 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	113 }
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	114 tb = PyObject_GC_New(tracebackobject, &PyTraceBack_Type);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	115 if (tb != NULL) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	116 Py_XINCREF(next);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	117 tb->tb_next = next;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	118 Py_XINCREF(frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	119 tb->tb_frame = frame;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	120 tb->tb_lasti = frame->f_lasti;
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	121 tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	122 frame->f_lasti);
22650 2288c724fe2b Call PyObject_GC_UnTrack before putting an object on the list of trash. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21077 diff changeset	123 PyObject_GC_Track(tb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	124 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	125 return tb;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	126 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	127
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	128 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	129 PyTraceBack_Here(PyFrameObject *frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	130 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	131 PyThreadState *tstate = frame->f_tstate;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	132 tracebackobject oldtb = (tracebackobject ) tstate->curexc_traceback;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	133 tracebackobject *tb = newtracebackobject(oldtb, frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	134 if (tb == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	135 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	136 tstate->curexc_traceback = (PyObject *)tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	137 Py_XDECREF(oldtb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	138 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	139 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	140
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	141 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	142 tb_displayline(PyObject f, char filename, int lineno, char *name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	143 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	144 int err = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	145 FILE *xfp;
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	146 char linebuf[2000];
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	147 int i;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	148 if (filename == NULL \|\| name == NULL)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	149 return -1;
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	150 #ifdef MPW
216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	151 /* This is needed by MPW's File and Line commands */
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	152 #define FMT " File \"%.500s\"; line %d # in %.500s\n"
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	153 #else
216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	154 /* This is needed by Emacs' compile command */
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	155 #define FMT " File \"%.500s\", line %d, in %.500s\n"
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	156 #endif
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	157 xfp = fopen(filename, "r" PY_STDIOTEXTMODE);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	158 if (xfp == NULL) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	159 /* Search tail of filename in sys.path before giving up */
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	160 PyObject *path;
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	161 char *tail = strrchr(filename, SEP);
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	162 if (tail == NULL)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	163 tail = filename;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	164 else
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	165 tail++;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	166 path = PySys_GetObject("path");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	167 if (path != NULL && PyList_Check(path)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	168 int npath = PyList_Size(path);
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	169 size_t taillen = strlen(tail);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	170 char namebuf[MAXPATHLEN+1];
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	171 for (i = 0; i < npath; i++) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	172 PyObject *v = PyList_GetItem(path, i);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	173 if (v == NULL) {
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	174 PyErr_Clear();
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	175 break;
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	176 }
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	177 if (PyString_Check(v)) {
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	178 size_t len;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	179 len = PyString_Size(v);
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	180 if (len + 1 + taillen >= MAXPATHLEN)
0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	181 continue; /* Too long */
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	182 strcpy(namebuf, PyString_AsString(v));
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	183 if (strlen(namebuf) != len)
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	184 continue; /* v contains '\0' */
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	185 if (len > 0 && namebuf[len-1] != SEP)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	186 namebuf[len++] = SEP;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	187 strcpy(namebuf+len, tail);
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	188 xfp = fopen(namebuf, "r" PY_STDIOTEXTMODE);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	189 if (xfp != NULL) {
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	190 filename = namebuf;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	191 break;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	192 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	193 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	194 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	195 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	196 }
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21057 diff changeset	197 PyOS_snprintf(linebuf, sizeof(linebuf), FMT, filename, lineno, name);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	198 err = PyFile_WriteString(linebuf, f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	199 if (xfp == NULL \|\| err != 0)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	200 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	201 for (i = 0; i < lineno; i++) {
11294 d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	202 char* pLastChar = &linebuf[sizeof(linebuf)-2];
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	203 do {
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	204 *pLastChar = '\0';
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	205 if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, xfp, NULL) == NULL)
11294 d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	206 break;
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	207 /* fgets read something; if it didn't get as
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	208 far as pLastChar, it must have found a newline
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	209 or hit the end of the file; if pLastChar is \n,
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	210 it obviously found a newline; else we haven't
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	211 yet seen a newline, so must continue */
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	212 } while (pLastChar != '\0' && pLastChar != '\n');
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	213 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	214 if (i == lineno) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	215 char *p = linebuf;
2811 07fc4fefb683 ignore control-l (parallelling change to tokenizer.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	216 while (p == ' ' \|\| p == '\t' \|\| *p == '\014')
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	217 p++;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	218 err = PyFile_WriteString(" ", f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	219 if (err == 0) {
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	220 err = PyFile_WriteString(p, f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	221 if (err == 0 && strchr(p, '\n') == NULL)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	222 err = PyFile_WriteString("\n", f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	223 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	224 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	225 fclose(xfp);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	226 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	227 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	228
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	229 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	230 tb_printinternal(tracebackobject tb, PyObject f, int limit)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	231 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	232 int err = 0;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	233 int depth = 0;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	234 tracebackobject *tb1 = tb;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	235 while (tb1 != NULL) {
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	236 depth++;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	237 tb1 = tb1->tb_next;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	238 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	239 while (tb != NULL && err == 0) {
5046 658815230546 Get the line number from PyCode_Addr2Line instead of believing Guido van Rossum <guido@python.org> parents: 4503 diff changeset	240 if (depth <= limit) {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	241 err = tb_displayline(f,
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	242 PyString_AsString(
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	243 tb->tb_frame->f_code->co_filename),
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	244 tb->tb_lineno,
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	245 PyString_AsString(tb->tb_frame->f_code->co_name));
5046 658815230546 Get the line number from PyCode_Addr2Line instead of believing Guido van Rossum <guido@python.org> parents: 4503 diff changeset	246 }
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	247 depth--;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	248 tb = tb->tb_next;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	249 if (err == 0)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	250 err = PyErr_CheckSignals();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	251 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	252 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	253 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	254
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	255 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	256 PyTraceBack_Print(PyObject v, PyObject f)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	257 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	258 int err;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	259 PyObject *limitv;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	260 int limit = 1000;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	261 if (v == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	262 return 0;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	263 if (!PyTraceBack_Check(v)) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	264 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	265 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	266 }
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	267 limitv = PySys_GetObject("tracebacklimit");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	268 if (limitv && PyInt_Check(limitv)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	269 limit = PyInt_AsLong(limitv);
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	270 if (limit <= 0)
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	271 return 0;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	272 }
12137 5b5581af951c Change traceback error message to "most recent call last" from Guido van Rossum <guido@python.org> parents: 11999 diff changeset	273 err = PyFile_WriteString("Traceback (most recent call last):\n", f);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	274 if (!err)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	275 err = tb_printinternal((tracebackobject *)v, f, limit);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	276 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	277 }

Mercurial > cpython-lru_cache-weakref

annotate Python/traceback.c @ 29223:ea2958bd4271 legacy-trunk