mirror of
https://github.com/python/cpython.git
synced 2025-07-14 14:55:17 +00:00

which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
1424 lines
37 KiB
C
1424 lines
37 KiB
C
#include "Python.h"
|
|
#include "Python-ast.h"
|
|
#include "code.h"
|
|
#include "symtable.h"
|
|
#include "structmember.h"
|
|
|
|
/* error strings used for warnings */
|
|
#define GLOBAL_AFTER_ASSIGN \
|
|
"name '%.400s' is assigned to before global declaration"
|
|
|
|
#define GLOBAL_AFTER_USE \
|
|
"name '%.400s' is used prior to global declaration"
|
|
|
|
#define IMPORT_STAR_WARNING "import * only allowed at module level"
|
|
|
|
#define RETURN_VAL_IN_GENERATOR \
|
|
"'return' with argument inside generator"
|
|
|
|
/* XXX(nnorwitz): change name since static? */
|
|
static PySTEntryObject *
|
|
PySTEntry_New(struct symtable *st, identifier name, _Py_block_ty block,
|
|
void *key, int lineno)
|
|
{
|
|
PySTEntryObject *ste = NULL;
|
|
PyObject *k;
|
|
|
|
k = PyLong_FromVoidPtr(key);
|
|
if (k == NULL)
|
|
goto fail;
|
|
ste = (PySTEntryObject *)PyObject_New(PySTEntryObject,
|
|
&PySTEntry_Type);
|
|
ste->ste_table = st;
|
|
ste->ste_id = k;
|
|
ste->ste_tmpname = 0;
|
|
|
|
ste->ste_name = name;
|
|
Py_INCREF(name);
|
|
|
|
ste->ste_symbols = NULL;
|
|
ste->ste_varnames = NULL;
|
|
ste->ste_children = NULL;
|
|
|
|
ste->ste_symbols = PyDict_New();
|
|
if (ste->ste_symbols == NULL)
|
|
goto fail;
|
|
|
|
ste->ste_varnames = PyList_New(0);
|
|
if (ste->ste_varnames == NULL)
|
|
goto fail;
|
|
|
|
ste->ste_children = PyList_New(0);
|
|
if (ste->ste_children == NULL)
|
|
goto fail;
|
|
|
|
ste->ste_type = block;
|
|
ste->ste_unoptimized = 0;
|
|
ste->ste_nested = 0;
|
|
ste->ste_free = 0;
|
|
ste->ste_varargs = 0;
|
|
ste->ste_varkeywords = 0;
|
|
ste->ste_opt_lineno = 0;
|
|
ste->ste_tmpname = 0;
|
|
ste->ste_lineno = lineno;
|
|
|
|
if (st->st_cur != NULL &&
|
|
(st->st_cur->ste_nested ||
|
|
st->st_cur->ste_type == FunctionBlock))
|
|
ste->ste_nested = 1;
|
|
ste->ste_child_free = 0;
|
|
ste->ste_generator = 0;
|
|
ste->ste_returns_value = 0;
|
|
|
|
if (PyDict_SetItem(st->st_symbols, ste->ste_id, (PyObject *)ste) < 0)
|
|
goto fail;
|
|
|
|
return ste;
|
|
fail:
|
|
Py_XDECREF(ste);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
ste_repr(PySTEntryObject *ste)
|
|
{
|
|
char buf[256];
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"<symtable entry %.100s(%ld), line %d>",
|
|
PyString_AS_STRING(ste->ste_name),
|
|
PyInt_AS_LONG(ste->ste_id), ste->ste_lineno);
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
static void
|
|
ste_dealloc(PySTEntryObject *ste)
|
|
{
|
|
ste->ste_table = NULL;
|
|
Py_XDECREF(ste->ste_id);
|
|
Py_XDECREF(ste->ste_name);
|
|
Py_XDECREF(ste->ste_symbols);
|
|
Py_XDECREF(ste->ste_varnames);
|
|
Py_XDECREF(ste->ste_children);
|
|
PyObject_Del(ste);
|
|
}
|
|
|
|
#define OFF(x) offsetof(PySTEntryObject, x)
|
|
|
|
static PyMemberDef ste_memberlist[] = {
|
|
{"id", T_OBJECT, OFF(ste_id), READONLY},
|
|
{"name", T_OBJECT, OFF(ste_name), READONLY},
|
|
{"symbols", T_OBJECT, OFF(ste_symbols), READONLY},
|
|
{"varnames", T_OBJECT, OFF(ste_varnames), READONLY},
|
|
{"children", T_OBJECT, OFF(ste_children), READONLY},
|
|
{"type", T_INT, OFF(ste_type), READONLY},
|
|
{"lineno", T_INT, OFF(ste_lineno), READONLY},
|
|
{NULL}
|
|
};
|
|
|
|
PyTypeObject PySTEntry_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"symtable entry",
|
|
sizeof(PySTEntryObject),
|
|
0,
|
|
(destructor)ste_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)ste_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
ste_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 */
|
|
0, /* tp_new */
|
|
};
|
|
|
|
static int symtable_analyze(struct symtable *st);
|
|
static int symtable_warn(struct symtable *st, char *msg, int lineno);
|
|
static int symtable_enter_block(struct symtable *st, identifier name,
|
|
_Py_block_ty block, void *ast, int lineno);
|
|
static int symtable_exit_block(struct symtable *st, void *ast);
|
|
static int symtable_visit_stmt(struct symtable *st, stmt_ty s);
|
|
static int symtable_visit_expr(struct symtable *st, expr_ty s);
|
|
static int symtable_visit_genexp(struct symtable *st, expr_ty s);
|
|
static int symtable_visit_arguments(struct symtable *st, arguments_ty);
|
|
static int symtable_visit_excepthandler(struct symtable *st, excepthandler_ty);
|
|
static int symtable_visit_alias(struct symtable *st, alias_ty);
|
|
static int symtable_visit_comprehension(struct symtable *st, comprehension_ty);
|
|
static int symtable_visit_keyword(struct symtable *st, keyword_ty);
|
|
static int symtable_visit_slice(struct symtable *st, slice_ty);
|
|
static int symtable_visit_params(struct symtable *st, asdl_seq *args, int top);
|
|
static int symtable_visit_params_nested(struct symtable *st, asdl_seq *args);
|
|
static int symtable_implicit_arg(struct symtable *st, int pos);
|
|
|
|
|
|
static identifier top = NULL, lambda = NULL, genexpr = NULL;
|
|
|
|
#define GET_IDENTIFIER(VAR) \
|
|
((VAR) ? (VAR) : ((VAR) = PyString_InternFromString(# VAR)))
|
|
|
|
#define DUPLICATE_ARGUMENT \
|
|
"duplicate argument '%s' in function definition"
|
|
|
|
static struct symtable *
|
|
symtable_new(void)
|
|
{
|
|
struct symtable *st;
|
|
|
|
st = (struct symtable *)PyMem_Malloc(sizeof(struct symtable));
|
|
if (st == NULL)
|
|
return NULL;
|
|
|
|
st->st_filename = NULL;
|
|
st->st_symbols = NULL;
|
|
|
|
if ((st->st_stack = PyList_New(0)) == NULL)
|
|
goto fail;
|
|
if ((st->st_symbols = PyDict_New()) == NULL)
|
|
goto fail;
|
|
st->st_cur = NULL;
|
|
st->st_tmpname = 0;
|
|
st->st_private = NULL;
|
|
return st;
|
|
fail:
|
|
PySymtable_Free(st);
|
|
return NULL;
|
|
}
|
|
|
|
struct symtable *
|
|
PySymtable_Build(mod_ty mod, const char *filename, PyFutureFeatures *future)
|
|
{
|
|
struct symtable *st = symtable_new();
|
|
asdl_seq *seq;
|
|
int i;
|
|
|
|
if (st == NULL)
|
|
return st;
|
|
st->st_filename = filename;
|
|
st->st_future = future;
|
|
if (!GET_IDENTIFIER(top) ||
|
|
!symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0)) {
|
|
PySymtable_Free(st);
|
|
return NULL;
|
|
}
|
|
|
|
st->st_top = st->st_cur;
|
|
st->st_cur->ste_unoptimized = OPT_TOPLEVEL;
|
|
/* Any other top-level initialization? */
|
|
switch (mod->kind) {
|
|
case Module_kind:
|
|
seq = mod->v.Module.body;
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++)
|
|
if (!symtable_visit_stmt(st,
|
|
(stmt_ty)asdl_seq_GET(seq, i)))
|
|
goto error;
|
|
break;
|
|
case Expression_kind:
|
|
if (!symtable_visit_expr(st, mod->v.Expression.body))
|
|
goto error;
|
|
break;
|
|
case Interactive_kind:
|
|
seq = mod->v.Interactive.body;
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++)
|
|
if (!symtable_visit_stmt(st,
|
|
(stmt_ty)asdl_seq_GET(seq, i)))
|
|
goto error;
|
|
break;
|
|
case Suite_kind:
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"this compiler does not handle Suites");
|
|
goto error;
|
|
}
|
|
if (!symtable_exit_block(st, (void *)mod)) {
|
|
PySymtable_Free(st);
|
|
return NULL;
|
|
}
|
|
if (symtable_analyze(st))
|
|
return st;
|
|
PySymtable_Free(st);
|
|
return NULL;
|
|
error:
|
|
(void) symtable_exit_block(st, (void *)mod);
|
|
PySymtable_Free(st);
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
PySymtable_Free(struct symtable *st)
|
|
{
|
|
Py_XDECREF(st->st_symbols);
|
|
Py_XDECREF(st->st_stack);
|
|
PyMem_Free((void *)st);
|
|
}
|
|
|
|
PySTEntryObject *
|
|
PySymtable_Lookup(struct symtable *st, void *key)
|
|
{
|
|
PyObject *k, *v;
|
|
|
|
k = PyLong_FromVoidPtr(key);
|
|
if (k == NULL)
|
|
return NULL;
|
|
v = PyDict_GetItem(st->st_symbols, k);
|
|
if (v) {
|
|
assert(PySTEntry_Check(v));
|
|
Py_INCREF(v);
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_KeyError,
|
|
"unknown symbol table entry");
|
|
}
|
|
|
|
Py_DECREF(k);
|
|
return (PySTEntryObject *)v;
|
|
}
|
|
|
|
int
|
|
PyST_GetScope(PySTEntryObject *ste, PyObject *name)
|
|
{
|
|
PyObject *v = PyDict_GetItem(ste->ste_symbols, name);
|
|
if (!v)
|
|
return 0;
|
|
assert(PyInt_Check(v));
|
|
return (PyInt_AS_LONG(v) >> SCOPE_OFF) & SCOPE_MASK;
|
|
}
|
|
|
|
|
|
/* Analyze raw symbol information to determine scope of each name.
|
|
|
|
The next several functions are helpers for PySymtable_Analyze(),
|
|
which determines whether a name is local, global, or free. In addition,
|
|
it determines which local variables are cell variables; they provide
|
|
bindings that are used for free variables in enclosed blocks.
|
|
|
|
There are also two kinds of free variables, implicit and explicit. An
|
|
explicit global is declared with the global statement. An implicit
|
|
global is a free variable for which the compiler has found no binding
|
|
in an enclosing function scope. The implicit global is either a global
|
|
or a builtin. Python's module and class blocks use the xxx_NAME opcodes
|
|
to handle these names to implement slightly odd semantics. In such a
|
|
block, the name is treated as global until it is assigned to; then it
|
|
is treated as a local.
|
|
|
|
The symbol table requires two passes to determine the scope of each name.
|
|
The first pass collects raw facts from the AST: the name is a parameter
|
|
here, the name is used by not defined here, etc. The second pass analyzes
|
|
these facts during a pass over the PySTEntryObjects created during pass 1.
|
|
|
|
When a function is entered during the second pass, the parent passes
|
|
the set of all name bindings visible to its children. These bindings
|
|
are used to determine if the variable is free or an implicit global.
|
|
After doing the local analysis, it analyzes each of its child blocks
|
|
using an updated set of name bindings.
|
|
|
|
The children update the free variable set. If a local variable is free
|
|
in a child, the variable is marked as a cell. The current function must
|
|
provide runtime storage for the variable that may outlive the function's
|
|
frame. Cell variables are removed from the free set before the analyze
|
|
function returns to its parent.
|
|
|
|
The sets of bound and free variables are implemented as dictionaries
|
|
mapping strings to None.
|
|
*/
|
|
|
|
#define SET_SCOPE(DICT, NAME, I) { \
|
|
PyObject *o = PyInt_FromLong(I); \
|
|
if (!o) \
|
|
return 0; \
|
|
if (PyDict_SetItem((DICT), (NAME), o) < 0) { \
|
|
Py_DECREF(o); \
|
|
return 0; \
|
|
} \
|
|
Py_DECREF(o); \
|
|
}
|
|
|
|
/* Decide on scope of name, given flags.
|
|
|
|
The dicts passed in as arguments are modified as necessary.
|
|
ste is passed so that flags can be updated.
|
|
*/
|
|
|
|
static int
|
|
analyze_name(PySTEntryObject *ste, PyObject *dict, PyObject *name, long flags,
|
|
PyObject *bound, PyObject *local, PyObject *free,
|
|
PyObject *global)
|
|
{
|
|
if (flags & DEF_GLOBAL) {
|
|
if (flags & DEF_PARAM) {
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
"name '%s' is local and global",
|
|
PyString_AS_STRING(name));
|
|
return 0;
|
|
}
|
|
SET_SCOPE(dict, name, GLOBAL_EXPLICIT);
|
|
if (PyDict_SetItem(global, name, Py_None) < 0)
|
|
return 0;
|
|
if (bound && PyDict_GetItem(bound, name)) {
|
|
if (PyDict_DelItem(bound, name) < 0)
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
if (flags & DEF_BOUND) {
|
|
SET_SCOPE(dict, name, LOCAL);
|
|
if (PyDict_SetItem(local, name, Py_None) < 0)
|
|
return 0;
|
|
if (PyDict_GetItem(global, name)) {
|
|
if (PyDict_DelItem(global, name) < 0)
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
/* If an enclosing block has a binding for this name, it
|
|
is a free variable rather than a global variable.
|
|
Note that having a non-NULL bound implies that the block
|
|
is nested.
|
|
*/
|
|
if (bound && PyDict_GetItem(bound, name)) {
|
|
SET_SCOPE(dict, name, FREE);
|
|
ste->ste_free = 1;
|
|
if (PyDict_SetItem(free, name, Py_None) < 0)
|
|
return 0;
|
|
return 1;
|
|
}
|
|
/* If a parent has a global statement, then call it global
|
|
explicit? It could also be global implicit.
|
|
*/
|
|
else if (global && PyDict_GetItem(global, name)) {
|
|
SET_SCOPE(dict, name, GLOBAL_EXPLICIT);
|
|
return 1;
|
|
}
|
|
else {
|
|
if (ste->ste_nested)
|
|
ste->ste_free = 1;
|
|
SET_SCOPE(dict, name, GLOBAL_IMPLICIT);
|
|
return 1;
|
|
}
|
|
return 0; /* Can't get here */
|
|
}
|
|
|
|
#undef SET_SCOPE
|
|
|
|
/* If a name is defined in free and also in locals, then this block
|
|
provides the binding for the free variable. The name should be
|
|
marked CELL in this block and removed from the free list.
|
|
|
|
Note that the current block's free variables are included in free.
|
|
That's safe because no name can be free and local in the same scope.
|
|
*/
|
|
|
|
static int
|
|
analyze_cells(PyObject *scope, PyObject *free)
|
|
{
|
|
PyObject *name, *v, *w;
|
|
int success = 0;
|
|
Py_ssize_t pos = 0;
|
|
|
|
w = PyInt_FromLong(CELL);
|
|
if (!w)
|
|
return 0;
|
|
while (PyDict_Next(scope, &pos, &name, &v)) {
|
|
long flags;
|
|
assert(PyInt_Check(v));
|
|
flags = PyInt_AS_LONG(v);
|
|
if (flags != LOCAL)
|
|
continue;
|
|
if (!PyDict_GetItem(free, name))
|
|
continue;
|
|
/* Replace LOCAL with CELL for this name, and remove
|
|
from free. It is safe to replace the value of name
|
|
in the dict, because it will not cause a resize.
|
|
*/
|
|
if (PyDict_SetItem(scope, name, w) < 0)
|
|
goto error;
|
|
if (!PyDict_DelItem(free, name) < 0)
|
|
goto error;
|
|
}
|
|
success = 1;
|
|
error:
|
|
Py_DECREF(w);
|
|
return success;
|
|
}
|
|
|
|
/* Check for illegal statements in unoptimized namespaces */
|
|
static int
|
|
check_unoptimized(const PySTEntryObject* ste) {
|
|
char buf[300];
|
|
const char* trailer;
|
|
|
|
if (ste->ste_type != FunctionBlock || !ste->ste_unoptimized
|
|
|| !(ste->ste_free || ste->ste_child_free))
|
|
return 1;
|
|
|
|
trailer = (ste->ste_child_free ?
|
|
"contains a nested function with free variables" :
|
|
"is a nested function");
|
|
|
|
switch (ste->ste_unoptimized) {
|
|
case OPT_TOPLEVEL: /* exec / import * at top-level is fine */
|
|
case OPT_EXEC: /* qualified exec is fine */
|
|
return 1;
|
|
case OPT_IMPORT_STAR:
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"import * is not allowed in function '%.100s' "
|
|
"because it is %s",
|
|
PyString_AS_STRING(ste->ste_name), trailer);
|
|
break;
|
|
case OPT_BARE_EXEC:
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"unqualified exec is not allowed in function "
|
|
"'%.100s' it %s",
|
|
PyString_AS_STRING(ste->ste_name), trailer);
|
|
break;
|
|
default:
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"function '%.100s' uses import * and bare exec, "
|
|
"which are illegal because it %s",
|
|
PyString_AS_STRING(ste->ste_name), trailer);
|
|
break;
|
|
}
|
|
|
|
PyErr_SetString(PyExc_SyntaxError, buf);
|
|
PyErr_SyntaxLocation(ste->ste_table->st_filename,
|
|
ste->ste_opt_lineno);
|
|
return 0;
|
|
}
|
|
|
|
/* Enter the final scope information into the st_symbols dict.
|
|
*
|
|
* All arguments are dicts. Modifies symbols, others are read-only.
|
|
*/
|
|
static int
|
|
update_symbols(PyObject *symbols, PyObject *scope,
|
|
PyObject *bound, PyObject *free, int classflag)
|
|
{
|
|
PyObject *name, *v, *u, *w, *free_value = NULL;
|
|
Py_ssize_t pos = 0;
|
|
|
|
while (PyDict_Next(symbols, &pos, &name, &v)) {
|
|
long i, flags;
|
|
assert(PyInt_Check(v));
|
|
flags = PyInt_AS_LONG(v);
|
|
w = PyDict_GetItem(scope, name);
|
|
assert(w && PyInt_Check(w));
|
|
i = PyInt_AS_LONG(w);
|
|
flags |= (i << SCOPE_OFF);
|
|
u = PyInt_FromLong(flags);
|
|
if (!u)
|
|
return 0;
|
|
if (PyDict_SetItem(symbols, name, u) < 0) {
|
|
Py_DECREF(u);
|
|
return 0;
|
|
}
|
|
Py_DECREF(u);
|
|
}
|
|
|
|
free_value = PyInt_FromLong(FREE << SCOPE_OFF);
|
|
if (!free_value)
|
|
return 0;
|
|
|
|
/* add a free variable when it's only use is for creating a closure */
|
|
pos = 0;
|
|
while (PyDict_Next(free, &pos, &name, &v)) {
|
|
PyObject *o = PyDict_GetItem(symbols, name);
|
|
|
|
if (o) {
|
|
/* It could be a free variable in a method of
|
|
the class that has the same name as a local
|
|
or global in the class scope.
|
|
*/
|
|
if (classflag &&
|
|
PyInt_AS_LONG(o) & (DEF_BOUND | DEF_GLOBAL)) {
|
|
long i = PyInt_AS_LONG(o) | DEF_FREE_CLASS;
|
|
o = PyInt_FromLong(i);
|
|
if (!o) {
|
|
Py_DECREF(free_value);
|
|
return 0;
|
|
}
|
|
if (PyDict_SetItem(symbols, name, o) < 0) {
|
|
Py_DECREF(o);
|
|
Py_DECREF(free_value);
|
|
return 0;
|
|
}
|
|
Py_DECREF(o);
|
|
}
|
|
/* else it's not free, probably a cell */
|
|
continue;
|
|
}
|
|
if (!PyDict_GetItem(bound, name))
|
|
continue; /* it's a global */
|
|
|
|
if (PyDict_SetItem(symbols, name, free_value) < 0) {
|
|
Py_DECREF(free_value);
|
|
return 0;
|
|
}
|
|
}
|
|
Py_DECREF(free_value);
|
|
return 1;
|
|
}
|
|
|
|
/* Make final symbol table decisions for block of ste.
|
|
Arguments:
|
|
ste -- current symtable entry (input/output)
|
|
bound -- set of variables bound in enclosing scopes (input)
|
|
free -- set of free variables in enclosed scopes (output)
|
|
globals -- set of declared global variables in enclosing scopes (input)
|
|
*/
|
|
|
|
static int
|
|
analyze_block(PySTEntryObject *ste, PyObject *bound, PyObject *free,
|
|
PyObject *global)
|
|
{
|
|
PyObject *name, *v, *local = NULL, *scope = NULL, *newbound = NULL;
|
|
PyObject *newglobal = NULL, *newfree = NULL;
|
|
int i, success = 0;
|
|
Py_ssize_t pos = 0;
|
|
|
|
local = PyDict_New();
|
|
if (!local)
|
|
goto error;
|
|
scope = PyDict_New();
|
|
if (!scope)
|
|
goto error;
|
|
newglobal = PyDict_New();
|
|
if (!newglobal)
|
|
goto error;
|
|
newfree = PyDict_New();
|
|
if (!newfree)
|
|
goto error;
|
|
newbound = PyDict_New();
|
|
if (!newbound)
|
|
goto error;
|
|
|
|
if (ste->ste_type == ClassBlock) {
|
|
/* make a copy of globals before calling analyze_name(),
|
|
because global statements in the class have no effect
|
|
on nested functions.
|
|
*/
|
|
if (PyDict_Update(newglobal, global) < 0)
|
|
goto error;
|
|
if (bound)
|
|
if (PyDict_Update(newbound, bound) < 0)
|
|
goto error;
|
|
}
|
|
|
|
assert(PySTEntry_Check(ste));
|
|
assert(PyDict_Check(ste->ste_symbols));
|
|
while (PyDict_Next(ste->ste_symbols, &pos, &name, &v)) {
|
|
long flags = PyInt_AS_LONG(v);
|
|
if (!analyze_name(ste, scope, name, flags, bound, local, free,
|
|
global))
|
|
goto error;
|
|
}
|
|
|
|
if (ste->ste_type != ClassBlock) {
|
|
if (ste->ste_type == FunctionBlock) {
|
|
if (PyDict_Update(newbound, local) < 0)
|
|
goto error;
|
|
}
|
|
if (bound) {
|
|
if (PyDict_Update(newbound, bound) < 0)
|
|
goto error;
|
|
}
|
|
if (PyDict_Update(newglobal, global) < 0)
|
|
goto error;
|
|
}
|
|
|
|
/* Recursively call analyze_block() on each child block */
|
|
for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
|
|
PyObject *c = PyList_GET_ITEM(ste->ste_children, i);
|
|
PySTEntryObject* entry;
|
|
assert(c && PySTEntry_Check(c));
|
|
entry = (PySTEntryObject*)c;
|
|
if (!analyze_block(entry, newbound, newfree, newglobal))
|
|
goto error;
|
|
if (entry->ste_free || entry->ste_child_free)
|
|
ste->ste_child_free = 1;
|
|
}
|
|
|
|
if (ste->ste_type == FunctionBlock && !analyze_cells(scope, newfree))
|
|
goto error;
|
|
if (!update_symbols(ste->ste_symbols, scope, bound, newfree,
|
|
ste->ste_type == ClassBlock))
|
|
goto error;
|
|
if (!check_unoptimized(ste))
|
|
goto error;
|
|
|
|
if (PyDict_Update(free, newfree) < 0)
|
|
goto error;
|
|
success = 1;
|
|
error:
|
|
Py_XDECREF(local);
|
|
Py_XDECREF(scope);
|
|
Py_XDECREF(newbound);
|
|
Py_XDECREF(newglobal);
|
|
Py_XDECREF(newfree);
|
|
if (!success)
|
|
assert(PyErr_Occurred());
|
|
return success;
|
|
}
|
|
|
|
static int
|
|
symtable_analyze(struct symtable *st)
|
|
{
|
|
PyObject *free, *global;
|
|
int r;
|
|
|
|
free = PyDict_New();
|
|
if (!free)
|
|
return 0;
|
|
global = PyDict_New();
|
|
if (!global) {
|
|
Py_DECREF(free);
|
|
return 0;
|
|
}
|
|
r = analyze_block(st->st_top, NULL, free, global);
|
|
Py_DECREF(free);
|
|
Py_DECREF(global);
|
|
return r;
|
|
}
|
|
|
|
|
|
static int
|
|
symtable_warn(struct symtable *st, char *msg, int lineno)
|
|
{
|
|
if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, st->st_filename,
|
|
lineno, NULL, NULL) < 0) {
|
|
if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
|
|
PyErr_SetString(PyExc_SyntaxError, msg);
|
|
PyErr_SyntaxLocation(st->st_filename,
|
|
st->st_cur->ste_lineno);
|
|
}
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
/* symtable_enter_block() gets a reference via PySTEntry_New().
|
|
This reference is released when the block is exited, via the DECREF
|
|
in symtable_exit_block().
|
|
*/
|
|
|
|
static int
|
|
symtable_exit_block(struct symtable *st, void *ast)
|
|
{
|
|
Py_ssize_t end;
|
|
|
|
Py_CLEAR(st->st_cur);
|
|
end = PyList_GET_SIZE(st->st_stack) - 1;
|
|
if (end >= 0) {
|
|
st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack,
|
|
end);
|
|
if (st->st_cur == NULL)
|
|
return 0;
|
|
Py_INCREF(st->st_cur);
|
|
if (PySequence_DelItem(st->st_stack, end) < 0)
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
|
|
void *ast, int lineno)
|
|
{
|
|
PySTEntryObject *prev = NULL;
|
|
|
|
if (st->st_cur) {
|
|
prev = st->st_cur;
|
|
if (PyList_Append(st->st_stack, (PyObject *)st->st_cur) < 0) {
|
|
return 0;
|
|
}
|
|
Py_DECREF(st->st_cur);
|
|
}
|
|
st->st_cur = PySTEntry_New(st, name, block, ast, lineno);
|
|
if (st->st_cur == NULL)
|
|
return 0;
|
|
if (name == GET_IDENTIFIER(top))
|
|
st->st_global = st->st_cur->ste_symbols;
|
|
if (prev) {
|
|
if (PyList_Append(prev->ste_children,
|
|
(PyObject *)st->st_cur) < 0) {
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static long
|
|
symtable_lookup(struct symtable *st, PyObject *name)
|
|
{
|
|
PyObject *o;
|
|
PyObject *mangled = _Py_Mangle(st->st_private, name);
|
|
if (!mangled)
|
|
return 0;
|
|
o = PyDict_GetItem(st->st_cur->ste_symbols, mangled);
|
|
Py_DECREF(mangled);
|
|
if (!o)
|
|
return 0;
|
|
return PyInt_AsLong(o);
|
|
}
|
|
|
|
static int
|
|
symtable_add_def(struct symtable *st, PyObject *name, int flag)
|
|
{
|
|
PyObject *o;
|
|
PyObject *dict;
|
|
long val;
|
|
PyObject *mangled = _Py_Mangle(st->st_private, name);
|
|
|
|
if (!mangled)
|
|
return 0;
|
|
dict = st->st_cur->ste_symbols;
|
|
if ((o = PyDict_GetItem(dict, mangled))) {
|
|
val = PyInt_AS_LONG(o);
|
|
if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
|
|
/* Is it better to use 'mangled' or 'name' here? */
|
|
PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT,
|
|
PyString_AsString(name));
|
|
PyErr_SyntaxLocation(st->st_filename,
|
|
st->st_cur->ste_lineno);
|
|
goto error;
|
|
}
|
|
val |= flag;
|
|
} else
|
|
val = flag;
|
|
o = PyInt_FromLong(val);
|
|
if (o == NULL)
|
|
goto error;
|
|
if (PyDict_SetItem(dict, mangled, o) < 0) {
|
|
Py_DECREF(o);
|
|
goto error;
|
|
}
|
|
Py_DECREF(o);
|
|
|
|
if (flag & DEF_PARAM) {
|
|
if (PyList_Append(st->st_cur->ste_varnames, mangled) < 0)
|
|
goto error;
|
|
} else if (flag & DEF_GLOBAL) {
|
|
/* XXX need to update DEF_GLOBAL for other flags too;
|
|
perhaps only DEF_FREE_GLOBAL */
|
|
val = flag;
|
|
if ((o = PyDict_GetItem(st->st_global, mangled))) {
|
|
val |= PyInt_AS_LONG(o);
|
|
}
|
|
o = PyInt_FromLong(val);
|
|
if (o == NULL)
|
|
goto error;
|
|
if (PyDict_SetItem(st->st_global, mangled, o) < 0) {
|
|
Py_DECREF(o);
|
|
goto error;
|
|
}
|
|
Py_DECREF(o);
|
|
}
|
|
Py_DECREF(mangled);
|
|
return 1;
|
|
|
|
error:
|
|
Py_DECREF(mangled);
|
|
return 0;
|
|
}
|
|
|
|
/* VISIT, VISIT_SEQ and VIST_SEQ_TAIL take an ASDL type as their second argument.
|
|
They use the ASDL name to synthesize the name of the C type and the visit
|
|
function.
|
|
|
|
VISIT_SEQ_TAIL permits the start of an ASDL sequence to be skipped, which is
|
|
useful if the first node in the sequence requires special treatment.
|
|
*/
|
|
|
|
#define VISIT(ST, TYPE, V) \
|
|
if (!symtable_visit_ ## TYPE((ST), (V))) \
|
|
return 0;
|
|
|
|
#define VISIT_IN_BLOCK(ST, TYPE, V, S) \
|
|
if (!symtable_visit_ ## TYPE((ST), (V))) { \
|
|
symtable_exit_block((ST), (S)); \
|
|
return 0; \
|
|
}
|
|
|
|
#define VISIT_SEQ(ST, TYPE, SEQ) { \
|
|
int i; \
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) \
|
|
return 0; \
|
|
} \
|
|
}
|
|
|
|
#define VISIT_SEQ_IN_BLOCK(ST, TYPE, SEQ, S) { \
|
|
int i; \
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) { \
|
|
symtable_exit_block((ST), (S)); \
|
|
return 0; \
|
|
} \
|
|
} \
|
|
}
|
|
|
|
#define VISIT_SEQ_TAIL(ST, TYPE, SEQ, START) { \
|
|
int i; \
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
for (i = (START); i < asdl_seq_LEN(seq); i++) { \
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) \
|
|
return 0; \
|
|
} \
|
|
}
|
|
|
|
#define VISIT_SEQ_TAIL_IN_BLOCK(ST, TYPE, SEQ, START, S) { \
|
|
int i; \
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
for (i = (START); i < asdl_seq_LEN(seq); i++) { \
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) { \
|
|
symtable_exit_block((ST), (S)); \
|
|
return 0; \
|
|
} \
|
|
} \
|
|
}
|
|
|
|
static int
|
|
symtable_new_tmpname(struct symtable *st)
|
|
{
|
|
char tmpname[256];
|
|
identifier tmp;
|
|
|
|
PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
|
|
++st->st_cur->ste_tmpname);
|
|
tmp = PyString_InternFromString(tmpname);
|
|
if (!tmp)
|
|
return 0;
|
|
if (!symtable_add_def(st, tmp, DEF_LOCAL))
|
|
return 0;
|
|
Py_DECREF(tmp);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_visit_stmt(struct symtable *st, stmt_ty s)
|
|
{
|
|
switch (s->kind) {
|
|
case FunctionDef_kind:
|
|
if (!symtable_add_def(st, s->v.FunctionDef.name, DEF_LOCAL))
|
|
return 0;
|
|
if (s->v.FunctionDef.args->defaults)
|
|
VISIT_SEQ(st, expr, s->v.FunctionDef.args->defaults);
|
|
if (s->v.FunctionDef.decorators)
|
|
VISIT_SEQ(st, expr, s->v.FunctionDef.decorators);
|
|
if (!symtable_enter_block(st, s->v.FunctionDef.name,
|
|
FunctionBlock, (void *)s, s->lineno))
|
|
return 0;
|
|
VISIT_IN_BLOCK(st, arguments, s->v.FunctionDef.args, s);
|
|
VISIT_SEQ_IN_BLOCK(st, stmt, s->v.FunctionDef.body, s);
|
|
if (!symtable_exit_block(st, s))
|
|
return 0;
|
|
break;
|
|
case ClassDef_kind: {
|
|
PyObject *tmp;
|
|
if (!symtable_add_def(st, s->v.ClassDef.name, DEF_LOCAL))
|
|
return 0;
|
|
VISIT_SEQ(st, expr, s->v.ClassDef.bases);
|
|
if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
|
|
(void *)s, s->lineno))
|
|
return 0;
|
|
tmp = st->st_private;
|
|
st->st_private = s->v.ClassDef.name;
|
|
VISIT_SEQ_IN_BLOCK(st, stmt, s->v.ClassDef.body, s);
|
|
st->st_private = tmp;
|
|
if (!symtable_exit_block(st, s))
|
|
return 0;
|
|
break;
|
|
}
|
|
case Return_kind:
|
|
if (s->v.Return.value) {
|
|
VISIT(st, expr, s->v.Return.value);
|
|
st->st_cur->ste_returns_value = 1;
|
|
if (st->st_cur->ste_generator) {
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
RETURN_VAL_IN_GENERATOR);
|
|
PyErr_SyntaxLocation(st->st_filename,
|
|
s->lineno);
|
|
return 0;
|
|
}
|
|
}
|
|
break;
|
|
case Delete_kind:
|
|
VISIT_SEQ(st, expr, s->v.Delete.targets);
|
|
break;
|
|
case Assign_kind:
|
|
VISIT_SEQ(st, expr, s->v.Assign.targets);
|
|
VISIT(st, expr, s->v.Assign.value);
|
|
break;
|
|
case AugAssign_kind:
|
|
VISIT(st, expr, s->v.AugAssign.target);
|
|
VISIT(st, expr, s->v.AugAssign.value);
|
|
break;
|
|
case Print_kind:
|
|
if (s->v.Print.dest)
|
|
VISIT(st, expr, s->v.Print.dest);
|
|
VISIT_SEQ(st, expr, s->v.Print.values);
|
|
break;
|
|
case For_kind:
|
|
VISIT(st, expr, s->v.For.target);
|
|
VISIT(st, expr, s->v.For.iter);
|
|
VISIT_SEQ(st, stmt, s->v.For.body);
|
|
if (s->v.For.orelse)
|
|
VISIT_SEQ(st, stmt, s->v.For.orelse);
|
|
break;
|
|
case While_kind:
|
|
VISIT(st, expr, s->v.While.test);
|
|
VISIT_SEQ(st, stmt, s->v.While.body);
|
|
if (s->v.While.orelse)
|
|
VISIT_SEQ(st, stmt, s->v.While.orelse);
|
|
break;
|
|
case If_kind:
|
|
/* XXX if 0: and lookup_yield() hacks */
|
|
VISIT(st, expr, s->v.If.test);
|
|
VISIT_SEQ(st, stmt, s->v.If.body);
|
|
if (s->v.If.orelse)
|
|
VISIT_SEQ(st, stmt, s->v.If.orelse);
|
|
break;
|
|
case Raise_kind:
|
|
if (s->v.Raise.type) {
|
|
VISIT(st, expr, s->v.Raise.type);
|
|
if (s->v.Raise.inst) {
|
|
VISIT(st, expr, s->v.Raise.inst);
|
|
if (s->v.Raise.tback)
|
|
VISIT(st, expr, s->v.Raise.tback);
|
|
}
|
|
}
|
|
break;
|
|
case TryExcept_kind:
|
|
VISIT_SEQ(st, stmt, s->v.TryExcept.body);
|
|
VISIT_SEQ(st, stmt, s->v.TryExcept.orelse);
|
|
VISIT_SEQ(st, excepthandler, s->v.TryExcept.handlers);
|
|
break;
|
|
case TryFinally_kind:
|
|
VISIT_SEQ(st, stmt, s->v.TryFinally.body);
|
|
VISIT_SEQ(st, stmt, s->v.TryFinally.finalbody);
|
|
break;
|
|
case Assert_kind:
|
|
VISIT(st, expr, s->v.Assert.test);
|
|
if (s->v.Assert.msg)
|
|
VISIT(st, expr, s->v.Assert.msg);
|
|
break;
|
|
case Import_kind:
|
|
VISIT_SEQ(st, alias, s->v.Import.names);
|
|
/* XXX Don't have the lineno available inside
|
|
visit_alias */
|
|
if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
|
|
st->st_cur->ste_opt_lineno = s->lineno;
|
|
break;
|
|
case ImportFrom_kind:
|
|
VISIT_SEQ(st, alias, s->v.ImportFrom.names);
|
|
/* XXX Don't have the lineno available inside
|
|
visit_alias */
|
|
if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
|
|
st->st_cur->ste_opt_lineno = s->lineno;
|
|
break;
|
|
case Exec_kind:
|
|
VISIT(st, expr, s->v.Exec.body);
|
|
if (!st->st_cur->ste_opt_lineno)
|
|
st->st_cur->ste_opt_lineno = s->lineno;
|
|
if (s->v.Exec.globals) {
|
|
st->st_cur->ste_unoptimized |= OPT_EXEC;
|
|
VISIT(st, expr, s->v.Exec.globals);
|
|
if (s->v.Exec.locals)
|
|
VISIT(st, expr, s->v.Exec.locals);
|
|
} else {
|
|
st->st_cur->ste_unoptimized |= OPT_BARE_EXEC;
|
|
}
|
|
break;
|
|
case Global_kind: {
|
|
int i;
|
|
asdl_seq *seq = s->v.Global.names;
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) {
|
|
identifier name = (identifier)asdl_seq_GET(seq, i);
|
|
char *c_name = PyString_AS_STRING(name);
|
|
long cur = symtable_lookup(st, name);
|
|
if (cur < 0)
|
|
return 0;
|
|
if (cur & (DEF_LOCAL | USE)) {
|
|
char buf[256];
|
|
if (cur & DEF_LOCAL)
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
GLOBAL_AFTER_ASSIGN,
|
|
c_name);
|
|
else
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
GLOBAL_AFTER_USE,
|
|
c_name);
|
|
if (!symtable_warn(st, buf, s->lineno))
|
|
return 0;
|
|
}
|
|
if (!symtable_add_def(st, name, DEF_GLOBAL))
|
|
return 0;
|
|
}
|
|
break;
|
|
}
|
|
case Expr_kind:
|
|
VISIT(st, expr, s->v.Expr.value);
|
|
break;
|
|
case Pass_kind:
|
|
case Break_kind:
|
|
case Continue_kind:
|
|
/* nothing to do here */
|
|
break;
|
|
case With_kind:
|
|
if (!symtable_new_tmpname(st))
|
|
return 0;
|
|
VISIT(st, expr, s->v.With.context_expr);
|
|
if (s->v.With.optional_vars) {
|
|
if (!symtable_new_tmpname(st))
|
|
return 0;
|
|
VISIT(st, expr, s->v.With.optional_vars);
|
|
}
|
|
VISIT_SEQ(st, stmt, s->v.With.body);
|
|
break;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_visit_expr(struct symtable *st, expr_ty e)
|
|
{
|
|
switch (e->kind) {
|
|
case BoolOp_kind:
|
|
VISIT_SEQ(st, expr, e->v.BoolOp.values);
|
|
break;
|
|
case BinOp_kind:
|
|
VISIT(st, expr, e->v.BinOp.left);
|
|
VISIT(st, expr, e->v.BinOp.right);
|
|
break;
|
|
case UnaryOp_kind:
|
|
VISIT(st, expr, e->v.UnaryOp.operand);
|
|
break;
|
|
case Lambda_kind: {
|
|
if (!GET_IDENTIFIER(lambda) ||
|
|
!symtable_add_def(st, lambda, DEF_LOCAL))
|
|
return 0;
|
|
if (e->v.Lambda.args->defaults)
|
|
VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
|
|
/* XXX how to get line numbers for expressions */
|
|
if (!symtable_enter_block(st, lambda,
|
|
FunctionBlock, (void *)e, 0))
|
|
return 0;
|
|
VISIT_IN_BLOCK(st, arguments, e->v.Lambda.args, (void*)e);
|
|
VISIT_IN_BLOCK(st, expr, e->v.Lambda.body, (void*)e);
|
|
if (!symtable_exit_block(st, (void *)e))
|
|
return 0;
|
|
break;
|
|
}
|
|
case IfExp_kind:
|
|
VISIT(st, expr, e->v.IfExp.test);
|
|
VISIT(st, expr, e->v.IfExp.body);
|
|
VISIT(st, expr, e->v.IfExp.orelse);
|
|
break;
|
|
case Dict_kind:
|
|
VISIT_SEQ(st, expr, e->v.Dict.keys);
|
|
VISIT_SEQ(st, expr, e->v.Dict.values);
|
|
break;
|
|
case ListComp_kind:
|
|
if (!symtable_new_tmpname(st))
|
|
return 0;
|
|
VISIT(st, expr, e->v.ListComp.elt);
|
|
VISIT_SEQ(st, comprehension, e->v.ListComp.generators);
|
|
break;
|
|
case GeneratorExp_kind:
|
|
if (!symtable_visit_genexp(st, e))
|
|
return 0;
|
|
break;
|
|
case Yield_kind:
|
|
if (e->v.Yield.value)
|
|
VISIT(st, expr, e->v.Yield.value);
|
|
st->st_cur->ste_generator = 1;
|
|
if (st->st_cur->ste_returns_value) {
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
RETURN_VAL_IN_GENERATOR);
|
|
PyErr_SyntaxLocation(st->st_filename,
|
|
e->lineno);
|
|
return 0;
|
|
}
|
|
break;
|
|
case Compare_kind:
|
|
VISIT(st, expr, e->v.Compare.left);
|
|
VISIT_SEQ(st, expr, e->v.Compare.comparators);
|
|
break;
|
|
case Call_kind:
|
|
VISIT(st, expr, e->v.Call.func);
|
|
VISIT_SEQ(st, expr, e->v.Call.args);
|
|
VISIT_SEQ(st, keyword, e->v.Call.keywords);
|
|
if (e->v.Call.starargs)
|
|
VISIT(st, expr, e->v.Call.starargs);
|
|
if (e->v.Call.kwargs)
|
|
VISIT(st, expr, e->v.Call.kwargs);
|
|
break;
|
|
case Repr_kind:
|
|
VISIT(st, expr, e->v.Repr.value);
|
|
break;
|
|
case Num_kind:
|
|
case Str_kind:
|
|
/* Nothing to do here. */
|
|
break;
|
|
/* The following exprs can be assignment targets. */
|
|
case Attribute_kind:
|
|
VISIT(st, expr, e->v.Attribute.value);
|
|
break;
|
|
case Subscript_kind:
|
|
VISIT(st, expr, e->v.Subscript.value);
|
|
VISIT(st, slice, e->v.Subscript.slice);
|
|
break;
|
|
case Name_kind:
|
|
if (!symtable_add_def(st, e->v.Name.id,
|
|
e->v.Name.ctx == Load ? USE : DEF_LOCAL))
|
|
return 0;
|
|
break;
|
|
/* child nodes of List and Tuple will have expr_context set */
|
|
case List_kind:
|
|
VISIT_SEQ(st, expr, e->v.List.elts);
|
|
break;
|
|
case Tuple_kind:
|
|
VISIT_SEQ(st, expr, e->v.Tuple.elts);
|
|
break;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_implicit_arg(struct symtable *st, int pos)
|
|
{
|
|
PyObject *id = PyString_FromFormat(".%d", pos);
|
|
if (id == NULL)
|
|
return 0;
|
|
if (!symtable_add_def(st, id, DEF_PARAM)) {
|
|
Py_DECREF(id);
|
|
return 0;
|
|
}
|
|
Py_DECREF(id);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_visit_params(struct symtable *st, asdl_seq *args, int toplevel)
|
|
{
|
|
int i;
|
|
|
|
/* go through all the toplevel arguments first */
|
|
for (i = 0; i < asdl_seq_LEN(args); i++) {
|
|
expr_ty arg = (expr_ty)asdl_seq_GET(args, i);
|
|
if (arg->kind == Name_kind) {
|
|
assert(arg->v.Name.ctx == Param ||
|
|
(arg->v.Name.ctx == Store && !toplevel));
|
|
if (!symtable_add_def(st, arg->v.Name.id, DEF_PARAM))
|
|
return 0;
|
|
}
|
|
else if (arg->kind == Tuple_kind) {
|
|
assert(arg->v.Tuple.ctx == Store);
|
|
if (toplevel) {
|
|
if (!symtable_implicit_arg(st, i))
|
|
return 0;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
"invalid expression in parameter list");
|
|
PyErr_SyntaxLocation(st->st_filename,
|
|
st->st_cur->ste_lineno);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
if (!toplevel) {
|
|
if (!symtable_visit_params_nested(st, args))
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_visit_params_nested(struct symtable *st, asdl_seq *args)
|
|
{
|
|
int i;
|
|
for (i = 0; i < asdl_seq_LEN(args); i++) {
|
|
expr_ty arg = (expr_ty)asdl_seq_GET(args, i);
|
|
if (arg->kind == Tuple_kind &&
|
|
!symtable_visit_params(st, arg->v.Tuple.elts, 0))
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_visit_arguments(struct symtable *st, arguments_ty a)
|
|
{
|
|
/* skip default arguments inside function block
|
|
XXX should ast be different?
|
|
*/
|
|
if (a->args && !symtable_visit_params(st, a->args, 1))
|
|
return 0;
|
|
if (a->vararg) {
|
|
if (!symtable_add_def(st, a->vararg, DEF_PARAM))
|
|
return 0;
|
|
st->st_cur->ste_varargs = 1;
|
|
}
|
|
if (a->kwarg) {
|
|
if (!symtable_add_def(st, a->kwarg, DEF_PARAM))
|
|
return 0;
|
|
st->st_cur->ste_varkeywords = 1;
|
|
}
|
|
if (a->args && !symtable_visit_params_nested(st, a->args))
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
symtable_visit_excepthandler(struct symtable *st, excepthandler_ty eh)
|
|
{
|
|
if (eh->type)
|
|
VISIT(st, expr, eh->type);
|
|
if (eh->name)
|
|
VISIT(st, expr, eh->name);
|
|
VISIT_SEQ(st, stmt, eh->body);
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
symtable_visit_alias(struct symtable *st, alias_ty a)
|
|
{
|
|
/* Compute store_name, the name actually bound by the import
|
|
operation. It is diferent than a->name when a->name is a
|
|
dotted package name (e.g. spam.eggs)
|
|
*/
|
|
PyObject *store_name;
|
|
PyObject *name = (a->asname == NULL) ? a->name : a->asname;
|
|
const char *base = PyString_AS_STRING(name);
|
|
char *dot = strchr(base, '.');
|
|
if (dot) {
|
|
store_name = PyString_FromStringAndSize(base, dot - base);
|
|
if (!store_name)
|
|
return 0;
|
|
}
|
|
else {
|
|
store_name = name;
|
|
Py_INCREF(store_name);
|
|
}
|
|
if (strcmp(PyString_AS_STRING(name), "*")) {
|
|
int r = symtable_add_def(st, store_name, DEF_IMPORT);
|
|
Py_DECREF(store_name);
|
|
return r;
|
|
}
|
|
else {
|
|
if (st->st_cur->ste_type != ModuleBlock) {
|
|
int lineno = st->st_cur->ste_lineno;
|
|
if (!symtable_warn(st, IMPORT_STAR_WARNING, lineno)) {
|
|
Py_DECREF(store_name);
|
|
return 0;
|
|
}
|
|
}
|
|
st->st_cur->ste_unoptimized |= OPT_IMPORT_STAR;
|
|
Py_DECREF(store_name);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
symtable_visit_comprehension(struct symtable *st, comprehension_ty lc)
|
|
{
|
|
VISIT(st, expr, lc->target);
|
|
VISIT(st, expr, lc->iter);
|
|
VISIT_SEQ(st, expr, lc->ifs);
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
symtable_visit_keyword(struct symtable *st, keyword_ty k)
|
|
{
|
|
VISIT(st, expr, k->value);
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
symtable_visit_slice(struct symtable *st, slice_ty s)
|
|
{
|
|
switch (s->kind) {
|
|
case Slice_kind:
|
|
if (s->v.Slice.lower)
|
|
VISIT(st, expr, s->v.Slice.lower)
|
|
if (s->v.Slice.upper)
|
|
VISIT(st, expr, s->v.Slice.upper)
|
|
if (s->v.Slice.step)
|
|
VISIT(st, expr, s->v.Slice.step)
|
|
break;
|
|
case ExtSlice_kind:
|
|
VISIT_SEQ(st, slice, s->v.ExtSlice.dims)
|
|
break;
|
|
case Index_kind:
|
|
VISIT(st, expr, s->v.Index.value)
|
|
break;
|
|
case Ellipsis_kind:
|
|
break;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
symtable_visit_genexp(struct symtable *st, expr_ty e)
|
|
{
|
|
comprehension_ty outermost = ((comprehension_ty)
|
|
(asdl_seq_GET(e->v.GeneratorExp.generators, 0)));
|
|
/* Outermost iterator is evaluated in current scope */
|
|
VISIT(st, expr, outermost->iter);
|
|
/* Create generator scope for the rest */
|
|
if (!GET_IDENTIFIER(genexpr) ||
|
|
!symtable_enter_block(st, genexpr, FunctionBlock, (void *)e, 0)) {
|
|
return 0;
|
|
}
|
|
st->st_cur->ste_generator = 1;
|
|
/* Outermost iter is received as an argument */
|
|
if (!symtable_implicit_arg(st, 0)) {
|
|
symtable_exit_block(st, (void *)e);
|
|
return 0;
|
|
}
|
|
VISIT_IN_BLOCK(st, expr, outermost->target, (void*)e);
|
|
VISIT_SEQ_IN_BLOCK(st, expr, outermost->ifs, (void*)e);
|
|
VISIT_SEQ_TAIL_IN_BLOCK(st, comprehension,
|
|
e->v.GeneratorExp.generators, 1, (void*)e);
|
|
VISIT_IN_BLOCK(st, expr, e->v.GeneratorExp.elt, (void*)e);
|
|
return symtable_exit_block(st, (void *)e);
|
|
}
|