Mailman 3 June 2004 - Python-checkins

python/dist/src/Modules cStringIO.c,2.47,2.48
by tim_one＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31535/Modules Modified Files: cStringIO.c Log Message: sizeof(char) is 1, by definition, so get rid of that expression in places it's just noise. Index: cStringIO.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/cStringIO.c,v retrieving revision 2.47 retrieving revision 2.48 diff -C2 -d -r2.47 -r2.48 *** cStringIO.c 8 Mar 2004 18:17:31 -0000 2.47 --- cStringIO.c 27 Jun 2004 17:24:49 -0000 2.48 *************** *** 337,342 **** self->buf_size*=2; if (self->buf_size <= position) self->buf_size=position+1; ! UNLESS (self->buf=(char*) ! realloc(self->buf,self->buf_size*sizeof(char))) { self->buf_size=self->pos=0; return PyErr_NoMemory(); --- 337,342 ---- self->buf_size*=2; if (self->buf_size <= position) self->buf_size=position+1; ! UNLESS (self->buf = (char*) ! realloc(self->buf,self->buf_size)) { self->buf_size=self->pos=0; return PyErr_NoMemory(); *************** *** 372,377 **** oself->buf_size = newl+1; UNLESS (oself->buf = ! (char*)realloc(oself->buf, ! (oself->buf_size) * sizeof(char))) { PyErr_SetString(PyExc_MemoryError,"out of memory"); oself->buf_size = oself->pos = 0; --- 372,376 ---- oself->buf_size = newl+1; UNLESS (oself->buf = ! (char*)realloc(oself->buf, oself->buf_size)) { PyErr_SetString(PyExc_MemoryError,"out of memory"); oself->buf_size = oself->pos = 0; *************** *** 530,534 **** self->softspace = 0; ! UNLESS (self->buf=malloc(size*sizeof(char))) { PyErr_SetString(PyExc_MemoryError,"out of memory"); self->buf_size = 0; --- 529,533 ---- self->softspace = 0; ! UNLESS (self->buf = (char *)malloc(size)) { PyErr_SetString(PyExc_MemoryError,"out of memory"); self->buf_size = 0;

1 0

Bendiciones y un gran día para ti junto a Dios
by Fernando A. June 27, 2004

June 27, 2004

Si aceptas a Dios y a su hijo Jes�s el Cristo, entonces visita esta p�gina www.enelnombredecristo.com Lee su mensaje y que Dios te bendiga. Un abrazo Fernando Areces Pd: esto no es religi�n, es solo un mensaje real. Gracias

1 0

