2005-10-20 16:59:25 -03:00
|
|
|
#include "Python.h"
|
|
|
|
#include "code.h"
|
|
|
|
#include "structmember.h"
|
|
|
|
|
|
|
|
#define NAME_CHARS \
|
2010-05-09 12:52:27 -03:00
|
|
|
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
|
2005-10-20 16:59:25 -03:00
|
|
|
|
|
|
|
/* all_name_chars(s): true iff all chars in s are valid NAME_CHARS */
|
|
|
|
|
|
|
|
static int
|
2011-09-28 02:41:54 -03:00
|
|
|
all_name_chars(PyObject *o)
|
2005-10-20 16:59:25 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
static char ok_name_char[256];
|
|
|
|
static unsigned char *name_chars = (unsigned char *)NAME_CHARS;
|
2011-09-28 02:41:54 -03:00
|
|
|
PyUnicodeObject *u = (PyUnicodeObject *)o;
|
|
|
|
const unsigned char *s;
|
|
|
|
|
|
|
|
if (!PyUnicode_Check(o) || PyUnicode_READY(u) == -1 ||
|
|
|
|
PyUnicode_MAX_CHAR_VALUE(u) >= 128)
|
|
|
|
return 0;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (ok_name_char[*name_chars] == 0) {
|
|
|
|
unsigned char *p;
|
|
|
|
for (p = name_chars; *p; p++)
|
|
|
|
ok_name_char[*p] = 1;
|
|
|
|
}
|
2011-09-28 02:41:54 -03:00
|
|
|
s = PyUnicode_1BYTE_DATA(u);
|
2010-05-09 12:52:27 -03:00
|
|
|
while (*s) {
|
|
|
|
if (ok_name_char[*s++] == 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
intern_strings(PyObject *tuple)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
|
|
|
|
for (i = PyTuple_GET_SIZE(tuple); --i >= 0; ) {
|
|
|
|
PyObject *v = PyTuple_GET_ITEM(tuple, i);
|
|
|
|
if (v == NULL || !PyUnicode_CheckExact(v)) {
|
|
|
|
Py_FatalError("non-string found in code slot");
|
|
|
|
}
|
|
|
|
PyUnicode_InternInPlace(&PyTuple_GET_ITEM(tuple, i));
|
|
|
|
}
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyCodeObject *
|
2006-10-27 20:31:49 -03:00
|
|
|
PyCode_New(int argcount, int kwonlyargcount,
|
2010-05-09 12:52:27 -03:00
|
|
|
int nlocals, int stacksize, int flags,
|
|
|
|
PyObject *code, PyObject *consts, PyObject *names,
|
|
|
|
PyObject *varnames, PyObject *freevars, PyObject *cellvars,
|
|
|
|
PyObject *filename, PyObject *name, int firstlineno,
|
|
|
|
PyObject *lnotab)
|
2005-10-20 16:59:25 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyCodeObject *co;
|
2011-06-26 00:54:45 -03:00
|
|
|
unsigned char *cell2arg = NULL;
|
|
|
|
Py_ssize_t i, n_cellvars;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
/* Check argument types */
|
|
|
|
if (argcount < 0 || kwonlyargcount < 0 || nlocals < 0 ||
|
|
|
|
code == NULL ||
|
|
|
|
consts == NULL || !PyTuple_Check(consts) ||
|
|
|
|
names == NULL || !PyTuple_Check(names) ||
|
|
|
|
varnames == NULL || !PyTuple_Check(varnames) ||
|
|
|
|
freevars == NULL || !PyTuple_Check(freevars) ||
|
|
|
|
cellvars == NULL || !PyTuple_Check(cellvars) ||
|
|
|
|
name == NULL || !PyUnicode_Check(name) ||
|
|
|
|
filename == NULL || !PyUnicode_Check(filename) ||
|
|
|
|
lnotab == NULL || !PyBytes_Check(lnotab) ||
|
|
|
|
!PyObject_CheckReadBuffer(code)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-06-26 00:54:45 -03:00
|
|
|
n_cellvars = PyTuple_GET_SIZE(cellvars);
|
2010-05-09 12:52:27 -03:00
|
|
|
intern_strings(names);
|
|
|
|
intern_strings(varnames);
|
|
|
|
intern_strings(freevars);
|
|
|
|
intern_strings(cellvars);
|
|
|
|
/* Intern selected string constants */
|
2011-06-26 00:54:45 -03:00
|
|
|
for (i = PyTuple_GET_SIZE(consts); --i >= 0; ) {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *v = PyTuple_GetItem(consts, i);
|
2011-09-28 02:41:54 -03:00
|
|
|
if (!all_name_chars(v))
|
2010-05-09 12:52:27 -03:00
|
|
|
continue;
|
|
|
|
PyUnicode_InternInPlace(&PyTuple_GET_ITEM(consts, i));
|
|
|
|
}
|
2011-06-26 00:54:45 -03:00
|
|
|
/* Create mapping between cells and arguments if needed. */
|
|
|
|
if (n_cellvars) {
|
|
|
|
Py_ssize_t total_args = argcount + kwonlyargcount +
|
|
|
|
((flags & CO_VARARGS) != 0) + ((flags & CO_VARKEYWORDS) != 0);
|
|
|
|
Py_ssize_t alloc_size = sizeof(unsigned char) * n_cellvars;
|
|
|
|
int used_cell2arg = 0;
|
|
|
|
cell2arg = PyMem_MALLOC(alloc_size);
|
|
|
|
if (cell2arg == NULL)
|
|
|
|
return NULL;
|
|
|
|
memset(cell2arg, CO_CELL_NOT_AN_ARG, alloc_size);
|
|
|
|
/* Find cells which are also arguments. */
|
|
|
|
for (i = 0; i < n_cellvars; i++) {
|
|
|
|
Py_ssize_t j;
|
|
|
|
PyObject *cell = PyTuple_GET_ITEM(cellvars, i);
|
|
|
|
for (j = 0; j < total_args; j++) {
|
|
|
|
PyObject *arg = PyTuple_GET_ITEM(varnames, j);
|
|
|
|
if (!PyUnicode_Compare(cell, arg)) {
|
|
|
|
cell2arg[i] = j;
|
|
|
|
used_cell2arg = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!used_cell2arg) {
|
|
|
|
PyMem_FREE(cell2arg);
|
|
|
|
cell2arg = NULL;
|
|
|
|
}
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
co = PyObject_NEW(PyCodeObject, &PyCode_Type);
|
2011-06-26 00:54:45 -03:00
|
|
|
if (co == NULL) {
|
|
|
|
if (cell2arg)
|
|
|
|
PyMem_FREE(cell2arg);
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2011-06-26 00:54:45 -03:00
|
|
|
co->co_argcount = argcount;
|
|
|
|
co->co_kwonlyargcount = kwonlyargcount;
|
|
|
|
co->co_nlocals = nlocals;
|
|
|
|
co->co_stacksize = stacksize;
|
|
|
|
co->co_flags = flags;
|
|
|
|
Py_INCREF(code);
|
|
|
|
co->co_code = code;
|
|
|
|
Py_INCREF(consts);
|
|
|
|
co->co_consts = consts;
|
|
|
|
Py_INCREF(names);
|
|
|
|
co->co_names = names;
|
|
|
|
Py_INCREF(varnames);
|
|
|
|
co->co_varnames = varnames;
|
|
|
|
Py_INCREF(freevars);
|
|
|
|
co->co_freevars = freevars;
|
|
|
|
Py_INCREF(cellvars);
|
|
|
|
co->co_cellvars = cellvars;
|
|
|
|
co->co_cell2arg = cell2arg;
|
|
|
|
Py_INCREF(filename);
|
|
|
|
co->co_filename = filename;
|
|
|
|
Py_INCREF(name);
|
|
|
|
co->co_name = name;
|
|
|
|
co->co_firstlineno = firstlineno;
|
|
|
|
Py_INCREF(lnotab);
|
|
|
|
co->co_lnotab = lnotab;
|
|
|
|
co->co_zombieframe = NULL;
|
|
|
|
co->co_weakreflist = NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
return co;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
Merged revisions 72487-72488,72879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72487 | jeffrey.yasskin | 2009-05-08 17:51:06 -0400 (Fri, 08 May 2009) | 7 lines
PyCode_NewEmpty:
Most uses of PyCode_New found by http://www.google.com/codesearch?q=PyCode_New
are trying to build an empty code object, usually to put it in a dummy frame
object. This patch adds a PyCode_NewEmpty wrapper which lets the user specify
just the filename, function name, and first line number, instead of also
requiring lots of code internals.
........
r72488 | jeffrey.yasskin | 2009-05-08 18:23:21 -0400 (Fri, 08 May 2009) | 13 lines
Issue 5954, PyFrame_GetLineNumber:
Most uses of PyCode_Addr2Line
(http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get
the line number of a specified frame, but there's no way to do that directly.
Forcing people to go through the code object makes them know more about the
guts of the interpreter than they should need.
The remaining uses of PyCode_Addr2Line seem to be getting the line from a
traceback (for example,
http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line),
which is replaced by the tb_lineno field. So we may be able to deprecate
PyCode_Addr2Line entirely for external use.
........
r72879 | jeffrey.yasskin | 2009-05-23 19:23:01 -0400 (Sat, 23 May 2009) | 14 lines
Issue #6042:
lnotab-based tracing is very complicated and isn't documented very well. There
were at least 3 comment blocks purporting to document co_lnotab, and none did a
very good job. This patch unifies them into Objects/lnotab_notes.txt which
tries to completely capture the current state of affairs.
I also discovered that we've attached 2 layers of patches to the basic tracing
scheme. The first layer avoids jumping to instructions that don't start a line,
to avoid problems in if statements and while loops. The second layer
discovered that jumps backward do need to trace at instructions that don't
start a line, so it added extra lnotab entries for 'while' and 'for' loops, and
added a special case for backward jumps within the same line. I replaced these
patches by just treating forward and backward jumps differently.
........
2009-07-21 01:30:03 -03:00
|
|
|
PyCodeObject *
|
|
|
|
PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
static PyObject *emptystring = NULL;
|
|
|
|
static PyObject *nulltuple = NULL;
|
|
|
|
PyObject *filename_ob = NULL;
|
|
|
|
PyObject *funcname_ob = NULL;
|
|
|
|
PyCodeObject *result = NULL;
|
|
|
|
if (emptystring == NULL) {
|
|
|
|
emptystring = PyBytes_FromString("");
|
|
|
|
if (emptystring == NULL)
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
if (nulltuple == NULL) {
|
|
|
|
nulltuple = PyTuple_New(0);
|
|
|
|
if (nulltuple == NULL)
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
funcname_ob = PyUnicode_FromString(funcname);
|
|
|
|
if (funcname_ob == NULL)
|
|
|
|
goto failed;
|
|
|
|
filename_ob = PyUnicode_DecodeFSDefault(filename);
|
|
|
|
if (filename_ob == NULL)
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
result = PyCode_New(0, /* argcount */
|
|
|
|
0, /* kwonlyargcount */
|
|
|
|
0, /* nlocals */
|
|
|
|
0, /* stacksize */
|
|
|
|
0, /* flags */
|
|
|
|
emptystring, /* code */
|
|
|
|
nulltuple, /* consts */
|
|
|
|
nulltuple, /* names */
|
|
|
|
nulltuple, /* varnames */
|
|
|
|
nulltuple, /* freevars */
|
|
|
|
nulltuple, /* cellvars */
|
|
|
|
filename_ob, /* filename */
|
|
|
|
funcname_ob, /* name */
|
|
|
|
firstlineno, /* firstlineno */
|
|
|
|
emptystring /* lnotab */
|
|
|
|
);
|
Merged revisions 72487-72488,72879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72487 | jeffrey.yasskin | 2009-05-08 17:51:06 -0400 (Fri, 08 May 2009) | 7 lines
PyCode_NewEmpty:
Most uses of PyCode_New found by http://www.google.com/codesearch?q=PyCode_New
are trying to build an empty code object, usually to put it in a dummy frame
object. This patch adds a PyCode_NewEmpty wrapper which lets the user specify
just the filename, function name, and first line number, instead of also
requiring lots of code internals.
........
r72488 | jeffrey.yasskin | 2009-05-08 18:23:21 -0400 (Fri, 08 May 2009) | 13 lines
Issue 5954, PyFrame_GetLineNumber:
Most uses of PyCode_Addr2Line
(http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get
the line number of a specified frame, but there's no way to do that directly.
Forcing people to go through the code object makes them know more about the
guts of the interpreter than they should need.
The remaining uses of PyCode_Addr2Line seem to be getting the line from a
traceback (for example,
http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line),
which is replaced by the tb_lineno field. So we may be able to deprecate
PyCode_Addr2Line entirely for external use.
........
r72879 | jeffrey.yasskin | 2009-05-23 19:23:01 -0400 (Sat, 23 May 2009) | 14 lines
Issue #6042:
lnotab-based tracing is very complicated and isn't documented very well. There
were at least 3 comment blocks purporting to document co_lnotab, and none did a
very good job. This patch unifies them into Objects/lnotab_notes.txt which
tries to completely capture the current state of affairs.
I also discovered that we've attached 2 layers of patches to the basic tracing
scheme. The first layer avoids jumping to instructions that don't start a line,
to avoid problems in if statements and while loops. The second layer
discovered that jumps backward do need to trace at instructions that don't
start a line, so it added extra lnotab entries for 'while' and 'for' loops, and
added a special case for backward jumps within the same line. I replaced these
patches by just treating forward and backward jumps differently.
........
2009-07-21 01:30:03 -03:00
|
|
|
|
|
|
|
failed:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(funcname_ob);
|
|
|
|
Py_XDECREF(filename_ob);
|
|
|
|
return result;
|
Merged revisions 72487-72488,72879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72487 | jeffrey.yasskin | 2009-05-08 17:51:06 -0400 (Fri, 08 May 2009) | 7 lines
PyCode_NewEmpty:
Most uses of PyCode_New found by http://www.google.com/codesearch?q=PyCode_New
are trying to build an empty code object, usually to put it in a dummy frame
object. This patch adds a PyCode_NewEmpty wrapper which lets the user specify
just the filename, function name, and first line number, instead of also
requiring lots of code internals.
........
r72488 | jeffrey.yasskin | 2009-05-08 18:23:21 -0400 (Fri, 08 May 2009) | 13 lines
Issue 5954, PyFrame_GetLineNumber:
Most uses of PyCode_Addr2Line
(http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get
the line number of a specified frame, but there's no way to do that directly.
Forcing people to go through the code object makes them know more about the
guts of the interpreter than they should need.
The remaining uses of PyCode_Addr2Line seem to be getting the line from a
traceback (for example,
http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line),
which is replaced by the tb_lineno field. So we may be able to deprecate
PyCode_Addr2Line entirely for external use.
........
r72879 | jeffrey.yasskin | 2009-05-23 19:23:01 -0400 (Sat, 23 May 2009) | 14 lines
Issue #6042:
lnotab-based tracing is very complicated and isn't documented very well. There
were at least 3 comment blocks purporting to document co_lnotab, and none did a
very good job. This patch unifies them into Objects/lnotab_notes.txt which
tries to completely capture the current state of affairs.
I also discovered that we've attached 2 layers of patches to the basic tracing
scheme. The first layer avoids jumping to instructions that don't start a line,
to avoid problems in if statements and while loops. The second layer
discovered that jumps backward do need to trace at instructions that don't
start a line, so it added extra lnotab entries for 'while' and 'for' loops, and
added a special case for backward jumps within the same line. I replaced these
patches by just treating forward and backward jumps differently.
........
2009-07-21 01:30:03 -03:00
|
|
|
}
|
2005-10-20 16:59:25 -03:00
|
|
|
|
|
|
|
#define OFF(x) offsetof(PyCodeObject, x)
|
|
|
|
|
|
|
|
static PyMemberDef code_memberlist[] = {
|
2010-05-09 12:52:27 -03:00
|
|
|
{"co_argcount", T_INT, OFF(co_argcount), READONLY},
|
|
|
|
{"co_kwonlyargcount", T_INT, OFF(co_kwonlyargcount), READONLY},
|
|
|
|
{"co_nlocals", T_INT, OFF(co_nlocals), READONLY},
|
|
|
|
{"co_stacksize",T_INT, OFF(co_stacksize), READONLY},
|
|
|
|
{"co_flags", T_INT, OFF(co_flags), READONLY},
|
|
|
|
{"co_code", T_OBJECT, OFF(co_code), READONLY},
|
|
|
|
{"co_consts", T_OBJECT, OFF(co_consts), READONLY},
|
|
|
|
{"co_names", T_OBJECT, OFF(co_names), READONLY},
|
|
|
|
{"co_varnames", T_OBJECT, OFF(co_varnames), READONLY},
|
|
|
|
{"co_freevars", T_OBJECT, OFF(co_freevars), READONLY},
|
|
|
|
{"co_cellvars", T_OBJECT, OFF(co_cellvars), READONLY},
|
|
|
|
{"co_filename", T_OBJECT, OFF(co_filename), READONLY},
|
|
|
|
{"co_name", T_OBJECT, OFF(co_name), READONLY},
|
|
|
|
{"co_firstlineno", T_INT, OFF(co_firstlineno), READONLY},
|
|
|
|
{"co_lnotab", T_OBJECT, OFF(co_lnotab), READONLY},
|
|
|
|
{NULL} /* Sentinel */
|
2005-10-20 16:59:25 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Helper for code_new: return a shallow copy of a tuple that is
|
|
|
|
guaranteed to contain exact strings, by converting string subclasses
|
|
|
|
to exact strings and complaining if a non-string is found. */
|
|
|
|
static PyObject*
|
|
|
|
validate_and_copy_tuple(PyObject *tup)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *newtuple;
|
|
|
|
PyObject *item;
|
|
|
|
Py_ssize_t i, len;
|
|
|
|
|
|
|
|
len = PyTuple_GET_SIZE(tup);
|
|
|
|
newtuple = PyTuple_New(len);
|
|
|
|
if (newtuple == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
item = PyTuple_GET_ITEM(tup, i);
|
|
|
|
if (PyUnicode_CheckExact(item)) {
|
|
|
|
Py_INCREF(item);
|
|
|
|
}
|
|
|
|
else if (!PyUnicode_Check(item)) {
|
|
|
|
PyErr_Format(
|
|
|
|
PyExc_TypeError,
|
|
|
|
"name tuples must contain only "
|
|
|
|
"strings, not '%.500s'",
|
|
|
|
item->ob_type->tp_name);
|
|
|
|
Py_DECREF(newtuple);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else {
|
2011-10-11 16:53:24 -03:00
|
|
|
item = PyUnicode_Copy(item);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (item == NULL) {
|
|
|
|
Py_DECREF(newtuple);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PyTuple_SET_ITEM(newtuple, i, item);
|
|
|
|
}
|
|
|
|
|
|
|
|
return newtuple;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(code_doc,
|
2009-07-18 06:07:48 -03:00
|
|
|
"code(argcount, kwonlyargcount, nlocals, stacksize, flags, codestring,\n\
|
2008-01-26 05:39:23 -04:00
|
|
|
constants, names, varnames, filename, name, firstlineno,\n\
|
|
|
|
lnotab[, freevars[, cellvars]])\n\
|
2005-10-20 16:59:25 -03:00
|
|
|
\n\
|
|
|
|
Create a code object. Not for the faint of heart.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
code_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int argcount;
|
|
|
|
int kwonlyargcount;
|
|
|
|
int nlocals;
|
|
|
|
int stacksize;
|
|
|
|
int flags;
|
|
|
|
PyObject *co = NULL;
|
|
|
|
PyObject *code;
|
|
|
|
PyObject *consts;
|
|
|
|
PyObject *names, *ournames = NULL;
|
|
|
|
PyObject *varnames, *ourvarnames = NULL;
|
|
|
|
PyObject *freevars = NULL, *ourfreevars = NULL;
|
|
|
|
PyObject *cellvars = NULL, *ourcellvars = NULL;
|
|
|
|
PyObject *filename;
|
|
|
|
PyObject *name;
|
|
|
|
int firstlineno;
|
|
|
|
PyObject *lnotab;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "iiiiiSO!O!O!UUiS|O!O!:code",
|
|
|
|
&argcount, &kwonlyargcount,
|
|
|
|
&nlocals, &stacksize, &flags,
|
|
|
|
&code,
|
|
|
|
&PyTuple_Type, &consts,
|
|
|
|
&PyTuple_Type, &names,
|
|
|
|
&PyTuple_Type, &varnames,
|
|
|
|
&filename, &name,
|
|
|
|
&firstlineno, &lnotab,
|
|
|
|
&PyTuple_Type, &freevars,
|
|
|
|
&PyTuple_Type, &cellvars))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (argcount < 0) {
|
|
|
|
PyErr_SetString(
|
|
|
|
PyExc_ValueError,
|
|
|
|
"code: argcount must not be negative");
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (kwonlyargcount < 0) {
|
|
|
|
PyErr_SetString(
|
|
|
|
PyExc_ValueError,
|
|
|
|
"code: kwonlyargcount must not be negative");
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (nlocals < 0) {
|
|
|
|
PyErr_SetString(
|
|
|
|
PyExc_ValueError,
|
|
|
|
"code: nlocals must not be negative");
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
ournames = validate_and_copy_tuple(names);
|
|
|
|
if (ournames == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
ourvarnames = validate_and_copy_tuple(varnames);
|
|
|
|
if (ourvarnames == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
if (freevars)
|
|
|
|
ourfreevars = validate_and_copy_tuple(freevars);
|
|
|
|
else
|
|
|
|
ourfreevars = PyTuple_New(0);
|
|
|
|
if (ourfreevars == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
if (cellvars)
|
|
|
|
ourcellvars = validate_and_copy_tuple(cellvars);
|
|
|
|
else
|
|
|
|
ourcellvars = PyTuple_New(0);
|
|
|
|
if (ourcellvars == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
co = (PyObject *)PyCode_New(argcount, kwonlyargcount,
|
|
|
|
nlocals, stacksize, flags,
|
|
|
|
code, consts, ournames, ourvarnames,
|
|
|
|
ourfreevars, ourcellvars, filename,
|
|
|
|
name, firstlineno, lnotab);
|
2005-10-20 16:59:25 -03:00
|
|
|
cleanup:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(ournames);
|
|
|
|
Py_XDECREF(ourvarnames);
|
|
|
|
Py_XDECREF(ourfreevars);
|
|
|
|
Py_XDECREF(ourcellvars);
|
|
|
|
return co;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
code_dealloc(PyCodeObject *co)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(co->co_code);
|
|
|
|
Py_XDECREF(co->co_consts);
|
|
|
|
Py_XDECREF(co->co_names);
|
|
|
|
Py_XDECREF(co->co_varnames);
|
|
|
|
Py_XDECREF(co->co_freevars);
|
|
|
|
Py_XDECREF(co->co_cellvars);
|
|
|
|
Py_XDECREF(co->co_filename);
|
|
|
|
Py_XDECREF(co->co_name);
|
|
|
|
Py_XDECREF(co->co_lnotab);
|
2011-06-26 00:54:45 -03:00
|
|
|
if (co->co_cell2arg != NULL)
|
|
|
|
PyMem_FREE(co->co_cell2arg);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (co->co_zombieframe != NULL)
|
|
|
|
PyObject_GC_Del(co->co_zombieframe);
|
|
|
|
if (co->co_weakreflist != NULL)
|
|
|
|
PyObject_ClearWeakRefs((PyObject*)co);
|
|
|
|
PyObject_DEL(co);
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
code_repr(PyCodeObject *co)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int lineno;
|
|
|
|
if (co->co_firstlineno != 0)
|
|
|
|
lineno = co->co_firstlineno;
|
|
|
|
else
|
|
|
|
lineno = -1;
|
|
|
|
if (co->co_filename && PyUnicode_Check(co->co_filename)) {
|
|
|
|
return PyUnicode_FromFormat(
|
2011-01-04 23:33:26 -04:00
|
|
|
"<code object %U at %p, file \"%U\", line %d>",
|
2010-05-09 12:52:27 -03:00
|
|
|
co->co_name, co, co->co_filename, lineno);
|
|
|
|
} else {
|
|
|
|
return PyUnicode_FromFormat(
|
2011-01-04 23:33:26 -04:00
|
|
|
"<code object %U at %p, file ???, line %d>",
|
2010-05-09 12:52:27 -03:00
|
|
|
co->co_name, co, lineno);
|
|
|
|
}
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
2006-08-23 21:41:19 -03:00
|
|
|
static PyObject *
|
|
|
|
code_richcompare(PyObject *self, PyObject *other, int op)
|
2005-10-20 16:59:25 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyCodeObject *co, *cp;
|
|
|
|
int eq;
|
|
|
|
PyObject *res;
|
|
|
|
|
|
|
|
if ((op != Py_EQ && op != Py_NE) ||
|
|
|
|
!PyCode_Check(self) ||
|
|
|
|
!PyCode_Check(other)) {
|
2011-08-10 22:28:54 -03:00
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
co = (PyCodeObject *)self;
|
|
|
|
cp = (PyCodeObject *)other;
|
|
|
|
|
|
|
|
eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
eq = co->co_argcount == cp->co_argcount;
|
|
|
|
if (!eq) goto unequal;
|
|
|
|
eq = co->co_kwonlyargcount == cp->co_kwonlyargcount;
|
|
|
|
if (!eq) goto unequal;
|
|
|
|
eq = co->co_nlocals == cp->co_nlocals;
|
|
|
|
if (!eq) goto unequal;
|
|
|
|
eq = co->co_flags == cp->co_flags;
|
|
|
|
if (!eq) goto unequal;
|
|
|
|
eq = co->co_firstlineno == cp->co_firstlineno;
|
|
|
|
if (!eq) goto unequal;
|
|
|
|
eq = PyObject_RichCompareBool(co->co_code, cp->co_code, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
eq = PyObject_RichCompareBool(co->co_consts, cp->co_consts, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
eq = PyObject_RichCompareBool(co->co_names, cp->co_names, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
eq = PyObject_RichCompareBool(co->co_varnames, cp->co_varnames, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
eq = PyObject_RichCompareBool(co->co_freevars, cp->co_freevars, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
eq = PyObject_RichCompareBool(co->co_cellvars, cp->co_cellvars, Py_EQ);
|
|
|
|
if (eq <= 0) goto unequal;
|
|
|
|
|
|
|
|
if (op == Py_EQ)
|
|
|
|
res = Py_True;
|
|
|
|
else
|
|
|
|
res = Py_False;
|
|
|
|
goto done;
|
2006-08-24 01:12:18 -03:00
|
|
|
|
|
|
|
unequal:
|
2010-05-09 12:52:27 -03:00
|
|
|
if (eq < 0)
|
|
|
|
return NULL;
|
|
|
|
if (op == Py_NE)
|
|
|
|
res = Py_True;
|
|
|
|
else
|
|
|
|
res = Py_False;
|
2006-08-24 01:12:18 -03:00
|
|
|
|
|
|
|
done:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_INCREF(res);
|
|
|
|
return res;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
2010-10-17 17:54:53 -03:00
|
|
|
static Py_hash_t
|
2005-10-20 16:59:25 -03:00
|
|
|
code_hash(PyCodeObject *co)
|
|
|
|
{
|
2010-10-17 17:54:53 -03:00
|
|
|
Py_hash_t h, h0, h1, h2, h3, h4, h5, h6;
|
2010-05-09 12:52:27 -03:00
|
|
|
h0 = PyObject_Hash(co->co_name);
|
|
|
|
if (h0 == -1) return -1;
|
|
|
|
h1 = PyObject_Hash(co->co_code);
|
|
|
|
if (h1 == -1) return -1;
|
|
|
|
h2 = PyObject_Hash(co->co_consts);
|
|
|
|
if (h2 == -1) return -1;
|
|
|
|
h3 = PyObject_Hash(co->co_names);
|
|
|
|
if (h3 == -1) return -1;
|
|
|
|
h4 = PyObject_Hash(co->co_varnames);
|
|
|
|
if (h4 == -1) return -1;
|
|
|
|
h5 = PyObject_Hash(co->co_freevars);
|
|
|
|
if (h5 == -1) return -1;
|
|
|
|
h6 = PyObject_Hash(co->co_cellvars);
|
|
|
|
if (h6 == -1) return -1;
|
|
|
|
h = h0 ^ h1 ^ h2 ^ h3 ^ h4 ^ h5 ^ h6 ^
|
|
|
|
co->co_argcount ^ co->co_kwonlyargcount ^
|
|
|
|
co->co_nlocals ^ co->co_flags;
|
|
|
|
if (h == -1) h = -2;
|
|
|
|
return h;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX code objects need to participate in GC? */
|
|
|
|
|
|
|
|
PyTypeObject PyCode_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"code",
|
|
|
|
sizeof(PyCodeObject),
|
|
|
|
0,
|
|
|
|
(destructor)code_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_reserved */
|
|
|
|
(reprfunc)code_repr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
(hashfunc)code_hash, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
|
|
code_doc, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
code_richcompare, /* tp_richcompare */
|
|
|
|
offsetof(PyCodeObject, co_weakreflist), /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
0, /* tp_methods */
|
|
|
|
code_memberlist, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
code_new, /* tp_new */
|
2005-10-20 16:59:25 -03:00
|
|
|
};
|
|
|
|
|
Merged revisions 72487-72488,72879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72487 | jeffrey.yasskin | 2009-05-08 17:51:06 -0400 (Fri, 08 May 2009) | 7 lines
PyCode_NewEmpty:
Most uses of PyCode_New found by http://www.google.com/codesearch?q=PyCode_New
are trying to build an empty code object, usually to put it in a dummy frame
object. This patch adds a PyCode_NewEmpty wrapper which lets the user specify
just the filename, function name, and first line number, instead of also
requiring lots of code internals.
........
r72488 | jeffrey.yasskin | 2009-05-08 18:23:21 -0400 (Fri, 08 May 2009) | 13 lines
Issue 5954, PyFrame_GetLineNumber:
Most uses of PyCode_Addr2Line
(http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get
the line number of a specified frame, but there's no way to do that directly.
Forcing people to go through the code object makes them know more about the
guts of the interpreter than they should need.
The remaining uses of PyCode_Addr2Line seem to be getting the line from a
traceback (for example,
http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line),
which is replaced by the tb_lineno field. So we may be able to deprecate
PyCode_Addr2Line entirely for external use.
........
r72879 | jeffrey.yasskin | 2009-05-23 19:23:01 -0400 (Sat, 23 May 2009) | 14 lines
Issue #6042:
lnotab-based tracing is very complicated and isn't documented very well. There
were at least 3 comment blocks purporting to document co_lnotab, and none did a
very good job. This patch unifies them into Objects/lnotab_notes.txt which
tries to completely capture the current state of affairs.
I also discovered that we've attached 2 layers of patches to the basic tracing
scheme. The first layer avoids jumping to instructions that don't start a line,
to avoid problems in if statements and while loops. The second layer
discovered that jumps backward do need to trace at instructions that don't
start a line, so it added extra lnotab entries for 'while' and 'for' loops, and
added a special case for backward jumps within the same line. I replaced these
patches by just treating forward and backward jumps differently.
........
2009-07-21 01:30:03 -03:00
|
|
|
/* Use co_lnotab to compute the line number from a bytecode index, addrq. See
|
|
|
|
lnotab_notes.txt for the details of the lnotab representation.
|
2005-10-20 16:59:25 -03:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
PyCode_Addr2Line(PyCodeObject *co, int addrq)
|
|
|
|
{
|
2011-01-04 08:59:15 -04:00
|
|
|
Py_ssize_t size = PyBytes_Size(co->co_lnotab) / 2;
|
2010-05-09 12:52:27 -03:00
|
|
|
unsigned char *p = (unsigned char*)PyBytes_AsString(co->co_lnotab);
|
|
|
|
int line = co->co_firstlineno;
|
|
|
|
int addr = 0;
|
|
|
|
while (--size >= 0) {
|
|
|
|
addr += *p++;
|
|
|
|
if (addr > addrq)
|
|
|
|
break;
|
|
|
|
line += *p++;
|
|
|
|
}
|
|
|
|
return line;
|
2005-10-20 16:59:25 -03:00
|
|
|
}
|
2006-04-21 07:40:58 -03:00
|
|
|
|
Merged revisions 72487-72488,72879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72487 | jeffrey.yasskin | 2009-05-08 17:51:06 -0400 (Fri, 08 May 2009) | 7 lines
PyCode_NewEmpty:
Most uses of PyCode_New found by http://www.google.com/codesearch?q=PyCode_New
are trying to build an empty code object, usually to put it in a dummy frame
object. This patch adds a PyCode_NewEmpty wrapper which lets the user specify
just the filename, function name, and first line number, instead of also
requiring lots of code internals.
........
r72488 | jeffrey.yasskin | 2009-05-08 18:23:21 -0400 (Fri, 08 May 2009) | 13 lines
Issue 5954, PyFrame_GetLineNumber:
Most uses of PyCode_Addr2Line
(http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get
the line number of a specified frame, but there's no way to do that directly.
Forcing people to go through the code object makes them know more about the
guts of the interpreter than they should need.
The remaining uses of PyCode_Addr2Line seem to be getting the line from a
traceback (for example,
http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line),
which is replaced by the tb_lineno field. So we may be able to deprecate
PyCode_Addr2Line entirely for external use.
........
r72879 | jeffrey.yasskin | 2009-05-23 19:23:01 -0400 (Sat, 23 May 2009) | 14 lines
Issue #6042:
lnotab-based tracing is very complicated and isn't documented very well. There
were at least 3 comment blocks purporting to document co_lnotab, and none did a
very good job. This patch unifies them into Objects/lnotab_notes.txt which
tries to completely capture the current state of affairs.
I also discovered that we've attached 2 layers of patches to the basic tracing
scheme. The first layer avoids jumping to instructions that don't start a line,
to avoid problems in if statements and while loops. The second layer
discovered that jumps backward do need to trace at instructions that don't
start a line, so it added extra lnotab entries for 'while' and 'for' loops, and
added a special case for backward jumps within the same line. I replaced these
patches by just treating forward and backward jumps differently.
........
2009-07-21 01:30:03 -03:00
|
|
|
/* Update *bounds to describe the first and one-past-the-last instructions in
|
|
|
|
the same line as lasti. Return the number of that line. */
|
|
|
|
int
|
|
|
|
_PyCode_CheckLineNumber(PyCodeObject* co, int lasti, PyAddrPair *bounds)
|
2006-04-21 07:40:58 -03:00
|
|
|
{
|
2011-01-04 08:59:15 -04:00
|
|
|
Py_ssize_t size;
|
|
|
|
int addr, line;
|
2010-05-09 12:52:27 -03:00
|
|
|
unsigned char* p;
|
|
|
|
|
|
|
|
p = (unsigned char*)PyBytes_AS_STRING(co->co_lnotab);
|
|
|
|
size = PyBytes_GET_SIZE(co->co_lnotab) / 2;
|
|
|
|
|
|
|
|
addr = 0;
|
|
|
|
line = co->co_firstlineno;
|
|
|
|
assert(line > 0);
|
|
|
|
|
|
|
|
/* possible optimization: if f->f_lasti == instr_ub
|
|
|
|
(likely to be a common case) then we already know
|
|
|
|
instr_lb -- if we stored the matching value of p
|
|
|
|
somwhere we could skip the first while loop. */
|
|
|
|
|
|
|
|
/* See lnotab_notes.txt for the description of
|
|
|
|
co_lnotab. A point to remember: increments to p
|
|
|
|
come in (addr, line) pairs. */
|
|
|
|
|
|
|
|
bounds->ap_lower = 0;
|
|
|
|
while (size > 0) {
|
|
|
|
if (addr + *p > lasti)
|
|
|
|
break;
|
|
|
|
addr += *p++;
|
|
|
|
if (*p)
|
|
|
|
bounds->ap_lower = addr;
|
|
|
|
line += *p++;
|
|
|
|
--size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (size > 0) {
|
|
|
|
while (--size >= 0) {
|
|
|
|
addr += *p++;
|
|
|
|
if (*p++)
|
|
|
|
break;
|
2006-04-21 07:40:58 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
bounds->ap_upper = addr;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
bounds->ap_upper = INT_MAX;
|
|
|
|
}
|
2006-04-21 07:40:58 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return line;
|
2006-04-21 07:40:58 -03:00
|
|
|
}
|