cpython-lru_cache-weakref: Objects/codeobject.c annotate

annotate Objects/codeobject.c @ 61465:e38335d4df91 2.6

Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sun, 09 May 2010 15:15:40 +0000
parents	52294af4b663
children	b36cb4602e21

rev	line source
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1 #include "Python.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2 #include "code.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3 #include "structmember.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	4
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	5 #define NAME_CHARS \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	6 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	8 /* all_name_chars(s): true iff all chars in s are valid NAME_CHARS */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	9
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	10 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	11 all_name_chars(unsigned char *s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	12 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	13 static char ok_name_char[256];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	14 static unsigned char name_chars = (unsigned char )NAME_CHARS;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	15
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	16 if (ok_name_char[*name_chars] == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	17 unsigned char *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	18 for (p = name_chars; *p; p++)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	19 ok_name_char[*p] = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	20 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	21 while (*s) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	22 if (ok_name_char[*s++] == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	23 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	24 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	25 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	26 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	27
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	28 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	29 intern_strings(PyObject *tuple)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	30 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	31 Py_ssize_t i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	32
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	33 for (i = PyTuple_GET_SIZE(tuple); --i >= 0; ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	34 PyObject *v = PyTuple_GET_ITEM(tuple, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	35 if (v == NULL \|\| !PyString_CheckExact(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	36 Py_FatalError("non-string found in code slot");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	37 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	38 PyString_InternInPlace(&PyTuple_GET_ITEM(tuple, i));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	39 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	40 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	41
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	42
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	43 PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	44 PyCode_New(int argcount, int nlocals, int stacksize, int flags,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	45 PyObject code, PyObject consts, PyObject *names,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	46 PyObject varnames, PyObject freevars, PyObject *cellvars,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	47 PyObject filename, PyObject name, int firstlineno,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	48 PyObject *lnotab)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	49 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	50 PyCodeObject *co;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	51 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	52 /* Check argument types */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	53 if (argcount < 0 \|\| nlocals < 0 \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	54 code == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	55 consts == NULL \|\| !PyTuple_Check(consts) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	56 names == NULL \|\| !PyTuple_Check(names) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	57 varnames == NULL \|\| !PyTuple_Check(varnames) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	58 freevars == NULL \|\| !PyTuple_Check(freevars) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	59 cellvars == NULL \|\| !PyTuple_Check(cellvars) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	60 name == NULL \|\| !PyString_Check(name) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	61 filename == NULL \|\| !PyString_Check(filename) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	62 lnotab == NULL \|\| !PyString_Check(lnotab) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	63 !PyObject_CheckReadBuffer(code)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	64 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	65 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	66 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	67 intern_strings(names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	68 intern_strings(varnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	69 intern_strings(freevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	70 intern_strings(cellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	71 /* Intern selected string constants */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	72 for (i = PyTuple_Size(consts); --i >= 0; ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	73 PyObject *v = PyTuple_GetItem(consts, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	74 if (!PyString_Check(v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	75 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	76 if (!all_name_chars((unsigned char *)PyString_AS_STRING(v)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	77 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	78 PyString_InternInPlace(&PyTuple_GET_ITEM(consts, i));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	79 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	80 co = PyObject_NEW(PyCodeObject, &PyCode_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	81 if (co != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	82 co->co_argcount = argcount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	83 co->co_nlocals = nlocals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	84 co->co_stacksize = stacksize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	85 co->co_flags = flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	86 Py_INCREF(code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	87 co->co_code = code;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	88 Py_INCREF(consts);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	89 co->co_consts = consts;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	90 Py_INCREF(names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	91 co->co_names = names;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	92 Py_INCREF(varnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	93 co->co_varnames = varnames;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	94 Py_INCREF(freevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	95 co->co_freevars = freevars;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	96 Py_INCREF(cellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	97 co->co_cellvars = cellvars;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	98 Py_INCREF(filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	99 co->co_filename = filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	100 Py_INCREF(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	101 co->co_name = name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	102 co->co_firstlineno = firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	103 Py_INCREF(lnotab);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	104 co->co_lnotab = lnotab;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	105 co->co_zombieframe = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	106 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	107 return co;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	108 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	109
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	110
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	111 #define OFF(x) offsetof(PyCodeObject, x)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	112
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	113 static PyMemberDef code_memberlist[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	114 {"co_argcount", T_INT, OFF(co_argcount), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	115 {"co_nlocals", T_INT, OFF(co_nlocals), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	116 {"co_stacksize",T_INT, OFF(co_stacksize), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	117 {"co_flags", T_INT, OFF(co_flags), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	118 {"co_code", T_OBJECT, OFF(co_code), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	119 {"co_consts", T_OBJECT, OFF(co_consts), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	120 {"co_names", T_OBJECT, OFF(co_names), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	121 {"co_varnames", T_OBJECT, OFF(co_varnames), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	122 {"co_freevars", T_OBJECT, OFF(co_freevars), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	123 {"co_cellvars", T_OBJECT, OFF(co_cellvars), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	124 {"co_filename", T_OBJECT, OFF(co_filename), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	125 {"co_name", T_OBJECT, OFF(co_name), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	126 {"co_firstlineno", T_INT, OFF(co_firstlineno), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	127 {"co_lnotab", T_OBJECT, OFF(co_lnotab), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	128 {NULL} /* Sentinel */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	129 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	130
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	131 /* Helper for code_new: return a shallow copy of a tuple that is
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	132 guaranteed to contain exact strings, by converting string subclasses
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133 to exact strings and complaining if a non-string is found. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	134 static PyObject*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	135 validate_and_copy_tuple(PyObject *tup)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	136 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	137 PyObject *newtuple;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	138 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	139 Py_ssize_t i, len;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	140
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	141 len = PyTuple_GET_SIZE(tup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	142 newtuple = PyTuple_New(len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	143 if (newtuple == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	144 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	145
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	146 for (i = 0; i < len; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	147 item = PyTuple_GET_ITEM(tup, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	148 if (PyString_CheckExact(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	149 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	150 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	151 else if (!PyString_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	152 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	153 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	154 "name tuples must contain only "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	155 "strings, not '%.500s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	156 item->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	157 Py_DECREF(newtuple);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	158 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	159 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	160 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	161 item = PyString_FromStringAndSize(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	162 PyString_AS_STRING(item),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	163 PyString_GET_SIZE(item));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	164 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	165 Py_DECREF(newtuple);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	166 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	167 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	168 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	169 PyTuple_SET_ITEM(newtuple, i, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	170 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	171
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	172 return newtuple;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	173 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	174
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	175 PyDoc_STRVAR(code_doc,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	176 "code(argcount, nlocals, stacksize, flags, codestring, constants, names,\n\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	177 varnames, filename, name, firstlineno, lnotab[, freevars[, cellvars]])\n\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	178 \n\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	179 Create a code object. Not for the faint of heart.");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	180
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	181 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	182 code_new(PyTypeObject type, PyObject args, PyObject *kw)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	183 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	184 int argcount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	185 int nlocals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	186 int stacksize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	187 int flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	188 PyObject *co = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	189 PyObject *code;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	190 PyObject *consts;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	191 PyObject names, ournames = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	192 PyObject varnames, ourvarnames = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	193 PyObject freevars = NULL, ourfreevars = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	194 PyObject cellvars = NULL, ourcellvars = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	195 PyObject *filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	196 PyObject *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	197 int firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	198 PyObject *lnotab;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	199
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	200 if (!PyArg_ParseTuple(args, "iiiiSO!O!O!SSiS\|O!O!:code",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	201 &argcount, &nlocals, &stacksize, &flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	202 &code,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	203 &PyTuple_Type, &consts,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	204 &PyTuple_Type, &names,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	205 &PyTuple_Type, &varnames,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	206 &filename, &name,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	207 &firstlineno, &lnotab,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	208 &PyTuple_Type, &freevars,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	209 &PyTuple_Type, &cellvars))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	210 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	211
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	212 if (argcount < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	213 PyErr_SetString(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	214 PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	215 "code: argcount must not be negative");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	216 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	217 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	218
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	219 if (nlocals < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	220 PyErr_SetString(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	221 PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	222 "code: nlocals must not be negative");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	223 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	224 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	225
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	226 ournames = validate_and_copy_tuple(names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	227 if (ournames == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	228 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	229 ourvarnames = validate_and_copy_tuple(varnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	230 if (ourvarnames == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	231 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	232 if (freevars)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	233 ourfreevars = validate_and_copy_tuple(freevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	234 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	235 ourfreevars = PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	236 if (ourfreevars == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	237 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	238 if (cellvars)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	239 ourcellvars = validate_and_copy_tuple(cellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	240 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	241 ourcellvars = PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	242 if (ourcellvars == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	243 goto cleanup;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	244
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	245 co = (PyObject *)PyCode_New(argcount, nlocals, stacksize, flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	246 code, consts, ournames, ourvarnames,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	247 ourfreevars, ourcellvars, filename,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	248 name, firstlineno, lnotab);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	249 cleanup:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	250 Py_XDECREF(ournames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	251 Py_XDECREF(ourvarnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	252 Py_XDECREF(ourfreevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	253 Py_XDECREF(ourcellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	254 return co;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	255 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	256
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	257 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	258 code_dealloc(PyCodeObject *co)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	259 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	260 Py_XDECREF(co->co_code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	261 Py_XDECREF(co->co_consts);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	262 Py_XDECREF(co->co_names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	263 Py_XDECREF(co->co_varnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	264 Py_XDECREF(co->co_freevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	265 Py_XDECREF(co->co_cellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	266 Py_XDECREF(co->co_filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	267 Py_XDECREF(co->co_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	268 Py_XDECREF(co->co_lnotab);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	269 if (co->co_zombieframe != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	270 PyObject_GC_Del(co->co_zombieframe);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	271 PyObject_DEL(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	272 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	273
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	274 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	275 code_repr(PyCodeObject *co)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	276 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	277 char buf[500];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	278 int lineno = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	279 char *filename = "???";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	280 char *name = "???";
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	281
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	282 if (co->co_firstlineno != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	283 lineno = co->co_firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	284 if (co->co_filename && PyString_Check(co->co_filename))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	285 filename = PyString_AS_STRING(co->co_filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	286 if (co->co_name && PyString_Check(co->co_name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	287 name = PyString_AS_STRING(co->co_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	288 PyOS_snprintf(buf, sizeof(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	289 "<code object %.100s at %p, file \"%.300s\", line %d>",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	290 name, co, filename, lineno);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	291 return PyString_FromString(buf);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	292 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	293
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	294 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	295 code_compare(PyCodeObject co, PyCodeObject cp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	296 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	297 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	298 cmp = PyObject_Compare(co->co_name, cp->co_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	299 if (cmp) return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	300 cmp = co->co_argcount - cp->co_argcount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	301 if (cmp) goto normalize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	302 cmp = co->co_nlocals - cp->co_nlocals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	303 if (cmp) goto normalize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	304 cmp = co->co_flags - cp->co_flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	305 if (cmp) goto normalize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	306 cmp = co->co_firstlineno - cp->co_firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	307 if (cmp) goto normalize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	308 cmp = PyObject_Compare(co->co_code, cp->co_code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	309 if (cmp) return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	310 cmp = PyObject_Compare(co->co_consts, cp->co_consts);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	311 if (cmp) return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	312 cmp = PyObject_Compare(co->co_names, cp->co_names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	313 if (cmp) return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	314 cmp = PyObject_Compare(co->co_varnames, cp->co_varnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	315 if (cmp) return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	316 cmp = PyObject_Compare(co->co_freevars, cp->co_freevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	317 if (cmp) return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	318 cmp = PyObject_Compare(co->co_cellvars, cp->co_cellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	319 return cmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	320
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	321 normalize:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	322 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	323 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	324 else if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	325 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	326 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	327 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	328 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	329
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	330 static PyObject *
860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	331 code_richcompare(PyObject self, PyObject other, int op)
860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	332 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	333 PyCodeObject co, cp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	334 int eq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	335 PyObject *res;
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	336
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	337 if ((op != Py_EQ && op != Py_NE) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	338 !PyCode_Check(self) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	339 !PyCode_Check(other)) {
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	340
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	341 /* Py3K warning if types are not equal and comparison
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	342 isn't == or != */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	343 if (PyErr_WarnPy3k("code inequality comparisons not supported "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	344 "in 3.x", 1) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	345 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	346 }
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	347
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	348 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	349 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	350 }
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	351
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	352 co = (PyCodeObject *)self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	353 cp = (PyCodeObject *)other;
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	354
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	355 eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	356 if (eq <= 0) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	357 eq = co->co_argcount == cp->co_argcount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	358 if (!eq) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	359 eq = co->co_nlocals == cp->co_nlocals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	360 if (!eq) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	361 eq = co->co_flags == cp->co_flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	362 if (!eq) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	363 eq = co->co_firstlineno == cp->co_firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	364 if (!eq) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	365 eq = PyObject_RichCompareBool(co->co_code, cp->co_code, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	366 if (eq <= 0) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	367 eq = PyObject_RichCompareBool(co->co_consts, cp->co_consts, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	368 if (eq <= 0) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	369 eq = PyObject_RichCompareBool(co->co_names, cp->co_names, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	370 if (eq <= 0) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	371 eq = PyObject_RichCompareBool(co->co_varnames, cp->co_varnames, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	372 if (eq <= 0) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	373 eq = PyObject_RichCompareBool(co->co_freevars, cp->co_freevars, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	374 if (eq <= 0) goto unequal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	375 eq = PyObject_RichCompareBool(co->co_cellvars, cp->co_cellvars, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	376 if (eq <= 0) goto unequal;
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	377
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	378 if (op == Py_EQ)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	379 res = Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	380 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	381 res = Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	382 goto done;
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	383
860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	384 unequal:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	385 if (eq < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	386 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	387 if (op == Py_NE)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	388 res = Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	389 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	390 res = Py_False;
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	391
860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	392 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	393 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	394 return res;
45885 860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	395 }
860e23a61e55 Add py3k warnings for code and method inequality comparisons. This should resolve issue 2373. The codeobject.c and methodobject.c changes are both just backports of the Python 3 code. Steven Bethard <steven.bethard@gmail.com> parents: 42333 diff changeset	396
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	397 static long
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	398 code_hash(PyCodeObject *co)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	399 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	400 long h, h0, h1, h2, h3, h4, h5, h6;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	401 h0 = PyObject_Hash(co->co_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	402 if (h0 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	403 h1 = PyObject_Hash(co->co_code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	404 if (h1 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	405 h2 = PyObject_Hash(co->co_consts);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	406 if (h2 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	407 h3 = PyObject_Hash(co->co_names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	408 if (h3 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	409 h4 = PyObject_Hash(co->co_varnames);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	410 if (h4 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	411 h5 = PyObject_Hash(co->co_freevars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	412 if (h5 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	413 h6 = PyObject_Hash(co->co_cellvars);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	414 if (h6 == -1) return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	415 h = h0 ^ h1 ^ h2 ^ h3 ^ h4 ^ h5 ^ h6 ^
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	416 co->co_argcount ^ co->co_nlocals ^ co->co_flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	417 if (h == -1) h = -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	418 return h;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	419 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	420
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	421 /* XXX code objects need to participate in GC? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	422
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	423 PyTypeObject PyCode_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	424 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	425 "code",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	426 sizeof(PyCodeObject),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	427 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	428 (destructor)code_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	429 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	430 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	431 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	432 (cmpfunc)code_compare, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	433 (reprfunc)code_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	434 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	435 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	436 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	437 (hashfunc)code_hash, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	438 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	439 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	440 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	441 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	442 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	443 Py_TPFLAGS_DEFAULT, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	444 code_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	445 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	446 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	447 code_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	448 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	449 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	450 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	451 0, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	452 code_memberlist, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	453 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	454 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	455 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	456 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	457 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	458 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	459 0, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	460 0, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	461 code_new, /* tp_new */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	462 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	463
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	464 /* All about c_lnotab.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	465
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	466 c_lnotab is an array of unsigned bytes disguised as a Python string. In -O
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	467 mode, SET_LINENO opcodes aren't generated, and bytecode offsets are mapped
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	468 to source code line #s (when needed for tracebacks) via c_lnotab instead.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	469 The array is conceptually a list of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	470 (bytecode offset increment, line number increment)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	471 pairs. The details are important and delicate, best illustrated by example:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	472
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	473 byte code offset source code line number
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	474 0 1
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	475 6 2
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	476 50 7
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	477 350 307
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	478 361 308
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	479
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	480 The first trick is that these numbers aren't stored, only the increments
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	481 from one row to the next (this doesn't really work, but it's a start):
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	482
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	483 0, 1, 6, 1, 44, 5, 300, 300, 11, 1
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	484
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	485 The second trick is that an unsigned byte can't hold negative values, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	486 values larger than 255, so (a) there's a deep assumption that byte code
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	487 offsets and their corresponding line #s both increase monotonically, and (b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	488 if at least one column jumps by more than 255 from one row to the next, more
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	489 than one pair is written to the table. In case #b, there's no way to know
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	490 from looking at the table later how many were written. That's the delicate
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	491 part. A user of c_lnotab desiring to find the source line number
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	492 corresponding to a bytecode address A should do something like this
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	493
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	494 lineno = addr = 0
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	495 for addr_incr, line_incr in c_lnotab:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	496 addr += addr_incr
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	497 if addr > A:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	498 return lineno
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	499 lineno += line_incr
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	500
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	501 In order for this to work, when the addr field increments by more than 255,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	502 the line # increment in each pair generated must be 0 until the remaining addr
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	503 increment is < 256. So, in the example above, com_set_lineno should not (as
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	504 was actually done until 2.2) expand 300, 300 to 255, 255, 45, 45, but to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	505 255, 0, 45, 255, 0, 45.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	506 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	507
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	508 int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	509 PyCode_Addr2Line(PyCodeObject *co, int addrq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	510 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	511 int size = PyString_Size(co->co_lnotab) / 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	512 unsigned char p = (unsigned char)PyString_AsString(co->co_lnotab);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	513 int line = co->co_firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	514 int addr = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	515 while (--size >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	516 addr += *p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	517 if (addr > addrq)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	518 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	519 line += *p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	520 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	521 return line;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	522 }
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	523
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	524 /*
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	525 Check whether the current instruction is at the start of a line.
cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	526
cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	527 */
cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	528
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	529 /* The theory of SET_LINENO-less tracing.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	531 In a nutshell, we use the co_lnotab field of the code object
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	532 to tell when execution has moved onto a different line.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	533
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	534 As mentioned above, the basic idea is so set things up so
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	535 that
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	536
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	537 instr_lb <= frame->f_lasti < instr_ub
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	538
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	539 is true so long as execution does not change lines.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	540
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	541 This is all fairly simple. Digging the information out of
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	542 co_lnotab takes some work, but is conceptually clear.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	543
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	544 Somewhat harder to explain is why we don't always call the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	545 line trace function when the above test fails.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	546
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	547 Consider this code:
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	548
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	549 1: def f(a):
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	550 2: if a:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	551 3: print 1
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	552 4: else:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	553 5: print 2
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	554
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	555 which compiles to this:
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	556
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	557 2 0 LOAD_FAST 0 (a)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	558 3 JUMP_IF_FALSE 9 (to 15)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	559 6 POP_TOP
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	560
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	561 3 7 LOAD_CONST 1 (1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	562 10 PRINT_ITEM
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	563 11 PRINT_NEWLINE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	564 12 JUMP_FORWARD 6 (to 21)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	565 >> 15 POP_TOP
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	566
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	567 5 16 LOAD_CONST 2 (2)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	568 19 PRINT_ITEM
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	569 20 PRINT_NEWLINE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	570 >> 21 LOAD_CONST 0 (None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	571 24 RETURN_VALUE
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	572
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	573 If 'a' is false, execution will jump to instruction at offset
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	574 15 and the co_lnotab will claim that execution has moved to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	575 line 3. This is at best misleading. In this case we could
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	576 associate the POP_TOP with line 4, but that doesn't make
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	577 sense in all cases (I think).
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	578
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	579 What we do is only call the line trace function if the co_lnotab
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	580 indicates we have jumped to the start of a line, i.e. if the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	581 current instruction offset matches the offset given for the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	582 start of a line by the co_lnotab.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	583
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	584 This also takes care of the situation where 'a' is true.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	585 Execution will jump from instruction offset 12 to offset 21.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	586 Then the co_lnotab would imply that execution has moved to line
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	587 5, which is again misleading.
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	588
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	589 Why do we set f_lineno when tracing? Well, consider the code
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	590 above when 'a' is true. If stepping through this with 'n' in
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	591 pdb, you would stop at line 1 with a "call" type event, then
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	592 line events on lines 2 and 3, then a "return" type event -- but
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	593 you would be shown line 5 during this event. This is a change
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	594 from the behaviour in 2.2 and before, and I've found it
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	595 confusing in practice. By setting and using f_lineno when
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	596 tracing, one can report a line number different from that
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	597 suggested by f_lasti on this one occasion where it's desirable.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	598 */
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	599
cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	600
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	601 int
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	602 PyCode_CheckLineNumber(PyCodeObject* co, int lasti, PyAddrPair *bounds)
cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	603 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	604 int size, addr, line;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	605 unsigned char* p;
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	606
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	607 p = (unsigned char*)PyString_AS_STRING(co->co_lnotab);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	608 size = PyString_GET_SIZE(co->co_lnotab) / 2;
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	609
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	610 addr = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	611 line = co->co_firstlineno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	612 assert(line > 0);
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	613
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	614 /* possible optimization: if f->f_lasti == instr_ub
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	615 (likely to be a common case) then we already know
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	616 instr_lb -- if we stored the matching value of p
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	617 somwhere we could skip the first while loop. */
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	618
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	619 /* see comments in compile.c for the description of
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	620 co_lnotab. A point to remember: increments to p
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	621 should come in pairs -- although we don't care about
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	622 the line increments here, treating them as byte
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	623 increments gets confusing, to say the least. */
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	624
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	625 bounds->ap_lower = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	626 while (size > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	627 if (addr + *p > lasti)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	628 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	629 addr += *p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	630 if (*p)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	631 bounds->ap_lower = addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	632 line += *p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	633 --size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	634 }
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	635
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	636 /* If lasti and addr don't match exactly, we don't want to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	637 change the lineno slot on the frame or execute a trace
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	638 function. Return -1 instead.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	639 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	640 if (addr != lasti)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	641 line = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	642
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	643 if (size > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	644 while (--size >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	645 addr += *p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	646 if (*p++)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	647 break;
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	648 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	649 bounds->ap_upper = addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	650 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	651 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	652 bounds->ap_upper = INT_MAX;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	653 }
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	654
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 47527 diff changeset	655 return line;
37838 cc48985c3266 Refactor: Move code that uses co_lnotab from ceval to codeobject Jeremy Hylton <jeremy@alum.mit.edu> parents: 36501 diff changeset	656 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/codeobject.c @ 61465:e38335d4df91 2.6