python/dist/src/Python import.c, 2.232, 2.233 marshal.c, 1.78, 1.79
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25751/Python Modified Files: import.c marshal.c Log Message: Patch #923098: Share interned strings in marshal. Index: import.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/import.c,v retrieving revision 2.232 retrieving revision 2.233 diff -C2 -d -r2.232 -r2.233 *** import.c 7 Jun 2004 15:04:10 -0000 2.232 --- import.c 27 Jun 2004 16:51:46 -0000 2.233 *************** *** 27,33 **** Apple MPW compiler swaps their values, botching string constants. ! Apparently, there was a distinction made between even and odd ! bytecodes that is related to Unicode. The details aren't clear, ! but the magic number has been odd for a long time. There were a variety of old schemes for setting the magic number. --- 27,33 ---- Apple MPW compiler swaps their values, botching string constants. ! The magic numbers must be spaced apart atleast 2 values, as the ! -U interpeter flag will cause MAGIC+1 being used. They have been ! odd numbers for some time now. There were a variety of old schemes for setting the magic number. *************** *** 48,54 **** Python 2.3a0: 62021 Python 2.3a0: 62011 (!) ! Python 2.4a0: 62031 */ ! #define MAGIC (62031 | ((long)'\r'<<16) | ((long)'\n'<<24)) /* Magic word as global; note that _PyImport_Init() can change the --- 48,54 ---- Python 2.3a0: 62021 Python 2.3a0: 62011 (!) ! Python 2.4a0: 62041 */ ! #define MAGIC (62041 | ((long)'\r'<<16) | ((long)'\n'<<24)) /* Magic word as global; note that _PyImport_Init() can change the *************** *** 798,805 **** return; } ! PyMarshal_WriteLongToFile(pyc_magic, fp); /* First write a 0 for mtime */ ! PyMarshal_WriteLongToFile(0L, fp); ! PyMarshal_WriteObjectToFile((PyObject *)co, fp); if (fflush(fp) != 0 || ferror(fp)) { if (Py_VerboseFlag) --- 798,805 ---- return; } ! PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION); /* First write a 0 for mtime */ ! PyMarshal_WriteLongToFile(0L, fp, Py_MARSHAL_VERSION); ! PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION); if (fflush(fp) != 0 || ferror(fp)) { if (Py_VerboseFlag) *************** *** 812,816 **** /* Now write the true mtime */ fseek(fp, 4L, 0); ! PyMarshal_WriteLongToFile(mtime, fp); fflush(fp); fclose(fp); --- 812,816 ---- /* Now write the true mtime */ fseek(fp, 4L, 0); ! PyMarshal_WriteLongToFile(mtime, fp, Py_MARSHAL_VERSION); fflush(fp); fclose(fp); Index: marshal.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** marshal.c 13 Jun 2004 20:31:49 -0000 1.78 --- marshal.c 27 Jun 2004 16:51:46 -0000 1.79 *************** *** 28,31 **** --- 28,33 ---- #define TYPE_LONG 'l' #define TYPE_STRING 's' + #define TYPE_INTERNED 't' + #define TYPE_STRINGREF 'R' #define TYPE_TUPLE '(' #define TYPE_LIST '[' *************** *** 43,46 **** --- 45,49 ---- char *ptr; char *end; + PyObject *strings; /* dict on marshal, list on unmarshal */ } WFILE; *************** *** 190,194 **** #endif else if (PyString_Check(v)) { ! w_byte(TYPE_STRING, p); n = PyString_GET_SIZE(v); w_long((long)n, p); --- 193,214 ---- #endif else if (PyString_Check(v)) { ! if (p->strings && PyString_CHECK_INTERNED(v)) { ! PyObject *o = PyDict_GetItem(p->strings, v); ! if (o) { ! long w = PyInt_AsLong(o); ! w_byte(TYPE_STRINGREF, p); ! w_long(w, p); ! goto exit; ! } ! else { ! o = PyInt_FromLong(PyDict_Size(p->strings)); ! PyDict_SetItem(p->strings, v, o); ! Py_DECREF(o); ! w_byte(TYPE_INTERNED, p); ! } ! } ! else { ! w_byte(TYPE_STRING, p); ! } n = PyString_GET_SIZE(v); w_long((long)n, p); *************** *** 270,279 **** p->error = 1; } ! p->depth--; } void ! PyMarshal_WriteLongToFile(long x, FILE *fp) { WFILE wf; --- 290,300 ---- p->error = 1; } ! exit: p->depth--; } + /* version currently has no effect for writing longs. */ void ! PyMarshal_WriteLongToFile(long x, FILE *fp, int version) { WFILE wf; *************** *** 281,289 **** wf.error = 0; wf.depth = 0; w_long(x, &wf); } void ! PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp) { WFILE wf; --- 302,311 ---- wf.error = 0; wf.depth = 0; + wf.strings = NULL; w_long(x, &wf); } void ! PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp, int version) { WFILE wf; *************** *** 291,295 **** --- 313,319 ---- wf.error = 0; wf.depth = 0; + wf.strings = (version > 0) ? PyDict_New() : NULL; w_object(x, &wf); + Py_XDECREF(wf.strings); } *************** *** 492,495 **** --- 516,520 ---- #endif + case TYPE_INTERNED: case TYPE_STRING: n = r_long(p); *************** *** 507,510 **** --- 532,545 ---- } } + if (type == TYPE_INTERNED) { + PyString_InternInPlace(&v); + PyList_Append(p->strings, v); + } + return v; + + case TYPE_STRINGREF: + n = r_long(p); + v = PyList_GET_ITEM(p->strings, n); + Py_INCREF(v); return v; *************** *** 674,677 **** --- 709,713 ---- RFILE rf; rf.fp = fp; + rf.strings = NULL; return r_short(&rf); } *************** *** 682,685 **** --- 718,722 ---- RFILE rf; rf.fp = fp; + rf.strings = NULL; return r_long(&rf); } *************** *** 748,753 **** { RFILE rf; rf.fp = fp; ! return read_object(&rf); } --- 785,794 ---- { RFILE rf; + PyObject *result; rf.fp = fp; ! rf.strings = PyList_New(0); ! result = r_object(&rf); ! Py_DECREF(rf.strings); ! return result; } *************** *** 756,767 **** { RFILE rf; rf.fp = NULL; rf.ptr = str; rf.end = str + len; ! return read_object(&rf); } PyObject * ! PyMarshal_WriteObjectToString(PyObject *x) /* wrs_object() */ { WFILE wf; --- 797,812 ---- { RFILE rf; + PyObject *result; rf.fp = NULL; rf.ptr = str; rf.end = str + len; ! rf.strings = PyList_New(0); ! result = r_object(&rf); ! Py_DECREF(rf.strings); ! return result; } PyObject * ! PyMarshal_WriteObjectToString(PyObject *x, int version) { WFILE wf; *************** *** 774,778 **** --- 819,825 ---- wf.error = 0; wf.depth = 0; + wf.strings = (version > 0) ? PyDict_New() : NULL; w_object(x, &wf); + Py_XDECREF(wf.strings); if (wf.str != NULL) _PyString_Resize(&wf.str, *************** *** 797,801 **** PyObject *x; PyObject *f; ! if (!PyArg_ParseTuple(args, "OO:dump", &x, &f)) return NULL; if (!PyFile_Check(f)) { --- 844,849 ---- PyObject *x; PyObject *f; ! int version = Py_MARSHAL_VERSION; ! if (!PyArg_ParseTuple(args, "OO|i:dump", &x, &f, &version)) return NULL; if (!PyFile_Check(f)) { *************** *** 809,813 **** --- 857,863 ---- wf.error = 0; wf.depth = 0; + wf.strings = (version > 0) ? PyDict_New() : 0; w_object(x, &wf); + Py_XDECREF(wf.strings); if (wf.error) { PyErr_SetString(PyExc_ValueError, *************** *** 824,828 **** { RFILE rf; ! PyObject *f; if (!PyArg_ParseTuple(args, "O:load", &f)) return NULL; --- 874,878 ---- { RFILE rf; ! PyObject *f, *result; if (!PyArg_ParseTuple(args, "O:load", &f)) return NULL; *************** *** 833,837 **** } rf.fp = PyFile_AsFile(f); ! return read_object(&rf); } --- 883,890 ---- } rf.fp = PyFile_AsFile(f); ! rf.strings = PyList_New(0); ! result = read_object(&rf); ! Py_DECREF(rf.strings); ! return result; } *************** *** 840,846 **** { PyObject *x; ! if (!PyArg_ParseTuple(args, "O:dumps", &x)) return NULL; ! return PyMarshal_WriteObjectToString(x); } --- 893,900 ---- { PyObject *x; ! int version = Py_MARSHAL_VERSION; ! if (!PyArg_ParseTuple(args, "O|i:dumps", &x, version)) return NULL; ! return PyMarshal_WriteObjectToString(x, version); } *************** *** 851,860 **** char *s; int n; ! if (!PyArg_ParseTuple(args, "s#:loads", &s, &n)) return NULL; rf.fp = NULL; rf.ptr = s; rf.end = s + n; ! return read_object(&rf); } --- 905,918 ---- char *s; int n; ! PyObject* result; ! if (!PyArg_ParseTuple(args, "s#|i:loads", &s, &n)) return NULL; rf.fp = NULL; rf.ptr = s; rf.end = s + n; ! rf.strings = PyList_New(0); ! result = read_object(&rf); ! Py_DECREF(rf.strings); ! return result; } *************** *** 870,873 **** PyMarshal_Init(void) { ! (void) Py_InitModule("marshal", marshal_methods); } --- 928,932 ---- PyMarshal_Init(void) { ! PyObject *mod = Py_InitModule("marshal", marshal_methods); ! PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION); }

