Mercurial > cpython-lru_cache-weakref
view Python/modsupport.c @ 55372:79718ee03986
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.
........
| author | Alexandre Vassalotti <alexandre@peadrop.com> |
|---|---|
| date | Tue, 21 Jul 2009 04:30:03 +0000 |
| parents | 2df1517d868c |
| children | f197407bdba2 0f9e8d3ecac3 |
line wrap: on
line source
/* Module support implementation */ #include "Python.h" #define FLAG_SIZE_T 1 typedef double va_double; static PyObject *va_build_value(const char *, va_list, int); /* Package context -- the full module name for package imports */ char *_Py_PackageContext = NULL; /* Helper for mkvalue() to scan the length of a format */ static int countformat(const char *format, int endchar) { int count = 0; int level = 0; while (level > 0 || *format != endchar) { switch (*format) { case '\0': /* Premature end */ PyErr_SetString(PyExc_SystemError, "unmatched paren in format"); return -1; case '(': case '[': case '{': if (level == 0) count++; level++; break; case ')': case ']': case '}': level--; break; case '#': case '&': case ',': case ':': case ' ': case '\t': break; default: if (level == 0) count++; } format++; } return count; } /* Generic function to create a value -- the inverse of getargs() */ /* After an original idea and first implementation by Steven Miale */ static PyObject *do_mktuple(const char**, va_list *, int, int, int); static PyObject *do_mklist(const char**, va_list *, int, int, int); static PyObject *do_mkdict(const char**, va_list *, int, int, int); static PyObject *do_mkvalue(const char**, va_list *, int); static PyObject * do_mkdict(const char **p_format, va_list *p_va, int endchar, int n, int flags) { PyObject *d; int i; int itemfailed = 0; if (n < 0) return NULL; if ((d = PyDict_New()) == NULL) return NULL; /* Note that we can't bail immediately on error as this will leak refcounts on any 'N' arguments. */ for (i = 0; i < n; i+= 2) { PyObject *k, *v; int err; k = do_mkvalue(p_format, p_va, flags); if (k == NULL) { itemfailed = 1; Py_INCREF(Py_None); k = Py_None; } v = do_mkvalue(p_format, p_va, flags); if (v == NULL) { itemfailed = 1; Py_INCREF(Py_None); v = Py_None; } err = PyDict_SetItem(d, k, v); Py_DECREF(k); Py_DECREF(v); if (err < 0 || itemfailed) { Py_DECREF(d); return NULL; } } if (d != NULL && **p_format != endchar) { Py_DECREF(d); d = NULL; PyErr_SetString(PyExc_SystemError, "Unmatched paren in format"); } else if (endchar) ++*p_format; return d; } static PyObject * do_mklist(const char **p_format, va_list *p_va, int endchar, int n, int flags) { PyObject *v; int i; int itemfailed = 0; if (n < 0) return NULL; v = PyList_New(n); if (v == NULL) return NULL; /* Note that we can't bail immediately on error as this will leak refcounts on any 'N' arguments. */ for (i = 0; i < n; i++) { PyObject *w = do_mkvalue(p_format, p_va, flags); if (w == NULL) { itemfailed = 1; Py_INCREF(Py_None); w = Py_None; } PyList_SET_ITEM(v, i, w); } if (itemfailed) { /* do_mkvalue() should have already set an error */ Py_DECREF(v); return NULL; } if (**p_format != endchar) { Py_DECREF(v); PyErr_SetString(PyExc_SystemError, "Unmatched paren in format"); return NULL; } if (endchar) ++*p_format; return v; } static int _ustrlen(Py_UNICODE *u) { int i = 0; Py_UNICODE *v = u; while (*v != 0) { i++; v++; } return i; } static PyObject * do_mktuple(const char **p_format, va_list *p_va, int endchar, int n, int flags) { PyObject *v; int i; int itemfailed = 0; if (n < 0) return NULL; if ((v = PyTuple_New(n)) == NULL) return NULL; /* Note that we can't bail immediately on error as this will leak refcounts on any 'N' arguments. */ for (i = 0; i < n; i++) { PyObject *w = do_mkvalue(p_format, p_va, flags); if (w == NULL) { itemfailed = 1; Py_INCREF(Py_None); w = Py_None; } PyTuple_SET_ITEM(v, i, w); } if (itemfailed) { /* do_mkvalue() should have already set an error */ Py_DECREF(v); return NULL; } if (**p_format != endchar) { Py_DECREF(v); PyErr_SetString(PyExc_SystemError, "Unmatched paren in format"); return NULL; } if (endchar) ++*p_format; return v; } static PyObject * do_mkvalue(const char **p_format, va_list *p_va, int flags) { for (;;) { switch (*(*p_format)++) { case '(': return do_mktuple(p_format, p_va, ')', countformat(*p_format, ')'), flags); case '[': return do_mklist(p_format, p_va, ']', countformat(*p_format, ']'), flags); case '{': return do_mkdict(p_format, p_va, '}', countformat(*p_format, '}'), flags); case 'b': case 'B': case 'h': case 'i': return PyLong_FromLong((long)va_arg(*p_va, int)); case 'H': return PyLong_FromLong((long)va_arg(*p_va, unsigned int)); case 'I': { unsigned int n; n = va_arg(*p_va, unsigned int); return PyLong_FromUnsignedLong(n); } case 'n': #if SIZEOF_SIZE_T!=SIZEOF_LONG return PyLong_FromSsize_t(va_arg(*p_va, Py_ssize_t)); #endif /* Fall through from 'n' to 'l' if Py_ssize_t is long */ case 'l': return PyLong_FromLong(va_arg(*p_va, long)); case 'k': { unsigned long n; n = va_arg(*p_va, unsigned long); return PyLong_FromUnsignedLong(n); } #ifdef HAVE_LONG_LONG case 'L': return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG)); case 'K': return PyLong_FromUnsignedLongLong((PY_LONG_LONG)va_arg(*p_va, unsigned PY_LONG_LONG)); #endif case 'u': { PyObject *v; Py_UNICODE *u = va_arg(*p_va, Py_UNICODE *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; if (flags & FLAG_SIZE_T) n = va_arg(*p_va, Py_ssize_t); else n = va_arg(*p_va, int); } else n = -1; if (u == NULL) { v = Py_None; Py_INCREF(v); } else { if (n < 0) n = _ustrlen(u); v = PyUnicode_FromUnicode(u, n); } return v; } case 'f': case 'd': return PyFloat_FromDouble( (double)va_arg(*p_va, va_double)); #ifndef WITHOUT_COMPLEX case 'D': return PyComplex_FromCComplex( *((Py_complex *)va_arg(*p_va, Py_complex *))); #endif /* WITHOUT_COMPLEX */ case 'c': { char p[1]; p[0] = (char)va_arg(*p_va, int); return PyBytes_FromStringAndSize(p, 1); } case 'C': { int i = va_arg(*p_va, int); if (i < 0 || i > PyUnicode_GetMax()) { PyErr_SetString(PyExc_OverflowError, "%c arg not in range(0x110000)"); return NULL; } return PyUnicode_FromOrdinal(i); } case 's': case 'z': { PyObject *v; char *str = va_arg(*p_va, char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; if (flags & FLAG_SIZE_T) n = va_arg(*p_va, Py_ssize_t); else n = va_arg(*p_va, int); } else n = -1; if (str == NULL) { v = Py_None; Py_INCREF(v); } else { if (n < 0) { size_t m = strlen(str); if (m > PY_SSIZE_T_MAX) { PyErr_SetString(PyExc_OverflowError, "string too long for Python string"); return NULL; } n = (Py_ssize_t)m; } v = PyUnicode_FromStringAndSize(str, n); } return v; } case 'U': { PyObject *v; char *str = va_arg(*p_va, char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; if (flags & FLAG_SIZE_T) n = va_arg(*p_va, Py_ssize_t); else n = va_arg(*p_va, int); } else n = -1; if (str == NULL) { v = Py_None; Py_INCREF(v); } else { if (n < 0) { size_t m = strlen(str); if (m > PY_SSIZE_T_MAX) { PyErr_SetString(PyExc_OverflowError, "string too long for Python string"); return NULL; } n = (Py_ssize_t)m; } v = PyUnicode_FromStringAndSize(str, n); } return v; } case 'y': { PyObject *v; char *str = va_arg(*p_va, char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; if (flags & FLAG_SIZE_T) n = va_arg(*p_va, Py_ssize_t); else n = va_arg(*p_va, int); } else n = -1; if (str == NULL) { v = Py_None; Py_INCREF(v); } else { if (n < 0) { size_t m = strlen(str); if (m > PY_SSIZE_T_MAX) { PyErr_SetString(PyExc_OverflowError, "string too long for Python bytes"); return NULL; } n = (Py_ssize_t)m; } v = PyBytes_FromStringAndSize(str, n); } return v; } case 'N': case 'S': case 'O': if (**p_format == '&') { typedef PyObject *(*converter)(void *); converter func = va_arg(*p_va, converter); void *arg = va_arg(*p_va, void *); ++*p_format; return (*func)(arg); } else { PyObject *v; v = va_arg(*p_va, PyObject *); if (v != NULL) { if (*(*p_format - 1) != 'N') Py_INCREF(v); } else if (!PyErr_Occurred()) /* If a NULL was passed * because a call that should * have constructed a value * failed, that's OK, and we * pass the error on; but if * no error occurred it's not * clear that the caller knew * what she was doing. */ PyErr_SetString(PyExc_SystemError, "NULL object passed to Py_BuildValue"); return v; } case ':': case ',': case ' ': case '\t': break; default: PyErr_SetString(PyExc_SystemError, "bad format char passed to Py_BuildValue"); return NULL; } } } PyObject * Py_BuildValue(const char *format, ...) { va_list va; PyObject* retval; va_start(va, format); retval = va_build_value(format, va, 0); va_end(va); return retval; } PyObject * _Py_BuildValue_SizeT(const char *format, ...) { va_list va; PyObject* retval; va_start(va, format); retval = va_build_value(format, va, FLAG_SIZE_T); va_end(va); return retval; } PyObject * Py_VaBuildValue(const char *format, va_list va) { return va_build_value(format, va, 0); } PyObject * _Py_VaBuildValue_SizeT(const char *format, va_list va) { return va_build_value(format, va, FLAG_SIZE_T); } static PyObject * va_build_value(const char *format, va_list va, int flags) { const char *f = format; int n = countformat(f, '\0'); va_list lva; #ifdef VA_LIST_IS_ARRAY memcpy(lva, va, sizeof(va_list)); #else #ifdef __va_copy __va_copy(lva, va); #else lva = va; #endif #endif if (n < 0) return NULL; if (n == 0) { Py_INCREF(Py_None); return Py_None; } if (n == 1) return do_mkvalue(&f, &lva, flags); return do_mktuple(&f, &lva, '\0', n, flags); } PyObject * PyEval_CallFunction(PyObject *obj, const char *format, ...) { va_list vargs; PyObject *args; PyObject *res; va_start(vargs, format); args = Py_VaBuildValue(format, vargs); va_end(vargs); if (args == NULL) return NULL; res = PyEval_CallObject(obj, args); Py_DECREF(args); return res; } PyObject * PyEval_CallMethod(PyObject *obj, const char *methodname, const char *format, ...) { va_list vargs; PyObject *meth; PyObject *args; PyObject *res; meth = PyObject_GetAttrString(obj, methodname); if (meth == NULL) return NULL; va_start(vargs, format); args = Py_VaBuildValue(format, vargs); va_end(vargs); if (args == NULL) { Py_DECREF(meth); return NULL; } res = PyEval_CallObject(meth, args); Py_DECREF(meth); Py_DECREF(args); return res; } int PyModule_AddObject(PyObject *m, const char *name, PyObject *o) { PyObject *dict; if (!PyModule_Check(m)) { PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg"); return -1; } if (!o) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value"); return -1; } dict = PyModule_GetDict(m); if (dict == NULL) { /* Internal error -- modules must have a dict! */ PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__", PyModule_GetName(m)); return -1; } if (PyDict_SetItemString(dict, name, o)) return -1; Py_DECREF(o); return 0; } int PyModule_AddIntConstant(PyObject *m, const char *name, long value) { PyObject *o = PyLong_FromLong(value); if (!o) return -1; if (PyModule_AddObject(m, name, o) == 0) return 0; Py_DECREF(o); return -1; } int PyModule_AddStringConstant(PyObject *m, const char *name, const char *value) { PyObject *o = PyUnicode_FromString(value); if (!o) return -1; if (PyModule_AddObject(m, name, o) == 0) return 0; Py_DECREF(o); return -1; }
