Mercurial > cpython-lru_cache-weakref
view Python/mysnprintf.c @ 20517:d51fe520e5fd legacy-trunk
Fix for SF bug [ #471928 ] global made w/nested list comprehensions
The symbol table pass didn't have an explicit case for the list_iter
node which is used only for a nested list comprehension. As a result,
the target of the list comprehension was treated as a use instead of
an assignment. Fix is to add a case to symtable_node() to handle
list_iter.
Also, rework and document a couple of the subtler implementation
issues in the symbol table pass. The symtable_node() switch statement
depends on falling through the last several cases, in order to handle
some of the more complicated nodes like atom. Add a comment
explaining the behavior before the first fall through case. Add a
comment /* fall through */ at the end of case so that it is explicitly
marked as such.
Move the for_stmt case out of the fall through logic, which simplifies
both for_stmt and default. (The default used the local variable start
to skip the first three nodes of a for_stmt when it fell through.)
Rename the flag argument to symtable_assign() to def_flag and add a
comment explaining its use:
The third argument to symatble_assign() is a flag to be passed to
symtable_add_def() if it is eventually called. The flag is useful
to specify the particular type of assignment that should be
recorded, e.g. an assignment caused by import.
| author | Jeremy Hylton <jeremy@alum.mit.edu> |
|---|---|
| date | Thu, 18 Oct 2001 16:15:10 +0000 |
| parents | 2bc648932d44 |
| children | 6b6a9cae256e |
line wrap: on
line source
#include "Python.h" /* snprintf() emulation for platforms which don't have it (yet). Return value The number of characters printed (not including the trailing `\0' used to end output to strings) or a negative number in case of an error. PyOS_snprintf and PyOS_vsnprintf do not write more than size bytes (including the trailing '\0'). If the output would have been truncated, they return the number of characters (excluding the trailing '\0') which would have been written to the final string if enough space had been available. This is inline with the C99 standard. */ #include <ctype.h> #ifndef HAVE_SNPRINTF static int myvsnprintf(char *str, size_t size, const char *format, va_list va) { char *buffer = PyMem_Malloc(size + 512); int len; if (buffer == NULL) return -1; len = vsprintf(buffer, format, va); if (len < 0) { PyMem_Free(buffer); return len; } len++; assert(len >= 0); if ((size_t)len > size + 512) Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf"); if ((size_t)len > size) { PyMem_Free(buffer); return len - 1; } memcpy(str, buffer, len); PyMem_Free(buffer); return len - 1; } int PyOS_snprintf(char *str, size_t size, const char *format, ...) { int rc; va_list va; va_start(va, format); rc = myvsnprintf(str, size, format, va); va_end(va); return rc; } int PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) { return myvsnprintf(str, size, format, va); } #else /* Make sure that a C API is included in the lib */ #ifdef PyOS_snprintf # undef PyOS_snprintf #endif int PyOS_snprintf(char *str, size_t size, const char *format, ...) { int rc; va_list va; va_start(va, format); rc = vsnprintf(str, size, format, va); va_end(va); return rc; } #ifdef PyOS_vsnprintf # undef PyOS_vsnprintf #endif int PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) { return vsnprintf(str, size, format, va); } #endif