1 0

python/dist/src/Include marshal.h,2.13,2.14
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25751/Include Modified Files: marshal.h Log Message: Patch #923098: Share interned strings in marshal. Index: marshal.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/marshal.h,v retrieving revision 2.13 retrieving revision 2.14 diff -C2 -d -r2.13 -r2.14 *** marshal.h 6 Mar 2003 22:04:22 -0000 2.13 --- marshal.h 27 Jun 2004 16:51:45 -0000 2.14 *************** *** 8,14 **** #endif ! PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *); ! PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *); ! PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *); PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *); --- 8,16 ---- #endif ! #define Py_MARSHAL_VERSION 1 ! ! PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int); ! PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int); ! PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int); PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *);

1 0

python/dist/src/Misc NEWS,1.1010,1.1011
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25751/Misc Modified Files: NEWS Log Message: Patch #923098: Share interned strings in marshal. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1010 retrieving revision 1.1011 diff -C2 -d -r1.1010 -r1.1011 *** NEWS 26 Jun 2004 04:03:06 -0000 1.1010 --- NEWS 27 Jun 2004 16:51:46 -0000 1.1011 *************** *** 13,16 **** --- 13,19 ---- ----------------- + - marshal now shares interned strings. This change introduces + a new .pyc magic. + - Bug #966623. classes created with type() in an exec(, {}) don't have a __module__, but code in typeobject assumed it would always

1 0

python/dist/src/Doc/lib libmarshal.tex,1.23,1.24
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25751/Doc/lib Modified Files: libmarshal.tex Log Message: Patch #923098: Share interned strings in marshal. Index: libmarshal.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libmarshal.tex,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** libmarshal.tex 14 May 2003 16:51:46 -0000 1.23 --- libmarshal.tex 27 Jun 2004 16:51:45 -0000 1.24 *************** *** 74,77 **** --- 74,80 ---- will also be written to the file. The object will not be properly read back by \function{load()}. + + \versionadded[The \var{version} argument indicates the data + format that \code{dumps} should use.]{2.4} \end{funcdesc} *************** *** 87,95 **** \end{funcdesc} ! \begin{funcdesc}{dumps}{value} Return the string that would be written to a file by \code{dump(\var{value}, \var{file})}. The value must be a supported type. Raise a \exception{ValueError} exception if value has (or contains an object that has) an unsupported type. \end{funcdesc} --- 90,101 ---- \end{funcdesc} ! \begin{funcdesc}{dumps}{value\optional{, version}} Return the string that would be written to a file by \code{dump(\var{value}, \var{file})}. The value must be a supported type. Raise a \exception{ValueError} exception if value has (or contains an object that has) an unsupported type. + + \versionadded[The \var{version} argument indicates the data + format that \code{dumps} should use.]{2.4} \end{funcdesc} *************** *** 99,100 **** --- 105,116 ---- \exception{TypeError}. Extra characters in the string are ignored. \end{funcdesc} + + In addition, the following constants are defined: + + \begin{datadesc}{version} + Indicates the format that the module uses. Version 0 is the + historical format, version 1 (added in Python 2.4) shares + interned strings. The current version is 1. + + \versionadded{2.4} + \end{datadesc} \ No newline at end of file

1 0

python/dist/src/Doc/api utilities.tex,1.13,1.14
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25751/Doc/api Modified Files: utilities.tex Log Message: Patch #923098: Share interned strings in marshal. Index: utilities.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/utilities.tex,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** utilities.tex 3 Jun 2004 09:55:28 -0000 1.13 --- utilities.tex 27 Jun 2004 16:51:45 -0000 1.14 *************** *** 284,301 **** Numeric values are stored with the least significant byte first. ! \begin{cfuncdesc}{void}{PyMarshal_WriteLongToFile}{long value, FILE *file} Marshal a \ctype{long} integer, \var{value}, to \var{file}. This will only write the least-significant 32 bits of \var{value}; regardless of the size of the native \ctype{long} type. \end{cfuncdesc} \begin{cfuncdesc}{void}{PyMarshal_WriteObjectToFile}{PyObject *value, ! FILE *file} Marshal a Python object, \var{value}, to \var{file}. \end{cfuncdesc} ! \begin{cfuncdesc}{PyObject*}{PyMarshal_WriteObjectToString}{PyObject *value} Return a string object containing the marshalled representation of \var{value}. \end{cfuncdesc} --- 284,312 ---- Numeric values are stored with the least significant byte first. ! The module supports two versions of the data format: version 0 is the ! historical version, version 1 (new in Python 2.4) shares interned ! strings in the file, and upon unmarshalling. \var{Py_MARSHAL_VERSION} ! indicates the current file format (currently 1). ! ! \begin{cfuncdesc}{void}{PyMarshal_WriteLongToFile}{long value, FILE *file, int version} Marshal a \ctype{long} integer, \var{value}, to \var{file}. This will only write the least-significant 32 bits of \var{value}; regardless of the size of the native \ctype{long} type. + + \versionchanged[\var{version} indicates the file format]{2.4} \end{cfuncdesc} \begin{cfuncdesc}{void}{PyMarshal_WriteObjectToFile}{PyObject *value, ! FILE *file, int version} Marshal a Python object, \var{value}, to \var{file}. + + \versionchanged[\var{version} indicates the file format]{2.4} \end{cfuncdesc} ! \begin{cfuncdesc}{PyObject*}{PyMarshal_WriteObjectToString}{PyObject *value, int version} Return a string object containing the marshalled representation of \var{value}. + + \versionchanged[\var{version} indicates the file format]{2.4} \end{cfuncdesc}

1 0

python/dist/src/Objects genobject.c,1.2,1.3
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/Objects Modified Files: genobject.c Log Message: Patch #966493: Cleanup generator/eval_frame exposure. Index: genobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/genobject.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** genobject.c 12 Jun 2004 05:17:55 -0000 1.2 --- genobject.c 27 Jun 2004 15:43:12 -0000 1.3 *************** *** 45,49 **** gen->gi_running = 1; ! result = PyEval_EvaluateFrame((PyObject *)f); gen->gi_running = 0; --- 45,49 ---- gen->gi_running = 1; ! result = PyEval_EvalFrame(f); gen->gi_running = 0;

1 0

python/dist/src/Include Python.h, 2.63, 2.64 ceval.h, 2.51, 2.52 genobject.h, 2.1, 2.2
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/Include Modified Files: Python.h ceval.h genobject.h Log Message: Patch #966493: Cleanup generator/eval_frame exposure. Index: Python.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v retrieving revision 2.63 retrieving revision 2.64 diff -C2 -d -r2.63 -r2.64 *** Python.h 8 Jun 2004 18:52:41 -0000 2.63 --- Python.h 27 Jun 2004 15:43:12 -0000 2.64 *************** *** 100,103 **** --- 100,104 ---- #include "cellobject.h" #include "iterobject.h" + #include "genobject.h" #include "descrobject.h" #include "weakrefobject.h" Index: ceval.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/ceval.h,v retrieving revision 2.51 retrieving revision 2.52 diff -C2 -d -r2.51 -r2.52 *** ceval.h 1 Jun 2004 15:22:40 -0000 2.51 --- ceval.h 27 Jun 2004 15:43:12 -0000 2.52 *************** *** 65,69 **** PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); ! PyAPI_FUNC(PyObject *) PyEval_EvaluateFrame(PyObject *); /* this used to be handled on a per-thread basis - now just two globals */ --- 65,69 ---- PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); ! PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); /* this used to be handled on a per-thread basis - now just two globals */ Index: genobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/genobject.h,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** genobject.h 1 Jun 2004 15:22:40 -0000 2.1 --- genobject.h 27 Jun 2004 15:43:12 -0000 2.2 *************** *** 8,16 **** #endif typedef struct { PyObject_HEAD /* The gi_ prefix is intended to remind of generator-iterator. */ ! PyFrameObject *gi_frame; /* True if generator is being executed. */ --- 8,18 ---- #endif + struct _frame; /* Avoid including frameobject.h */ + typedef struct { PyObject_HEAD /* The gi_ prefix is intended to remind of generator-iterator. */ ! struct _frame *gi_frame; /* True if generator is being executed. */ *************** *** 26,30 **** #define PyGen_CheckExact(op) ((op)->ob_type == &PyGen_Type) ! PyAPI_FUNC(PyObject *) PyGen_New(PyFrameObject *); #ifdef __cplusplus --- 28,32 ---- #define PyGen_CheckExact(op) ((op)->ob_type == &PyGen_Type) ! PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *); #ifdef __cplusplus

1 0

python/dist/src/Python ceval.c,2.406,2.407
by loewis＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/Python Modified Files: ceval.c Log Message: Patch #966493: Cleanup generator/eval_frame exposure. Index: ceval.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v retrieving revision 2.406 retrieving revision 2.407 diff -C2 -d -r2.406 -r2.407 *** ceval.c 26 Jun 2004 04:34:33 -0000 2.406 --- ceval.c 27 Jun 2004 15:43:12 -0000 2.407 *************** *** 11,15 **** #include "compile.h" #include "frameobject.h" - #include "genobject.h" #include "eval.h" #include "opcode.h" --- 11,14 ---- *************** *** 50,54 **** /* Forward declarations */ - static PyObject *eval_frame(PyFrameObject *); #ifdef WITH_TSC static PyObject *call_function(PyObject ***, int, uint64*, uint64*); --- 49,52 ---- *************** *** 459,464 **** /* Interpreter main loop */ ! static PyObject * ! eval_frame(PyFrameObject *f) { #ifdef DXPAIRS --- 457,462 ---- /* Interpreter main loop */ ! PyObject * ! PyEval_EvalFrame(PyFrameObject *f) { #ifdef DXPAIRS *************** *** 2456,2461 **** /* this is gonna seem *real weird*, but if you put some other code between ! eval_frame() and PyEval_EvalCodeEx() you will need to adjust the test in ! the if statement in Misc/gdbinit:ppystack */ PyObject * --- 2454,2459 ---- /* this is gonna seem *real weird*, but if you put some other code between ! PyEval_EvalFrame() and PyEval_EvalCodeEx() you will need to adjust ! the test in the if statement in Misc/gdbinit:ppystack */ PyObject * *************** *** 2685,2689 **** } ! retval = eval_frame(f); fail: /* Jump here from prelude on failure */ --- 2683,2687 ---- } ! retval = PyEval_EvalFrame(f); fail: /* Jump here from prelude on failure */ *************** *** 3416,3425 **** } - PyObject * - PyEval_EvaluateFrame(PyObject *fo) - { - return eval_frame((PyFrameObject *)fo); - } - #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER)) --- 3414,3417 ---- *************** *** 3598,3602 **** fastlocals[i] = *stack++; } ! retval = eval_frame(f); assert(tstate != NULL); ++tstate->recursion_depth; --- 3590,3594 ---- fastlocals[i] = *stack++; } ! retval = PyEval_EvalFrame(f); assert(tstate != NULL); ++tstate->recursion_depth;

1 0