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) ........
3923 lines
91 KiB
C
3923 lines
91 KiB
C
/*
|
|
* This file compiles an abstract syntax tree (AST) into Python bytecode.
|
|
*
|
|
* The primary entry point is PyAST_Compile(), which returns a
|
|
* PyCodeObject. The compiler makes several passes to build the code
|
|
* object:
|
|
* 1. Checks for future statements. See future.c
|
|
* 2. Builds a symbol table. See symtable.c.
|
|
* 3. Generate code for basic blocks. See compiler_mod() in this file.
|
|
* 4. Assemble the basic blocks into final code. See assemble() in
|
|
* this file.
|
|
*
|
|
* Note that compiler_mod() suggests module, but the module ast type
|
|
* (mod_ty) has cases for expressions and interactive statements.
|
|
*
|
|
* CAUTION: The VISIT_* macros abort the current function when they
|
|
* encounter a problem. So don't invoke them when there is memory
|
|
* which needs to be released. Code blocks are OK, as the compiler
|
|
* structure takes care of releasing those.
|
|
*/
|
|
|
|
#include "Python.h"
|
|
|
|
#include "Python-ast.h"
|
|
#include "node.h"
|
|
#include "pyarena.h"
|
|
#include "ast.h"
|
|
#include "code.h"
|
|
#include "compile.h"
|
|
#include "symtable.h"
|
|
#include "opcode.h"
|
|
|
|
int Py_OptimizeFlag = 0;
|
|
|
|
/*
|
|
ISSUES:
|
|
|
|
opcode_stack_effect() function should be reviewed since stack depth bugs
|
|
could be really hard to find later.
|
|
|
|
Dead code is being generated (i.e. after unconditional jumps).
|
|
XXX(nnorwitz): not sure this is still true
|
|
*/
|
|
|
|
#define DEFAULT_BLOCK_SIZE 16
|
|
#define DEFAULT_BLOCKS 8
|
|
#define DEFAULT_CODE_SIZE 128
|
|
#define DEFAULT_LNOTAB_SIZE 16
|
|
|
|
struct instr {
|
|
unsigned i_jabs : 1;
|
|
unsigned i_jrel : 1;
|
|
unsigned i_hasarg : 1;
|
|
unsigned char i_opcode;
|
|
int i_oparg;
|
|
struct basicblock_ *i_target; /* target block (if jump instruction) */
|
|
int i_lineno;
|
|
};
|
|
|
|
typedef struct basicblock_ {
|
|
/* Each basicblock in a compilation unit is linked via b_list in the
|
|
reverse order that the block are allocated. b_list points to the next
|
|
block, not to be confused with b_next, which is next by control flow. */
|
|
struct basicblock_ *b_list;
|
|
/* number of instructions used */
|
|
int b_iused;
|
|
/* length of instruction array (b_instr) */
|
|
int b_ialloc;
|
|
/* pointer to an array of instructions, initially NULL */
|
|
struct instr *b_instr;
|
|
/* If b_next is non-NULL, it is a pointer to the next
|
|
block reached by normal control flow. */
|
|
struct basicblock_ *b_next;
|
|
/* b_seen is used to perform a DFS of basicblocks. */
|
|
unsigned b_seen : 1;
|
|
/* b_return is true if a RETURN_VALUE opcode is inserted. */
|
|
unsigned b_return : 1;
|
|
/* depth of stack upon entry of block, computed by stackdepth() */
|
|
int b_startdepth;
|
|
/* instruction offset for block, computed by assemble_jump_offsets() */
|
|
int b_offset;
|
|
} basicblock;
|
|
|
|
/* fblockinfo tracks the current frame block.
|
|
|
|
A frame block is used to handle loops, try/except, and try/finally.
|
|
It's called a frame block to distinguish it from a basic block in the
|
|
compiler IR.
|
|
*/
|
|
|
|
enum fblocktype { LOOP, EXCEPT, FINALLY_TRY, FINALLY_END };
|
|
|
|
struct fblockinfo {
|
|
enum fblocktype fb_type;
|
|
basicblock *fb_block;
|
|
};
|
|
|
|
/* The following items change on entry and exit of code blocks.
|
|
They must be saved and restored when returning to a block.
|
|
*/
|
|
struct compiler_unit {
|
|
PySTEntryObject *u_ste;
|
|
|
|
PyObject *u_name;
|
|
/* The following fields are dicts that map objects to
|
|
the index of them in co_XXX. The index is used as
|
|
the argument for opcodes that refer to those collections.
|
|
*/
|
|
PyObject *u_consts; /* all constants */
|
|
PyObject *u_names; /* all names */
|
|
PyObject *u_varnames; /* local variables */
|
|
PyObject *u_cellvars; /* cell variables */
|
|
PyObject *u_freevars; /* free variables */
|
|
|
|
PyObject *u_private; /* for private name mangling */
|
|
|
|
int u_argcount; /* number of arguments for block */
|
|
/* Pointer to the most recently allocated block. By following b_list
|
|
members, you can reach all early allocated blocks. */
|
|
basicblock *u_blocks;
|
|
basicblock *u_curblock; /* pointer to current block */
|
|
int u_tmpname; /* temporary variables for list comps */
|
|
|
|
int u_nfblocks;
|
|
struct fblockinfo u_fblock[CO_MAXBLOCKS];
|
|
|
|
int u_firstlineno; /* the first lineno of the block */
|
|
int u_lineno; /* the lineno for the current stmt */
|
|
bool u_lineno_set; /* boolean to indicate whether instr
|
|
has been generated with current lineno */
|
|
};
|
|
|
|
/* This struct captures the global state of a compilation.
|
|
|
|
The u pointer points to the current compilation unit, while units
|
|
for enclosing blocks are stored in c_stack. The u and c_stack are
|
|
managed by compiler_enter_scope() and compiler_exit_scope().
|
|
*/
|
|
|
|
struct compiler {
|
|
const char *c_filename;
|
|
struct symtable *c_st;
|
|
PyFutureFeatures *c_future; /* pointer to module's __future__ */
|
|
PyCompilerFlags *c_flags;
|
|
|
|
int c_interactive; /* true if in interactive mode */
|
|
int c_nestlevel;
|
|
|
|
struct compiler_unit *u; /* compiler state for current block */
|
|
PyObject *c_stack; /* Python list holding compiler_unit ptrs */
|
|
char *c_encoding; /* source encoding (a borrowed reference) */
|
|
PyArena *c_arena; /* pointer to memory allocation arena */
|
|
};
|
|
|
|
struct assembler {
|
|
PyObject *a_bytecode; /* string containing bytecode */
|
|
int a_offset; /* offset into bytecode */
|
|
int a_nblocks; /* number of reachable blocks */
|
|
basicblock **a_postorder; /* list of blocks in dfs postorder */
|
|
PyObject *a_lnotab; /* string containing lnotab */
|
|
int a_lnotab_off; /* offset into lnotab */
|
|
int a_lineno; /* last lineno of emitted instruction */
|
|
int a_lineno_off; /* bytecode offset of last lineno */
|
|
};
|
|
|
|
static int compiler_enter_scope(struct compiler *, identifier, void *, int);
|
|
static void compiler_free(struct compiler *);
|
|
static basicblock *compiler_new_block(struct compiler *);
|
|
static int compiler_next_instr(struct compiler *, basicblock *);
|
|
static int compiler_addop(struct compiler *, int);
|
|
static int compiler_addop_o(struct compiler *, int, PyObject *, PyObject *);
|
|
static int compiler_addop_i(struct compiler *, int, int);
|
|
static int compiler_addop_j(struct compiler *, int, basicblock *, int);
|
|
static basicblock *compiler_use_new_block(struct compiler *);
|
|
static int compiler_error(struct compiler *, const char *);
|
|
static int compiler_nameop(struct compiler *, identifier, expr_context_ty);
|
|
|
|
static PyCodeObject *compiler_mod(struct compiler *, mod_ty);
|
|
static int compiler_visit_stmt(struct compiler *, stmt_ty);
|
|
static int compiler_visit_keyword(struct compiler *, keyword_ty);
|
|
static int compiler_visit_expr(struct compiler *, expr_ty);
|
|
static int compiler_augassign(struct compiler *, stmt_ty);
|
|
static int compiler_visit_slice(struct compiler *, slice_ty,
|
|
expr_context_ty);
|
|
|
|
static int compiler_push_fblock(struct compiler *, enum fblocktype,
|
|
basicblock *);
|
|
static void compiler_pop_fblock(struct compiler *, enum fblocktype,
|
|
basicblock *);
|
|
|
|
static int inplace_binop(struct compiler *, operator_ty);
|
|
static int expr_constant(expr_ty e);
|
|
|
|
static int compiler_with(struct compiler *, stmt_ty);
|
|
|
|
static PyCodeObject *assemble(struct compiler *, int addNone);
|
|
static PyObject *__doc__;
|
|
|
|
PyObject *
|
|
_Py_Mangle(PyObject *privateobj, PyObject *ident)
|
|
{
|
|
/* Name mangling: __private becomes _classname__private.
|
|
This is independent from how the name is used. */
|
|
const char *p, *name = PyString_AsString(ident);
|
|
char *buffer;
|
|
size_t nlen, plen;
|
|
if (privateobj == NULL || !PyString_Check(privateobj) ||
|
|
name == NULL || name[0] != '_' || name[1] != '_') {
|
|
Py_INCREF(ident);
|
|
return ident;
|
|
}
|
|
p = PyString_AsString(privateobj);
|
|
nlen = strlen(name);
|
|
if (name[nlen-1] == '_' && name[nlen-2] == '_') {
|
|
Py_INCREF(ident);
|
|
return ident; /* Don't mangle __whatever__ */
|
|
}
|
|
/* Strip leading underscores from class name */
|
|
while (*p == '_')
|
|
p++;
|
|
if (*p == '\0') {
|
|
Py_INCREF(ident);
|
|
return ident; /* Don't mangle if class is just underscores */
|
|
}
|
|
plen = strlen(p);
|
|
ident = PyString_FromStringAndSize(NULL, 1 + nlen + plen);
|
|
if (!ident)
|
|
return 0;
|
|
/* ident = "_" + p[:plen] + name # i.e. 1+plen+nlen bytes */
|
|
buffer = PyString_AS_STRING(ident);
|
|
buffer[0] = '_';
|
|
strncpy(buffer+1, p, plen);
|
|
strcpy(buffer+1+plen, name);
|
|
return ident;
|
|
}
|
|
|
|
static int
|
|
compiler_init(struct compiler *c)
|
|
{
|
|
memset(c, 0, sizeof(struct compiler));
|
|
|
|
c->c_stack = PyList_New(0);
|
|
if (!c->c_stack)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
PyCodeObject *
|
|
PyAST_Compile(mod_ty mod, const char *filename, PyCompilerFlags *flags,
|
|
PyArena *arena)
|
|
{
|
|
struct compiler c;
|
|
PyCodeObject *co = NULL;
|
|
PyCompilerFlags local_flags;
|
|
int merged;
|
|
|
|
if (!__doc__) {
|
|
__doc__ = PyString_InternFromString("__doc__");
|
|
if (!__doc__)
|
|
return NULL;
|
|
}
|
|
|
|
if (!compiler_init(&c))
|
|
return NULL;
|
|
c.c_filename = filename;
|
|
c.c_arena = arena;
|
|
c.c_future = PyFuture_FromAST(mod, filename);
|
|
if (c.c_future == NULL)
|
|
goto finally;
|
|
if (!flags) {
|
|
local_flags.cf_flags = 0;
|
|
flags = &local_flags;
|
|
}
|
|
merged = c.c_future->ff_features | flags->cf_flags;
|
|
c.c_future->ff_features = merged;
|
|
flags->cf_flags = merged;
|
|
c.c_flags = flags;
|
|
c.c_nestlevel = 0;
|
|
|
|
c.c_st = PySymtable_Build(mod, filename, c.c_future);
|
|
if (c.c_st == NULL) {
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_SystemError, "no symtable");
|
|
goto finally;
|
|
}
|
|
|
|
/* XXX initialize to NULL for now, need to handle */
|
|
c.c_encoding = NULL;
|
|
|
|
co = compiler_mod(&c, mod);
|
|
|
|
finally:
|
|
compiler_free(&c);
|
|
assert(co || PyErr_Occurred());
|
|
return co;
|
|
}
|
|
|
|
PyCodeObject *
|
|
PyNode_Compile(struct _node *n, const char *filename)
|
|
{
|
|
PyCodeObject *co = NULL;
|
|
mod_ty mod;
|
|
PyArena *arena = PyArena_New();
|
|
if (!arena)
|
|
return NULL;
|
|
mod = PyAST_FromNode(n, NULL, filename, arena);
|
|
if (mod)
|
|
co = PyAST_Compile(mod, filename, NULL, arena);
|
|
PyArena_Free(arena);
|
|
return co;
|
|
}
|
|
|
|
static void
|
|
compiler_free(struct compiler *c)
|
|
{
|
|
if (c->c_st)
|
|
PySymtable_Free(c->c_st);
|
|
if (c->c_future)
|
|
PyObject_Free(c->c_future);
|
|
Py_DECREF(c->c_stack);
|
|
}
|
|
|
|
static PyObject *
|
|
list2dict(PyObject *list)
|
|
{
|
|
Py_ssize_t i, n;
|
|
PyObject *v, *k;
|
|
PyObject *dict = PyDict_New();
|
|
if (!dict) return NULL;
|
|
|
|
n = PyList_Size(list);
|
|
for (i = 0; i < n; i++) {
|
|
v = PyInt_FromLong(i);
|
|
if (!v) {
|
|
Py_DECREF(dict);
|
|
return NULL;
|
|
}
|
|
k = PyList_GET_ITEM(list, i);
|
|
k = PyTuple_Pack(2, k, k->ob_type);
|
|
if (k == NULL || PyDict_SetItem(dict, k, v) < 0) {
|
|
Py_XDECREF(k);
|
|
Py_DECREF(v);
|
|
Py_DECREF(dict);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(k);
|
|
Py_DECREF(v);
|
|
}
|
|
return dict;
|
|
}
|
|
|
|
/* Return new dict containing names from src that match scope(s).
|
|
|
|
src is a symbol table dictionary. If the scope of a name matches
|
|
either scope_type or flag is set, insert it into the new dict. The
|
|
values are integers, starting at offset and increasing by one for
|
|
each key.
|
|
*/
|
|
|
|
static PyObject *
|
|
dictbytype(PyObject *src, int scope_type, int flag, int offset)
|
|
{
|
|
Py_ssize_t pos = 0, i = offset, scope;
|
|
PyObject *k, *v, *dest = PyDict_New();
|
|
|
|
assert(offset >= 0);
|
|
if (dest == NULL)
|
|
return NULL;
|
|
|
|
while (PyDict_Next(src, &pos, &k, &v)) {
|
|
/* XXX this should probably be a macro in symtable.h */
|
|
assert(PyInt_Check(v));
|
|
scope = (PyInt_AS_LONG(v) >> SCOPE_OFF) & SCOPE_MASK;
|
|
|
|
if (scope == scope_type || PyInt_AS_LONG(v) & flag) {
|
|
PyObject *tuple, *item = PyInt_FromLong(i);
|
|
if (item == NULL) {
|
|
Py_DECREF(dest);
|
|
return NULL;
|
|
}
|
|
i++;
|
|
tuple = PyTuple_Pack(2, k, k->ob_type);
|
|
if (!tuple || PyDict_SetItem(dest, tuple, item) < 0) {
|
|
Py_DECREF(item);
|
|
Py_DECREF(dest);
|
|
Py_XDECREF(tuple);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(item);
|
|
Py_DECREF(tuple);
|
|
}
|
|
}
|
|
return dest;
|
|
}
|
|
|
|
/*
|
|
|
|
Leave this debugging code for just a little longer.
|
|
|
|
static void
|
|
compiler_display_symbols(PyObject *name, PyObject *symbols)
|
|
{
|
|
PyObject *key, *value;
|
|
int flags;
|
|
Py_ssize_t pos = 0;
|
|
|
|
fprintf(stderr, "block %s\n", PyString_AS_STRING(name));
|
|
while (PyDict_Next(symbols, &pos, &key, &value)) {
|
|
flags = PyInt_AsLong(value);
|
|
fprintf(stderr, "var %s:", PyString_AS_STRING(key));
|
|
if (flags & DEF_GLOBAL)
|
|
fprintf(stderr, " declared_global");
|
|
if (flags & DEF_LOCAL)
|
|
fprintf(stderr, " local");
|
|
if (flags & DEF_PARAM)
|
|
fprintf(stderr, " param");
|
|
if (flags & DEF_STAR)
|
|
fprintf(stderr, " stararg");
|
|
if (flags & DEF_DOUBLESTAR)
|
|
fprintf(stderr, " starstar");
|
|
if (flags & DEF_INTUPLE)
|
|
fprintf(stderr, " tuple");
|
|
if (flags & DEF_FREE)
|
|
fprintf(stderr, " free");
|
|
if (flags & DEF_FREE_GLOBAL)
|
|
fprintf(stderr, " global");
|
|
if (flags & DEF_FREE_CLASS)
|
|
fprintf(stderr, " free/class");
|
|
if (flags & DEF_IMPORT)
|
|
fprintf(stderr, " import");
|
|
fprintf(stderr, "\n");
|
|
}
|
|
fprintf(stderr, "\n");
|
|
}
|
|
*/
|
|
|
|
static void
|
|
compiler_unit_check(struct compiler_unit *u)
|
|
{
|
|
basicblock *block;
|
|
for (block = u->u_blocks; block != NULL; block = block->b_list) {
|
|
assert(block != (void *)0xcbcbcbcb);
|
|
assert(block != (void *)0xfbfbfbfb);
|
|
assert(block != (void *)0xdbdbdbdb);
|
|
if (block->b_instr != NULL) {
|
|
assert(block->b_ialloc > 0);
|
|
assert(block->b_iused > 0);
|
|
assert(block->b_ialloc >= block->b_iused);
|
|
}
|
|
else {
|
|
assert (block->b_iused == 0);
|
|
assert (block->b_ialloc == 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
compiler_unit_free(struct compiler_unit *u)
|
|
{
|
|
basicblock *b, *next;
|
|
|
|
compiler_unit_check(u);
|
|
b = u->u_blocks;
|
|
while (b != NULL) {
|
|
if (b->b_instr)
|
|
PyObject_Free((void *)b->b_instr);
|
|
next = b->b_list;
|
|
PyObject_Free((void *)b);
|
|
b = next;
|
|
}
|
|
Py_CLEAR(u->u_ste);
|
|
Py_CLEAR(u->u_name);
|
|
Py_CLEAR(u->u_consts);
|
|
Py_CLEAR(u->u_names);
|
|
Py_CLEAR(u->u_varnames);
|
|
Py_CLEAR(u->u_freevars);
|
|
Py_CLEAR(u->u_cellvars);
|
|
Py_CLEAR(u->u_private);
|
|
PyObject_Free(u);
|
|
}
|
|
|
|
static int
|
|
compiler_enter_scope(struct compiler *c, identifier name, void *key,
|
|
int lineno)
|
|
{
|
|
struct compiler_unit *u;
|
|
|
|
u = (struct compiler_unit *)PyObject_Malloc(sizeof(
|
|
struct compiler_unit));
|
|
if (!u) {
|
|
PyErr_NoMemory();
|
|
return 0;
|
|
}
|
|
memset(u, 0, sizeof(struct compiler_unit));
|
|
u->u_argcount = 0;
|
|
u->u_ste = PySymtable_Lookup(c->c_st, key);
|
|
if (!u->u_ste) {
|
|
compiler_unit_free(u);
|
|
return 0;
|
|
}
|
|
Py_INCREF(name);
|
|
u->u_name = name;
|
|
u->u_varnames = list2dict(u->u_ste->ste_varnames);
|
|
u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
|
|
if (!u->u_varnames || !u->u_cellvars) {
|
|
compiler_unit_free(u);
|
|
return 0;
|
|
}
|
|
|
|
u->u_freevars = dictbytype(u->u_ste->ste_symbols, FREE, DEF_FREE_CLASS,
|
|
PyDict_Size(u->u_cellvars));
|
|
if (!u->u_freevars) {
|
|
compiler_unit_free(u);
|
|
return 0;
|
|
}
|
|
|
|
u->u_blocks = NULL;
|
|
u->u_tmpname = 0;
|
|
u->u_nfblocks = 0;
|
|
u->u_firstlineno = lineno;
|
|
u->u_lineno = 0;
|
|
u->u_lineno_set = false;
|
|
u->u_consts = PyDict_New();
|
|
if (!u->u_consts) {
|
|
compiler_unit_free(u);
|
|
return 0;
|
|
}
|
|
u->u_names = PyDict_New();
|
|
if (!u->u_names) {
|
|
compiler_unit_free(u);
|
|
return 0;
|
|
}
|
|
|
|
u->u_private = NULL;
|
|
|
|
/* Push the old compiler_unit on the stack. */
|
|
if (c->u) {
|
|
PyObject *wrapper = PyCObject_FromVoidPtr(c->u, NULL);
|
|
if (!wrapper || PyList_Append(c->c_stack, wrapper) < 0) {
|
|
Py_XDECREF(wrapper);
|
|
compiler_unit_free(u);
|
|
return 0;
|
|
}
|
|
Py_DECREF(wrapper);
|
|
u->u_private = c->u->u_private;
|
|
Py_XINCREF(u->u_private);
|
|
}
|
|
c->u = u;
|
|
|
|
c->c_nestlevel++;
|
|
if (compiler_use_new_block(c) == NULL)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void
|
|
compiler_exit_scope(struct compiler *c)
|
|
{
|
|
int n;
|
|
PyObject *wrapper;
|
|
|
|
c->c_nestlevel--;
|
|
compiler_unit_free(c->u);
|
|
/* Restore c->u to the parent unit. */
|
|
n = PyList_GET_SIZE(c->c_stack) - 1;
|
|
if (n >= 0) {
|
|
wrapper = PyList_GET_ITEM(c->c_stack, n);
|
|
c->u = (struct compiler_unit *)PyCObject_AsVoidPtr(wrapper);
|
|
assert(c->u);
|
|
/* we are deleting from a list so this really shouldn't fail */
|
|
if (PySequence_DelItem(c->c_stack, n) < 0)
|
|
Py_FatalError("compiler_exit_scope()");
|
|
compiler_unit_check(c->u);
|
|
}
|
|
else
|
|
c->u = NULL;
|
|
|
|
}
|
|
|
|
/* Allocate a new "anonymous" local variable.
|
|
Used by list comprehensions and with statements.
|
|
*/
|
|
|
|
static PyObject *
|
|
compiler_new_tmpname(struct compiler *c)
|
|
{
|
|
char tmpname[256];
|
|
PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->u->u_tmpname);
|
|
return PyString_FromString(tmpname);
|
|
}
|
|
|
|
/* Allocate a new block and return a pointer to it.
|
|
Returns NULL on error.
|
|
*/
|
|
|
|
static basicblock *
|
|
compiler_new_block(struct compiler *c)
|
|
{
|
|
basicblock *b;
|
|
struct compiler_unit *u;
|
|
|
|
u = c->u;
|
|
b = (basicblock *)PyObject_Malloc(sizeof(basicblock));
|
|
if (b == NULL) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
memset((void *)b, 0, sizeof(basicblock));
|
|
/* Extend the singly linked list of blocks with new block. */
|
|
b->b_list = u->u_blocks;
|
|
u->u_blocks = b;
|
|
return b;
|
|
}
|
|
|
|
static basicblock *
|
|
compiler_use_new_block(struct compiler *c)
|
|
{
|
|
basicblock *block = compiler_new_block(c);
|
|
if (block == NULL)
|
|
return NULL;
|
|
c->u->u_curblock = block;
|
|
return block;
|
|
}
|
|
|
|
static basicblock *
|
|
compiler_next_block(struct compiler *c)
|
|
{
|
|
basicblock *block = compiler_new_block(c);
|
|
if (block == NULL)
|
|
return NULL;
|
|
c->u->u_curblock->b_next = block;
|
|
c->u->u_curblock = block;
|
|
return block;
|
|
}
|
|
|
|
static basicblock *
|
|
compiler_use_next_block(struct compiler *c, basicblock *block)
|
|
{
|
|
assert(block != NULL);
|
|
c->u->u_curblock->b_next = block;
|
|
c->u->u_curblock = block;
|
|
return block;
|
|
}
|
|
|
|
/* Returns the offset of the next instruction in the current block's
|
|
b_instr array. Resizes the b_instr as necessary.
|
|
Returns -1 on failure.
|
|
*/
|
|
|
|
static int
|
|
compiler_next_instr(struct compiler *c, basicblock *b)
|
|
{
|
|
assert(b != NULL);
|
|
if (b->b_instr == NULL) {
|
|
b->b_instr = (struct instr *)PyObject_Malloc(
|
|
sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
|
|
if (b->b_instr == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
b->b_ialloc = DEFAULT_BLOCK_SIZE;
|
|
memset((char *)b->b_instr, 0,
|
|
sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
|
|
}
|
|
else if (b->b_iused == b->b_ialloc) {
|
|
struct instr *tmp;
|
|
size_t oldsize, newsize;
|
|
oldsize = b->b_ialloc * sizeof(struct instr);
|
|
newsize = oldsize << 1;
|
|
if (newsize == 0) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
b->b_ialloc <<= 1;
|
|
tmp = (struct instr *)PyObject_Realloc(
|
|
(void *)b->b_instr, newsize);
|
|
if (tmp == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
b->b_instr = tmp;
|
|
memset((char *)b->b_instr + oldsize, 0, newsize - oldsize);
|
|
}
|
|
return b->b_iused++;
|
|
}
|
|
|
|
/* Set the i_lineno member of the instruction at offse off if the
|
|
line number for the current expression/statement (?) has not
|
|
already been set. If it has been set, the call has no effect.
|
|
|
|
Every time a new node is b
|
|
*/
|
|
|
|
static void
|
|
compiler_set_lineno(struct compiler *c, int off)
|
|
{
|
|
basicblock *b;
|
|
if (c->u->u_lineno_set)
|
|
return;
|
|
c->u->u_lineno_set = true;
|
|
b = c->u->u_curblock;
|
|
b->b_instr[off].i_lineno = c->u->u_lineno;
|
|
}
|
|
|
|
static int
|
|
opcode_stack_effect(int opcode, int oparg)
|
|
{
|
|
switch (opcode) {
|
|
case POP_TOP:
|
|
return -1;
|
|
case ROT_TWO:
|
|
case ROT_THREE:
|
|
return 0;
|
|
case DUP_TOP:
|
|
return 1;
|
|
case ROT_FOUR:
|
|
return 0;
|
|
|
|
case UNARY_POSITIVE:
|
|
case UNARY_NEGATIVE:
|
|
case UNARY_NOT:
|
|
case UNARY_CONVERT:
|
|
case UNARY_INVERT:
|
|
return 0;
|
|
|
|
case LIST_APPEND:
|
|
return -2;
|
|
|
|
case BINARY_POWER:
|
|
case BINARY_MULTIPLY:
|
|
case BINARY_MODULO:
|
|
case BINARY_ADD:
|
|
case BINARY_SUBTRACT:
|
|
case BINARY_SUBSCR:
|
|
case BINARY_FLOOR_DIVIDE:
|
|
case BINARY_TRUE_DIVIDE:
|
|
return -1;
|
|
case INPLACE_FLOOR_DIVIDE:
|
|
case INPLACE_TRUE_DIVIDE:
|
|
return -1;
|
|
|
|
case SLICE+0:
|
|
return 1;
|
|
case SLICE+1:
|
|
return 0;
|
|
case SLICE+2:
|
|
return 0;
|
|
case SLICE+3:
|
|
return -1;
|
|
|
|
case STORE_SLICE+0:
|
|
return -2;
|
|
case STORE_SLICE+1:
|
|
return -3;
|
|
case STORE_SLICE+2:
|
|
return -3;
|
|
case STORE_SLICE+3:
|
|
return -4;
|
|
|
|
case DELETE_SLICE+0:
|
|
return -1;
|
|
case DELETE_SLICE+1:
|
|
return -2;
|
|
case DELETE_SLICE+2:
|
|
return -2;
|
|
case DELETE_SLICE+3:
|
|
return -3;
|
|
|
|
case INPLACE_ADD:
|
|
case INPLACE_SUBTRACT:
|
|
case INPLACE_MULTIPLY:
|
|
case INPLACE_MODULO:
|
|
return -1;
|
|
case STORE_SUBSCR:
|
|
return -3;
|
|
case DELETE_SUBSCR:
|
|
return -2;
|
|
|
|
case BINARY_LSHIFT:
|
|
case BINARY_RSHIFT:
|
|
case BINARY_AND:
|
|
case BINARY_XOR:
|
|
case BINARY_OR:
|
|
return -1;
|
|
case INPLACE_POWER:
|
|
return -1;
|
|
case GET_ITER:
|
|
return 0;
|
|
|
|
case PRINT_EXPR:
|
|
return -1;
|
|
case PRINT_ITEM:
|
|
return -1;
|
|
case PRINT_NEWLINE:
|
|
return 0;
|
|
case PRINT_ITEM_TO:
|
|
return -2;
|
|
case PRINT_NEWLINE_TO:
|
|
return -1;
|
|
case INPLACE_LSHIFT:
|
|
case INPLACE_RSHIFT:
|
|
case INPLACE_AND:
|
|
case INPLACE_XOR:
|
|
case INPLACE_OR:
|
|
return -1;
|
|
case BREAK_LOOP:
|
|
return 0;
|
|
case WITH_CLEANUP:
|
|
return -1; /* XXX Sometimes more */
|
|
case LOAD_LOCALS:
|
|
return 1;
|
|
case RETURN_VALUE:
|
|
return -1;
|
|
case IMPORT_STAR:
|
|
return -1;
|
|
case EXEC_STMT:
|
|
return -3;
|
|
case YIELD_VALUE:
|
|
return 0;
|
|
|
|
case POP_BLOCK:
|
|
return 0;
|
|
case END_FINALLY:
|
|
return -1; /* or -2 or -3 if exception occurred */
|
|
case BUILD_CLASS:
|
|
return -2;
|
|
|
|
case STORE_NAME:
|
|
return -1;
|
|
case DELETE_NAME:
|
|
return 0;
|
|
case UNPACK_SEQUENCE:
|
|
return oparg-1;
|
|
case FOR_ITER:
|
|
return 1;
|
|
|
|
case STORE_ATTR:
|
|
return -2;
|
|
case DELETE_ATTR:
|
|
return -1;
|
|
case STORE_GLOBAL:
|
|
return -1;
|
|
case DELETE_GLOBAL:
|
|
return 0;
|
|
case DUP_TOPX:
|
|
return oparg;
|
|
case LOAD_CONST:
|
|
return 1;
|
|
case LOAD_NAME:
|
|
return 1;
|
|
case BUILD_TUPLE:
|
|
case BUILD_LIST:
|
|
return 1-oparg;
|
|
case BUILD_MAP:
|
|
return 1;
|
|
case LOAD_ATTR:
|
|
return 0;
|
|
case COMPARE_OP:
|
|
return -1;
|
|
case IMPORT_NAME:
|
|
return 0;
|
|
case IMPORT_FROM:
|
|
return 1;
|
|
|
|
case JUMP_FORWARD:
|
|
case JUMP_IF_FALSE:
|
|
case JUMP_IF_TRUE:
|
|
case JUMP_ABSOLUTE:
|
|
return 0;
|
|
|
|
case LOAD_GLOBAL:
|
|
return 1;
|
|
|
|
case CONTINUE_LOOP:
|
|
return 0;
|
|
case SETUP_LOOP:
|
|
return 0;
|
|
case SETUP_EXCEPT:
|
|
case SETUP_FINALLY:
|
|
return 3; /* actually pushed by an exception */
|
|
|
|
case LOAD_FAST:
|
|
return 1;
|
|
case STORE_FAST:
|
|
return -1;
|
|
case DELETE_FAST:
|
|
return 0;
|
|
|
|
case RAISE_VARARGS:
|
|
return -oparg;
|
|
#define NARGS(o) (((o) % 256) + 2*((o) / 256))
|
|
case CALL_FUNCTION:
|
|
return -NARGS(oparg);
|
|
case CALL_FUNCTION_VAR:
|
|
case CALL_FUNCTION_KW:
|
|
return -NARGS(oparg)-1;
|
|
case CALL_FUNCTION_VAR_KW:
|
|
return -NARGS(oparg)-2;
|
|
#undef NARGS
|
|
case MAKE_FUNCTION:
|
|
return -oparg;
|
|
case BUILD_SLICE:
|
|
if (oparg == 3)
|
|
return -2;
|
|
else
|
|
return -1;
|
|
|
|
case MAKE_CLOSURE:
|
|
return -oparg;
|
|
case LOAD_CLOSURE:
|
|
return 1;
|
|
case LOAD_DEREF:
|
|
return 1;
|
|
case STORE_DEREF:
|
|
return -1;
|
|
default:
|
|
fprintf(stderr, "opcode = %d\n", opcode);
|
|
Py_FatalError("opcode_stack_effect()");
|
|
|
|
}
|
|
return 0; /* not reachable */
|
|
}
|
|
|
|
/* Add an opcode with no argument.
|
|
Returns 0 on failure, 1 on success.
|
|
*/
|
|
|
|
static int
|
|
compiler_addop(struct compiler *c, int opcode)
|
|
{
|
|
basicblock *b;
|
|
struct instr *i;
|
|
int off;
|
|
off = compiler_next_instr(c, c->u->u_curblock);
|
|
if (off < 0)
|
|
return 0;
|
|
b = c->u->u_curblock;
|
|
i = &b->b_instr[off];
|
|
i->i_opcode = opcode;
|
|
i->i_hasarg = 0;
|
|
if (opcode == RETURN_VALUE)
|
|
b->b_return = 1;
|
|
compiler_set_lineno(c, off);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
|
|
{
|
|
PyObject *t, *v;
|
|
Py_ssize_t arg;
|
|
|
|
/* necessary to make sure types aren't coerced (e.g., int and long) */
|
|
t = PyTuple_Pack(2, o, o->ob_type);
|
|
if (t == NULL)
|
|
return -1;
|
|
|
|
v = PyDict_GetItem(dict, t);
|
|
if (!v) {
|
|
arg = PyDict_Size(dict);
|
|
v = PyInt_FromLong(arg);
|
|
if (!v) {
|
|
Py_DECREF(t);
|
|
return -1;
|
|
}
|
|
if (PyDict_SetItem(dict, t, v) < 0) {
|
|
Py_DECREF(t);
|
|
Py_DECREF(v);
|
|
return -1;
|
|
}
|
|
Py_DECREF(v);
|
|
}
|
|
else
|
|
arg = PyInt_AsLong(v);
|
|
Py_DECREF(t);
|
|
return arg;
|
|
}
|
|
|
|
static int
|
|
compiler_addop_o(struct compiler *c, int opcode, PyObject *dict,
|
|
PyObject *o)
|
|
{
|
|
int arg = compiler_add_o(c, dict, o);
|
|
if (arg < 0)
|
|
return 0;
|
|
return compiler_addop_i(c, opcode, arg);
|
|
}
|
|
|
|
static int
|
|
compiler_addop_name(struct compiler *c, int opcode, PyObject *dict,
|
|
PyObject *o)
|
|
{
|
|
int arg;
|
|
PyObject *mangled = _Py_Mangle(c->u->u_private, o);
|
|
if (!mangled)
|
|
return 0;
|
|
arg = compiler_add_o(c, dict, mangled);
|
|
Py_DECREF(mangled);
|
|
if (arg < 0)
|
|
return 0;
|
|
return compiler_addop_i(c, opcode, arg);
|
|
}
|
|
|
|
/* Add an opcode with an integer argument.
|
|
Returns 0 on failure, 1 on success.
|
|
*/
|
|
|
|
static int
|
|
compiler_addop_i(struct compiler *c, int opcode, int oparg)
|
|
{
|
|
struct instr *i;
|
|
int off;
|
|
off = compiler_next_instr(c, c->u->u_curblock);
|
|
if (off < 0)
|
|
return 0;
|
|
i = &c->u->u_curblock->b_instr[off];
|
|
i->i_opcode = opcode;
|
|
i->i_oparg = oparg;
|
|
i->i_hasarg = 1;
|
|
compiler_set_lineno(c, off);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_addop_j(struct compiler *c, int opcode, basicblock *b, int absolute)
|
|
{
|
|
struct instr *i;
|
|
int off;
|
|
|
|
assert(b != NULL);
|
|
off = compiler_next_instr(c, c->u->u_curblock);
|
|
if (off < 0)
|
|
return 0;
|
|
i = &c->u->u_curblock->b_instr[off];
|
|
i->i_opcode = opcode;
|
|
i->i_target = b;
|
|
i->i_hasarg = 1;
|
|
if (absolute)
|
|
i->i_jabs = 1;
|
|
else
|
|
i->i_jrel = 1;
|
|
compiler_set_lineno(c, off);
|
|
return 1;
|
|
}
|
|
|
|
/* The distinction between NEW_BLOCK and NEXT_BLOCK is subtle. (I'd
|
|
like to find better names.) NEW_BLOCK() creates a new block and sets
|
|
it as the current block. NEXT_BLOCK() also creates an implicit jump
|
|
from the current block to the new block.
|
|
*/
|
|
|
|
/* XXX The returns inside these macros make it impossible to decref
|
|
objects created in the local function.
|
|
*/
|
|
|
|
|
|
#define NEW_BLOCK(C) { \
|
|
if (compiler_use_new_block((C)) == NULL) \
|
|
return 0; \
|
|
}
|
|
|
|
#define NEXT_BLOCK(C) { \
|
|
if (compiler_next_block((C)) == NULL) \
|
|
return 0; \
|
|
}
|
|
|
|
#define ADDOP(C, OP) { \
|
|
if (!compiler_addop((C), (OP))) \
|
|
return 0; \
|
|
}
|
|
|
|
#define ADDOP_IN_SCOPE(C, OP) { \
|
|
if (!compiler_addop((C), (OP))) { \
|
|
compiler_exit_scope(c); \
|
|
return 0; \
|
|
} \
|
|
}
|
|
|
|
#define ADDOP_O(C, OP, O, TYPE) { \
|
|
if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) \
|
|
return 0; \
|
|
}
|
|
|
|
#define ADDOP_NAME(C, OP, O, TYPE) { \
|
|
if (!compiler_addop_name((C), (OP), (C)->u->u_ ## TYPE, (O))) \
|
|
return 0; \
|
|
}
|
|
|
|
#define ADDOP_I(C, OP, O) { \
|
|
if (!compiler_addop_i((C), (OP), (O))) \
|
|
return 0; \
|
|
}
|
|
|
|
#define ADDOP_JABS(C, OP, O) { \
|
|
if (!compiler_addop_j((C), (OP), (O), 1)) \
|
|
return 0; \
|
|
}
|
|
|
|
#define ADDOP_JREL(C, OP, O) { \
|
|
if (!compiler_addop_j((C), (OP), (O), 0)) \
|
|
return 0; \
|
|
}
|
|
|
|
/* VISIT and VISIT_SEQ takes an ASDL type as their second argument. They use
|
|
the ASDL name to synthesize the name of the C type and the visit function.
|
|
*/
|
|
|
|
#define VISIT(C, TYPE, V) {\
|
|
if (!compiler_visit_ ## TYPE((C), (V))) \
|
|
return 0; \
|
|
}
|
|
|
|
#define VISIT_IN_SCOPE(C, TYPE, V) {\
|
|
if (!compiler_visit_ ## TYPE((C), (V))) { \
|
|
compiler_exit_scope(c); \
|
|
return 0; \
|
|
} \
|
|
}
|
|
|
|
#define VISIT_SLICE(C, V, CTX) {\
|
|
if (!compiler_visit_slice((C), (V), (CTX))) \
|
|
return 0; \
|
|
}
|
|
|
|
#define VISIT_SEQ(C, 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 (!compiler_visit_ ## TYPE((C), elt)) \
|
|
return 0; \
|
|
} \
|
|
}
|
|
|
|
#define VISIT_SEQ_IN_SCOPE(C, 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 (!compiler_visit_ ## TYPE((C), elt)) { \
|
|
compiler_exit_scope(c); \
|
|
return 0; \
|
|
} \
|
|
} \
|
|
}
|
|
|
|
static int
|
|
compiler_isdocstring(stmt_ty s)
|
|
{
|
|
if (s->kind != Expr_kind)
|
|
return 0;
|
|
return s->v.Expr.value->kind == Str_kind;
|
|
}
|
|
|
|
/* Compile a sequence of statements, checking for a docstring. */
|
|
|
|
static int
|
|
compiler_body(struct compiler *c, asdl_seq *stmts)
|
|
{
|
|
int i = 0;
|
|
stmt_ty st;
|
|
|
|
if (!asdl_seq_LEN(stmts))
|
|
return 1;
|
|
st = (stmt_ty)asdl_seq_GET(stmts, 0);
|
|
if (compiler_isdocstring(st)) {
|
|
i = 1;
|
|
VISIT(c, expr, st->v.Expr.value);
|
|
if (!compiler_nameop(c, __doc__, Store))
|
|
return 0;
|
|
}
|
|
for (; i < asdl_seq_LEN(stmts); i++)
|
|
VISIT(c, stmt, (stmt_ty)asdl_seq_GET(stmts, i));
|
|
return 1;
|
|
}
|
|
|
|
static PyCodeObject *
|
|
compiler_mod(struct compiler *c, mod_ty mod)
|
|
{
|
|
PyCodeObject *co;
|
|
int addNone = 1;
|
|
static PyObject *module;
|
|
if (!module) {
|
|
module = PyString_FromString("<module>");
|
|
if (!module)
|
|
return NULL;
|
|
}
|
|
/* Use 0 for firstlineno initially, will fixup in assemble(). */
|
|
if (!compiler_enter_scope(c, module, mod, 0))
|
|
return NULL;
|
|
switch (mod->kind) {
|
|
case Module_kind:
|
|
if (!compiler_body(c, mod->v.Module.body)) {
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
break;
|
|
case Interactive_kind:
|
|
c->c_interactive = 1;
|
|
VISIT_SEQ_IN_SCOPE(c, stmt,
|
|
mod->v.Interactive.body);
|
|
break;
|
|
case Expression_kind:
|
|
VISIT_IN_SCOPE(c, expr, mod->v.Expression.body);
|
|
addNone = 0;
|
|
break;
|
|
case Suite_kind:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"suite should not be possible");
|
|
return 0;
|
|
default:
|
|
PyErr_Format(PyExc_SystemError,
|
|
"module kind %d should not be possible",
|
|
mod->kind);
|
|
return 0;
|
|
}
|
|
co = assemble(c, addNone);
|
|
compiler_exit_scope(c);
|
|
return co;
|
|
}
|
|
|
|
/* The test for LOCAL must come before the test for FREE in order to
|
|
handle classes where name is both local and free. The local var is
|
|
a method and the free var is a free var referenced within a method.
|
|
*/
|
|
|
|
static int
|
|
get_ref_type(struct compiler *c, PyObject *name)
|
|
{
|
|
int scope = PyST_GetScope(c->u->u_ste, name);
|
|
if (scope == 0) {
|
|
char buf[350];
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"unknown scope for %.100s in %.100s(%s) in %s\n"
|
|
"symbols: %s\nlocals: %s\nglobals: %s\n",
|
|
PyString_AS_STRING(name),
|
|
PyString_AS_STRING(c->u->u_name),
|
|
PyObject_REPR(c->u->u_ste->ste_id),
|
|
c->c_filename,
|
|
PyObject_REPR(c->u->u_ste->ste_symbols),
|
|
PyObject_REPR(c->u->u_varnames),
|
|
PyObject_REPR(c->u->u_names)
|
|
);
|
|
Py_FatalError(buf);
|
|
}
|
|
|
|
return scope;
|
|
}
|
|
|
|
static int
|
|
compiler_lookup_arg(PyObject *dict, PyObject *name)
|
|
{
|
|
PyObject *k, *v;
|
|
k = PyTuple_Pack(2, name, name->ob_type);
|
|
if (k == NULL)
|
|
return -1;
|
|
v = PyDict_GetItem(dict, k);
|
|
Py_DECREF(k);
|
|
if (v == NULL)
|
|
return -1;
|
|
return PyInt_AS_LONG(v);
|
|
}
|
|
|
|
static int
|
|
compiler_make_closure(struct compiler *c, PyCodeObject *co, int args)
|
|
{
|
|
int i, free = PyCode_GetNumFree(co);
|
|
if (free == 0) {
|
|
ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
|
|
ADDOP_I(c, MAKE_FUNCTION, args);
|
|
return 1;
|
|
}
|
|
for (i = 0; i < free; ++i) {
|
|
/* Bypass com_addop_varname because it will generate
|
|
LOAD_DEREF but LOAD_CLOSURE is needed.
|
|
*/
|
|
PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i);
|
|
int arg, reftype;
|
|
|
|
/* Special case: If a class contains a method with a
|
|
free variable that has the same name as a method,
|
|
the name will be considered free *and* local in the
|
|
class. It should be handled by the closure, as
|
|
well as by the normal name loookup logic.
|
|
*/
|
|
reftype = get_ref_type(c, name);
|
|
if (reftype == CELL)
|
|
arg = compiler_lookup_arg(c->u->u_cellvars, name);
|
|
else /* (reftype == FREE) */
|
|
arg = compiler_lookup_arg(c->u->u_freevars, name);
|
|
if (arg == -1) {
|
|
printf("lookup %s in %s %d %d\n"
|
|
"freevars of %s: %s\n",
|
|
PyObject_REPR(name),
|
|
PyString_AS_STRING(c->u->u_name),
|
|
reftype, arg,
|
|
PyString_AS_STRING(co->co_name),
|
|
PyObject_REPR(co->co_freevars));
|
|
Py_FatalError("compiler_make_closure()");
|
|
}
|
|
ADDOP_I(c, LOAD_CLOSURE, arg);
|
|
}
|
|
ADDOP_I(c, BUILD_TUPLE, free);
|
|
ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
|
|
ADDOP_I(c, MAKE_CLOSURE, args);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_decorators(struct compiler *c, asdl_seq* decos)
|
|
{
|
|
int i;
|
|
|
|
if (!decos)
|
|
return 1;
|
|
|
|
for (i = 0; i < asdl_seq_LEN(decos); i++) {
|
|
VISIT(c, expr, (expr_ty)asdl_seq_GET(decos, i));
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_arguments(struct compiler *c, arguments_ty args)
|
|
{
|
|
int i;
|
|
int n = asdl_seq_LEN(args->args);
|
|
/* Correctly handle nested argument lists */
|
|
for (i = 0; i < n; i++) {
|
|
expr_ty arg = (expr_ty)asdl_seq_GET(args->args, i);
|
|
if (arg->kind == Tuple_kind) {
|
|
PyObject *id = PyString_FromFormat(".%d", i);
|
|
if (id == NULL) {
|
|
return 0;
|
|
}
|
|
if (!compiler_nameop(c, id, Load)) {
|
|
Py_DECREF(id);
|
|
return 0;
|
|
}
|
|
Py_DECREF(id);
|
|
VISIT(c, expr, arg);
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_function(struct compiler *c, stmt_ty s)
|
|
{
|
|
PyCodeObject *co;
|
|
PyObject *first_const = Py_None;
|
|
arguments_ty args = s->v.FunctionDef.args;
|
|
asdl_seq* decos = s->v.FunctionDef.decorators;
|
|
stmt_ty st;
|
|
int i, n, docstring;
|
|
|
|
assert(s->kind == FunctionDef_kind);
|
|
|
|
if (!compiler_decorators(c, decos))
|
|
return 0;
|
|
if (args->defaults)
|
|
VISIT_SEQ(c, expr, args->defaults);
|
|
if (!compiler_enter_scope(c, s->v.FunctionDef.name, (void *)s,
|
|
s->lineno))
|
|
return 0;
|
|
|
|
st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, 0);
|
|
docstring = compiler_isdocstring(st);
|
|
if (docstring)
|
|
first_const = st->v.Expr.value->v.Str.s;
|
|
if (compiler_add_o(c, c->u->u_consts, first_const) < 0) {
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
|
|
/* unpack nested arguments */
|
|
compiler_arguments(c, args);
|
|
|
|
c->u->u_argcount = asdl_seq_LEN(args->args);
|
|
n = asdl_seq_LEN(s->v.FunctionDef.body);
|
|
/* if there was a docstring, we need to skip the first statement */
|
|
for (i = docstring; i < n; i++) {
|
|
st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, i);
|
|
VISIT_IN_SCOPE(c, stmt, st);
|
|
}
|
|
co = assemble(c, 1);
|
|
compiler_exit_scope(c);
|
|
if (co == NULL)
|
|
return 0;
|
|
|
|
compiler_make_closure(c, co, asdl_seq_LEN(args->defaults));
|
|
Py_DECREF(co);
|
|
|
|
for (i = 0; i < asdl_seq_LEN(decos); i++) {
|
|
ADDOP_I(c, CALL_FUNCTION, 1);
|
|
}
|
|
|
|
return compiler_nameop(c, s->v.FunctionDef.name, Store);
|
|
}
|
|
|
|
static int
|
|
compiler_class(struct compiler *c, stmt_ty s)
|
|
{
|
|
int n;
|
|
PyCodeObject *co;
|
|
PyObject *str;
|
|
/* push class name on stack, needed by BUILD_CLASS */
|
|
ADDOP_O(c, LOAD_CONST, s->v.ClassDef.name, consts);
|
|
/* push the tuple of base classes on the stack */
|
|
n = asdl_seq_LEN(s->v.ClassDef.bases);
|
|
if (n > 0)
|
|
VISIT_SEQ(c, expr, s->v.ClassDef.bases);
|
|
ADDOP_I(c, BUILD_TUPLE, n);
|
|
if (!compiler_enter_scope(c, s->v.ClassDef.name, (void *)s,
|
|
s->lineno))
|
|
return 0;
|
|
c->u->u_private = s->v.ClassDef.name;
|
|
Py_INCREF(c->u->u_private);
|
|
str = PyString_InternFromString("__name__");
|
|
if (!str || !compiler_nameop(c, str, Load)) {
|
|
Py_XDECREF(str);
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
|
|
Py_DECREF(str);
|
|
str = PyString_InternFromString("__module__");
|
|
if (!str || !compiler_nameop(c, str, Store)) {
|
|
Py_XDECREF(str);
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
Py_DECREF(str);
|
|
|
|
if (!compiler_body(c, s->v.ClassDef.body)) {
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
|
|
ADDOP_IN_SCOPE(c, LOAD_LOCALS);
|
|
ADDOP_IN_SCOPE(c, RETURN_VALUE);
|
|
co = assemble(c, 1);
|
|
compiler_exit_scope(c);
|
|
if (co == NULL)
|
|
return 0;
|
|
|
|
compiler_make_closure(c, co, 0);
|
|
Py_DECREF(co);
|
|
|
|
ADDOP_I(c, CALL_FUNCTION, 0);
|
|
ADDOP(c, BUILD_CLASS);
|
|
if (!compiler_nameop(c, s->v.ClassDef.name, Store))
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_ifexp(struct compiler *c, expr_ty e)
|
|
{
|
|
basicblock *end, *next;
|
|
|
|
assert(e->kind == IfExp_kind);
|
|
end = compiler_new_block(c);
|
|
if (end == NULL)
|
|
return 0;
|
|
next = compiler_new_block(c);
|
|
if (next == NULL)
|
|
return 0;
|
|
VISIT(c, expr, e->v.IfExp.test);
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, next);
|
|
ADDOP(c, POP_TOP);
|
|
VISIT(c, expr, e->v.IfExp.body);
|
|
ADDOP_JREL(c, JUMP_FORWARD, end);
|
|
compiler_use_next_block(c, next);
|
|
ADDOP(c, POP_TOP);
|
|
VISIT(c, expr, e->v.IfExp.orelse);
|
|
compiler_use_next_block(c, end);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_lambda(struct compiler *c, expr_ty e)
|
|
{
|
|
PyCodeObject *co;
|
|
static identifier name;
|
|
arguments_ty args = e->v.Lambda.args;
|
|
assert(e->kind == Lambda_kind);
|
|
|
|
if (!name) {
|
|
name = PyString_InternFromString("<lambda>");
|
|
if (!name)
|
|
return 0;
|
|
}
|
|
|
|
if (args->defaults)
|
|
VISIT_SEQ(c, expr, args->defaults);
|
|
if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
|
|
return 0;
|
|
|
|
/* unpack nested arguments */
|
|
compiler_arguments(c, args);
|
|
|
|
c->u->u_argcount = asdl_seq_LEN(args->args);
|
|
VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);
|
|
ADDOP_IN_SCOPE(c, RETURN_VALUE);
|
|
co = assemble(c, 1);
|
|
compiler_exit_scope(c);
|
|
if (co == NULL)
|
|
return 0;
|
|
|
|
compiler_make_closure(c, co, asdl_seq_LEN(args->defaults));
|
|
Py_DECREF(co);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_print(struct compiler *c, stmt_ty s)
|
|
{
|
|
int i, n;
|
|
bool dest;
|
|
|
|
assert(s->kind == Print_kind);
|
|
n = asdl_seq_LEN(s->v.Print.values);
|
|
dest = false;
|
|
if (s->v.Print.dest) {
|
|
VISIT(c, expr, s->v.Print.dest);
|
|
dest = true;
|
|
}
|
|
for (i = 0; i < n; i++) {
|
|
expr_ty e = (expr_ty)asdl_seq_GET(s->v.Print.values, i);
|
|
if (dest) {
|
|
ADDOP(c, DUP_TOP);
|
|
VISIT(c, expr, e);
|
|
ADDOP(c, ROT_TWO);
|
|
ADDOP(c, PRINT_ITEM_TO);
|
|
}
|
|
else {
|
|
VISIT(c, expr, e);
|
|
ADDOP(c, PRINT_ITEM);
|
|
}
|
|
}
|
|
if (s->v.Print.nl) {
|
|
if (dest)
|
|
ADDOP(c, PRINT_NEWLINE_TO)
|
|
else
|
|
ADDOP(c, PRINT_NEWLINE)
|
|
}
|
|
else if (dest)
|
|
ADDOP(c, POP_TOP);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_if(struct compiler *c, stmt_ty s)
|
|
{
|
|
basicblock *end, *next;
|
|
int constant;
|
|
assert(s->kind == If_kind);
|
|
end = compiler_new_block(c);
|
|
if (end == NULL)
|
|
return 0;
|
|
next = compiler_new_block(c);
|
|
if (next == NULL)
|
|
return 0;
|
|
|
|
constant = expr_constant(s->v.If.test);
|
|
/* constant = 0: "if 0"
|
|
* constant = 1: "if 1", "if 2", ...
|
|
* constant = -1: rest */
|
|
if (constant == 0) {
|
|
if (s->v.If.orelse)
|
|
VISIT_SEQ(c, stmt, s->v.If.orelse);
|
|
} else if (constant == 1) {
|
|
VISIT_SEQ(c, stmt, s->v.If.body);
|
|
} else {
|
|
VISIT(c, expr, s->v.If.test);
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, next);
|
|
ADDOP(c, POP_TOP);
|
|
VISIT_SEQ(c, stmt, s->v.If.body);
|
|
ADDOP_JREL(c, JUMP_FORWARD, end);
|
|
compiler_use_next_block(c, next);
|
|
ADDOP(c, POP_TOP);
|
|
if (s->v.If.orelse)
|
|
VISIT_SEQ(c, stmt, s->v.If.orelse);
|
|
}
|
|
compiler_use_next_block(c, end);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_for(struct compiler *c, stmt_ty s)
|
|
{
|
|
basicblock *start, *cleanup, *end;
|
|
|
|
start = compiler_new_block(c);
|
|
cleanup = compiler_new_block(c);
|
|
end = compiler_new_block(c);
|
|
if (start == NULL || end == NULL || cleanup == NULL)
|
|
return 0;
|
|
ADDOP_JREL(c, SETUP_LOOP, end);
|
|
if (!compiler_push_fblock(c, LOOP, start))
|
|
return 0;
|
|
VISIT(c, expr, s->v.For.iter);
|
|
ADDOP(c, GET_ITER);
|
|
compiler_use_next_block(c, start);
|
|
/* XXX(nnorwitz): is there a better way to handle this?
|
|
for loops are special, we want to be able to trace them
|
|
each time around, so we need to set an extra line number. */
|
|
c->u->u_lineno_set = false;
|
|
ADDOP_JREL(c, FOR_ITER, cleanup);
|
|
VISIT(c, expr, s->v.For.target);
|
|
VISIT_SEQ(c, stmt, s->v.For.body);
|
|
ADDOP_JABS(c, JUMP_ABSOLUTE, start);
|
|
compiler_use_next_block(c, cleanup);
|
|
ADDOP(c, POP_BLOCK);
|
|
compiler_pop_fblock(c, LOOP, start);
|
|
VISIT_SEQ(c, stmt, s->v.For.orelse);
|
|
compiler_use_next_block(c, end);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_while(struct compiler *c, stmt_ty s)
|
|
{
|
|
basicblock *loop, *orelse, *end, *anchor = NULL;
|
|
int constant = expr_constant(s->v.While.test);
|
|
|
|
if (constant == 0)
|
|
return 1;
|
|
loop = compiler_new_block(c);
|
|
end = compiler_new_block(c);
|
|
if (constant == -1) {
|
|
anchor = compiler_new_block(c);
|
|
if (anchor == NULL)
|
|
return 0;
|
|
}
|
|
if (loop == NULL || end == NULL)
|
|
return 0;
|
|
if (s->v.While.orelse) {
|
|
orelse = compiler_new_block(c);
|
|
if (orelse == NULL)
|
|
return 0;
|
|
}
|
|
else
|
|
orelse = NULL;
|
|
|
|
ADDOP_JREL(c, SETUP_LOOP, end);
|
|
compiler_use_next_block(c, loop);
|
|
if (!compiler_push_fblock(c, LOOP, loop))
|
|
return 0;
|
|
if (constant == -1) {
|
|
VISIT(c, expr, s->v.While.test);
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, anchor);
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
VISIT_SEQ(c, stmt, s->v.While.body);
|
|
ADDOP_JABS(c, JUMP_ABSOLUTE, loop);
|
|
|
|
/* XXX should the two POP instructions be in a separate block
|
|
if there is no else clause ?
|
|
*/
|
|
|
|
if (constant == -1) {
|
|
compiler_use_next_block(c, anchor);
|
|
ADDOP(c, POP_TOP);
|
|
ADDOP(c, POP_BLOCK);
|
|
}
|
|
compiler_pop_fblock(c, LOOP, loop);
|
|
if (orelse != NULL) /* what if orelse is just pass? */
|
|
VISIT_SEQ(c, stmt, s->v.While.orelse);
|
|
compiler_use_next_block(c, end);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_continue(struct compiler *c)
|
|
{
|
|
static const char LOOP_ERROR_MSG[] = "'continue' not properly in loop";
|
|
int i;
|
|
|
|
if (!c->u->u_nfblocks)
|
|
return compiler_error(c, LOOP_ERROR_MSG);
|
|
i = c->u->u_nfblocks - 1;
|
|
switch (c->u->u_fblock[i].fb_type) {
|
|
case LOOP:
|
|
ADDOP_JABS(c, JUMP_ABSOLUTE, c->u->u_fblock[i].fb_block);
|
|
break;
|
|
case EXCEPT:
|
|
case FINALLY_TRY:
|
|
while (--i >= 0 && c->u->u_fblock[i].fb_type != LOOP)
|
|
;
|
|
if (i == -1)
|
|
return compiler_error(c, LOOP_ERROR_MSG);
|
|
ADDOP_JABS(c, CONTINUE_LOOP, c->u->u_fblock[i].fb_block);
|
|
break;
|
|
case FINALLY_END:
|
|
return compiler_error(c,
|
|
"'continue' not supported inside 'finally' clause");
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* Code generated for "try: <body> finally: <finalbody>" is as follows:
|
|
|
|
SETUP_FINALLY L
|
|
<code for body>
|
|
POP_BLOCK
|
|
LOAD_CONST <None>
|
|
L: <code for finalbody>
|
|
END_FINALLY
|
|
|
|
The special instructions use the block stack. Each block
|
|
stack entry contains the instruction that created it (here
|
|
SETUP_FINALLY), the level of the value stack at the time the
|
|
block stack entry was created, and a label (here L).
|
|
|
|
SETUP_FINALLY:
|
|
Pushes the current value stack level and the label
|
|
onto the block stack.
|
|
POP_BLOCK:
|
|
Pops en entry from the block stack, and pops the value
|
|
stack until its level is the same as indicated on the
|
|
block stack. (The label is ignored.)
|
|
END_FINALLY:
|
|
Pops a variable number of entries from the *value* stack
|
|
and re-raises the exception they specify. The number of
|
|
entries popped depends on the (pseudo) exception type.
|
|
|
|
The block stack is unwound when an exception is raised:
|
|
when a SETUP_FINALLY entry is found, the exception is pushed
|
|
onto the value stack (and the exception condition is cleared),
|
|
and the interpreter jumps to the label gotten from the block
|
|
stack.
|
|
*/
|
|
|
|
static int
|
|
compiler_try_finally(struct compiler *c, stmt_ty s)
|
|
{
|
|
basicblock *body, *end;
|
|
body = compiler_new_block(c);
|
|
end = compiler_new_block(c);
|
|
if (body == NULL || end == NULL)
|
|
return 0;
|
|
|
|
ADDOP_JREL(c, SETUP_FINALLY, end);
|
|
compiler_use_next_block(c, body);
|
|
if (!compiler_push_fblock(c, FINALLY_TRY, body))
|
|
return 0;
|
|
VISIT_SEQ(c, stmt, s->v.TryFinally.body);
|
|
ADDOP(c, POP_BLOCK);
|
|
compiler_pop_fblock(c, FINALLY_TRY, body);
|
|
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
compiler_use_next_block(c, end);
|
|
if (!compiler_push_fblock(c, FINALLY_END, end))
|
|
return 0;
|
|
VISIT_SEQ(c, stmt, s->v.TryFinally.finalbody);
|
|
ADDOP(c, END_FINALLY);
|
|
compiler_pop_fblock(c, FINALLY_END, end);
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
Code generated for "try: S except E1, V1: S1 except E2, V2: S2 ...":
|
|
(The contents of the value stack is shown in [], with the top
|
|
at the right; 'tb' is trace-back info, 'val' the exception's
|
|
associated value, and 'exc' the exception.)
|
|
|
|
Value stack Label Instruction Argument
|
|
[] SETUP_EXCEPT L1
|
|
[] <code for S>
|
|
[] POP_BLOCK
|
|
[] JUMP_FORWARD L0
|
|
|
|
[tb, val, exc] L1: DUP )
|
|
[tb, val, exc, exc] <evaluate E1> )
|
|
[tb, val, exc, exc, E1] COMPARE_OP EXC_MATCH ) only if E1
|
|
[tb, val, exc, 1-or-0] JUMP_IF_FALSE L2 )
|
|
[tb, val, exc, 1] POP )
|
|
[tb, val, exc] POP
|
|
[tb, val] <assign to V1> (or POP if no V1)
|
|
[tb] POP
|
|
[] <code for S1>
|
|
JUMP_FORWARD L0
|
|
|
|
[tb, val, exc, 0] L2: POP
|
|
[tb, val, exc] DUP
|
|
.............................etc.......................
|
|
|
|
[tb, val, exc, 0] Ln+1: POP
|
|
[tb, val, exc] END_FINALLY # re-raise exception
|
|
|
|
[] L0: <next statement>
|
|
|
|
Of course, parts are not generated if Vi or Ei is not present.
|
|
*/
|
|
static int
|
|
compiler_try_except(struct compiler *c, stmt_ty s)
|
|
{
|
|
basicblock *body, *orelse, *except, *end;
|
|
int i, n;
|
|
|
|
body = compiler_new_block(c);
|
|
except = compiler_new_block(c);
|
|
orelse = compiler_new_block(c);
|
|
end = compiler_new_block(c);
|
|
if (body == NULL || except == NULL || orelse == NULL || end == NULL)
|
|
return 0;
|
|
ADDOP_JREL(c, SETUP_EXCEPT, except);
|
|
compiler_use_next_block(c, body);
|
|
if (!compiler_push_fblock(c, EXCEPT, body))
|
|
return 0;
|
|
VISIT_SEQ(c, stmt, s->v.TryExcept.body);
|
|
ADDOP(c, POP_BLOCK);
|
|
compiler_pop_fblock(c, EXCEPT, body);
|
|
ADDOP_JREL(c, JUMP_FORWARD, orelse);
|
|
n = asdl_seq_LEN(s->v.TryExcept.handlers);
|
|
compiler_use_next_block(c, except);
|
|
for (i = 0; i < n; i++) {
|
|
excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
|
|
s->v.TryExcept.handlers, i);
|
|
if (!handler->type && i < n-1)
|
|
return compiler_error(c, "default 'except:' must be last");
|
|
c->u->u_lineno_set = false;
|
|
c->u->u_lineno = handler->lineno;
|
|
except = compiler_new_block(c);
|
|
if (except == NULL)
|
|
return 0;
|
|
if (handler->type) {
|
|
ADDOP(c, DUP_TOP);
|
|
VISIT(c, expr, handler->type);
|
|
ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, except);
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
ADDOP(c, POP_TOP);
|
|
if (handler->name) {
|
|
VISIT(c, expr, handler->name);
|
|
}
|
|
else {
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
ADDOP(c, POP_TOP);
|
|
VISIT_SEQ(c, stmt, handler->body);
|
|
ADDOP_JREL(c, JUMP_FORWARD, end);
|
|
compiler_use_next_block(c, except);
|
|
if (handler->type)
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
ADDOP(c, END_FINALLY);
|
|
compiler_use_next_block(c, orelse);
|
|
VISIT_SEQ(c, stmt, s->v.TryExcept.orelse);
|
|
compiler_use_next_block(c, end);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_import_as(struct compiler *c, identifier name, identifier asname)
|
|
{
|
|
/* The IMPORT_NAME opcode was already generated. This function
|
|
merely needs to bind the result to a name.
|
|
|
|
If there is a dot in name, we need to split it and emit a
|
|
LOAD_ATTR for each name.
|
|
*/
|
|
const char *src = PyString_AS_STRING(name);
|
|
const char *dot = strchr(src, '.');
|
|
if (dot) {
|
|
/* Consume the base module name to get the first attribute */
|
|
src = dot + 1;
|
|
while (dot) {
|
|
/* NB src is only defined when dot != NULL */
|
|
PyObject *attr;
|
|
dot = strchr(src, '.');
|
|
attr = PyString_FromStringAndSize(src,
|
|
dot ? dot - src : strlen(src));
|
|
if (!attr)
|
|
return -1;
|
|
ADDOP_O(c, LOAD_ATTR, attr, names);
|
|
Py_DECREF(attr);
|
|
src = dot + 1;
|
|
}
|
|
}
|
|
return compiler_nameop(c, asname, Store);
|
|
}
|
|
|
|
static int
|
|
compiler_import(struct compiler *c, stmt_ty s)
|
|
{
|
|
/* The Import node stores a module name like a.b.c as a single
|
|
string. This is convenient for all cases except
|
|
import a.b.c as d
|
|
where we need to parse that string to extract the individual
|
|
module names.
|
|
XXX Perhaps change the representation to make this case simpler?
|
|
*/
|
|
int i, n = asdl_seq_LEN(s->v.Import.names);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
alias_ty alias = (alias_ty)asdl_seq_GET(s->v.Import.names, i);
|
|
int r;
|
|
PyObject *level;
|
|
|
|
level = PyInt_FromLong(0);
|
|
if (level == NULL)
|
|
return 0;
|
|
|
|
ADDOP_O(c, LOAD_CONST, level, consts);
|
|
Py_DECREF(level);
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
ADDOP_NAME(c, IMPORT_NAME, alias->name, names);
|
|
|
|
if (alias->asname) {
|
|
r = compiler_import_as(c, alias->name, alias->asname);
|
|
if (!r)
|
|
return r;
|
|
}
|
|
else {
|
|
identifier tmp = alias->name;
|
|
const char *base = PyString_AS_STRING(alias->name);
|
|
char *dot = strchr(base, '.');
|
|
if (dot)
|
|
tmp = PyString_FromStringAndSize(base,
|
|
dot - base);
|
|
r = compiler_nameop(c, tmp, Store);
|
|
if (dot) {
|
|
Py_DECREF(tmp);
|
|
}
|
|
if (!r)
|
|
return r;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_from_import(struct compiler *c, stmt_ty s)
|
|
{
|
|
int i, n = asdl_seq_LEN(s->v.ImportFrom.names);
|
|
|
|
PyObject *names = PyTuple_New(n);
|
|
PyObject *level;
|
|
|
|
if (!names)
|
|
return 0;
|
|
|
|
level = PyInt_FromLong(s->v.ImportFrom.level);
|
|
if (!level) {
|
|
Py_DECREF(names);
|
|
return 0;
|
|
}
|
|
|
|
/* build up the names */
|
|
for (i = 0; i < n; i++) {
|
|
alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
|
|
Py_INCREF(alias->name);
|
|
PyTuple_SET_ITEM(names, i, alias->name);
|
|
}
|
|
|
|
if (s->lineno > c->c_future->ff_lineno) {
|
|
if (!strcmp(PyString_AS_STRING(s->v.ImportFrom.module),
|
|
"__future__")) {
|
|
Py_DECREF(level);
|
|
Py_DECREF(names);
|
|
return compiler_error(c,
|
|
"from __future__ imports must occur "
|
|
"at the beginning of the file");
|
|
|
|
}
|
|
}
|
|
|
|
ADDOP_O(c, LOAD_CONST, level, consts);
|
|
Py_DECREF(level);
|
|
ADDOP_O(c, LOAD_CONST, names, consts);
|
|
Py_DECREF(names);
|
|
ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
|
|
for (i = 0; i < n; i++) {
|
|
alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
|
|
identifier store_name;
|
|
|
|
if (i == 0 && *PyString_AS_STRING(alias->name) == '*') {
|
|
assert(n == 1);
|
|
ADDOP(c, IMPORT_STAR);
|
|
return 1;
|
|
}
|
|
|
|
ADDOP_NAME(c, IMPORT_FROM, alias->name, names);
|
|
store_name = alias->name;
|
|
if (alias->asname)
|
|
store_name = alias->asname;
|
|
|
|
if (!compiler_nameop(c, store_name, Store)) {
|
|
Py_DECREF(names);
|
|
return 0;
|
|
}
|
|
}
|
|
/* remove imported module */
|
|
ADDOP(c, POP_TOP);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_assert(struct compiler *c, stmt_ty s)
|
|
{
|
|
static PyObject *assertion_error = NULL;
|
|
basicblock *end;
|
|
|
|
if (Py_OptimizeFlag)
|
|
return 1;
|
|
if (assertion_error == NULL) {
|
|
assertion_error = PyString_FromString("AssertionError");
|
|
if (assertion_error == NULL)
|
|
return 0;
|
|
}
|
|
VISIT(c, expr, s->v.Assert.test);
|
|
end = compiler_new_block(c);
|
|
if (end == NULL)
|
|
return 0;
|
|
ADDOP_JREL(c, JUMP_IF_TRUE, end);
|
|
ADDOP(c, POP_TOP);
|
|
ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);
|
|
if (s->v.Assert.msg) {
|
|
VISIT(c, expr, s->v.Assert.msg);
|
|
ADDOP_I(c, RAISE_VARARGS, 2);
|
|
}
|
|
else {
|
|
ADDOP_I(c, RAISE_VARARGS, 1);
|
|
}
|
|
compiler_use_next_block(c, end);
|
|
ADDOP(c, POP_TOP);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_stmt(struct compiler *c, stmt_ty s)
|
|
{
|
|
int i, n;
|
|
|
|
/* Always assign a lineno to the next instruction for a stmt. */
|
|
c->u->u_lineno = s->lineno;
|
|
c->u->u_lineno_set = false;
|
|
|
|
switch (s->kind) {
|
|
case FunctionDef_kind:
|
|
return compiler_function(c, s);
|
|
case ClassDef_kind:
|
|
return compiler_class(c, s);
|
|
case Return_kind:
|
|
if (c->u->u_ste->ste_type != FunctionBlock)
|
|
return compiler_error(c, "'return' outside function");
|
|
if (s->v.Return.value) {
|
|
VISIT(c, expr, s->v.Return.value);
|
|
}
|
|
else
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
ADDOP(c, RETURN_VALUE);
|
|
break;
|
|
case Delete_kind:
|
|
VISIT_SEQ(c, expr, s->v.Delete.targets)
|
|
break;
|
|
case Assign_kind:
|
|
n = asdl_seq_LEN(s->v.Assign.targets);
|
|
VISIT(c, expr, s->v.Assign.value);
|
|
for (i = 0; i < n; i++) {
|
|
if (i < n - 1)
|
|
ADDOP(c, DUP_TOP);
|
|
VISIT(c, expr,
|
|
(expr_ty)asdl_seq_GET(s->v.Assign.targets, i));
|
|
}
|
|
break;
|
|
case AugAssign_kind:
|
|
return compiler_augassign(c, s);
|
|
case Print_kind:
|
|
return compiler_print(c, s);
|
|
case For_kind:
|
|
return compiler_for(c, s);
|
|
case While_kind:
|
|
return compiler_while(c, s);
|
|
case If_kind:
|
|
return compiler_if(c, s);
|
|
case Raise_kind:
|
|
n = 0;
|
|
if (s->v.Raise.type) {
|
|
VISIT(c, expr, s->v.Raise.type);
|
|
n++;
|
|
if (s->v.Raise.inst) {
|
|
VISIT(c, expr, s->v.Raise.inst);
|
|
n++;
|
|
if (s->v.Raise.tback) {
|
|
VISIT(c, expr, s->v.Raise.tback);
|
|
n++;
|
|
}
|
|
}
|
|
}
|
|
ADDOP_I(c, RAISE_VARARGS, n);
|
|
break;
|
|
case TryExcept_kind:
|
|
return compiler_try_except(c, s);
|
|
case TryFinally_kind:
|
|
return compiler_try_finally(c, s);
|
|
case Assert_kind:
|
|
return compiler_assert(c, s);
|
|
case Import_kind:
|
|
return compiler_import(c, s);
|
|
case ImportFrom_kind:
|
|
return compiler_from_import(c, s);
|
|
case Exec_kind:
|
|
VISIT(c, expr, s->v.Exec.body);
|
|
if (s->v.Exec.globals) {
|
|
VISIT(c, expr, s->v.Exec.globals);
|
|
if (s->v.Exec.locals) {
|
|
VISIT(c, expr, s->v.Exec.locals);
|
|
} else {
|
|
ADDOP(c, DUP_TOP);
|
|
}
|
|
} else {
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
ADDOP(c, DUP_TOP);
|
|
}
|
|
ADDOP(c, EXEC_STMT);
|
|
break;
|
|
case Global_kind:
|
|
break;
|
|
case Expr_kind:
|
|
if (c->c_interactive && c->c_nestlevel <= 1) {
|
|
VISIT(c, expr, s->v.Expr.value);
|
|
ADDOP(c, PRINT_EXPR);
|
|
}
|
|
else if (s->v.Expr.value->kind != Str_kind &&
|
|
s->v.Expr.value->kind != Num_kind) {
|
|
VISIT(c, expr, s->v.Expr.value);
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
break;
|
|
case Pass_kind:
|
|
break;
|
|
case Break_kind:
|
|
if (!c->u->u_nfblocks)
|
|
return compiler_error(c, "'break' outside loop");
|
|
ADDOP(c, BREAK_LOOP);
|
|
break;
|
|
case Continue_kind:
|
|
return compiler_continue(c);
|
|
case With_kind:
|
|
return compiler_with(c, s);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
unaryop(unaryop_ty op)
|
|
{
|
|
switch (op) {
|
|
case Invert:
|
|
return UNARY_INVERT;
|
|
case Not:
|
|
return UNARY_NOT;
|
|
case UAdd:
|
|
return UNARY_POSITIVE;
|
|
case USub:
|
|
return UNARY_NEGATIVE;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
binop(struct compiler *c, operator_ty op)
|
|
{
|
|
switch (op) {
|
|
case Add:
|
|
return BINARY_ADD;
|
|
case Sub:
|
|
return BINARY_SUBTRACT;
|
|
case Mult:
|
|
return BINARY_MULTIPLY;
|
|
case Div:
|
|
return BINARY_TRUE_DIVIDE;
|
|
case Mod:
|
|
return BINARY_MODULO;
|
|
case Pow:
|
|
return BINARY_POWER;
|
|
case LShift:
|
|
return BINARY_LSHIFT;
|
|
case RShift:
|
|
return BINARY_RSHIFT;
|
|
case BitOr:
|
|
return BINARY_OR;
|
|
case BitXor:
|
|
return BINARY_XOR;
|
|
case BitAnd:
|
|
return BINARY_AND;
|
|
case FloorDiv:
|
|
return BINARY_FLOOR_DIVIDE;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
cmpop(cmpop_ty op)
|
|
{
|
|
switch (op) {
|
|
case Eq:
|
|
return PyCmp_EQ;
|
|
case NotEq:
|
|
return PyCmp_NE;
|
|
case Lt:
|
|
return PyCmp_LT;
|
|
case LtE:
|
|
return PyCmp_LE;
|
|
case Gt:
|
|
return PyCmp_GT;
|
|
case GtE:
|
|
return PyCmp_GE;
|
|
case Is:
|
|
return PyCmp_IS;
|
|
case IsNot:
|
|
return PyCmp_IS_NOT;
|
|
case In:
|
|
return PyCmp_IN;
|
|
case NotIn:
|
|
return PyCmp_NOT_IN;
|
|
}
|
|
return PyCmp_BAD;
|
|
}
|
|
|
|
static int
|
|
inplace_binop(struct compiler *c, operator_ty op)
|
|
{
|
|
switch (op) {
|
|
case Add:
|
|
return INPLACE_ADD;
|
|
case Sub:
|
|
return INPLACE_SUBTRACT;
|
|
case Mult:
|
|
return INPLACE_MULTIPLY;
|
|
case Div:
|
|
return INPLACE_TRUE_DIVIDE;
|
|
case Mod:
|
|
return INPLACE_MODULO;
|
|
case Pow:
|
|
return INPLACE_POWER;
|
|
case LShift:
|
|
return INPLACE_LSHIFT;
|
|
case RShift:
|
|
return INPLACE_RSHIFT;
|
|
case BitOr:
|
|
return INPLACE_OR;
|
|
case BitXor:
|
|
return INPLACE_XOR;
|
|
case BitAnd:
|
|
return INPLACE_AND;
|
|
case FloorDiv:
|
|
return INPLACE_FLOOR_DIVIDE;
|
|
}
|
|
PyErr_Format(PyExc_SystemError,
|
|
"inplace binary op %d should not be possible", op);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
|
|
{
|
|
int op, scope, arg;
|
|
enum { OP_FAST, OP_GLOBAL, OP_DEREF, OP_NAME } optype;
|
|
|
|
PyObject *dict = c->u->u_names;
|
|
PyObject *mangled;
|
|
/* XXX AugStore isn't used anywhere! */
|
|
|
|
/* First check for assignment to __debug__. Param? */
|
|
if ((ctx == Store || ctx == AugStore || ctx == Del)
|
|
&& !strcmp(PyString_AS_STRING(name), "__debug__")) {
|
|
return compiler_error(c, "can not assign to __debug__");
|
|
}
|
|
|
|
mangled = _Py_Mangle(c->u->u_private, name);
|
|
if (!mangled)
|
|
return 0;
|
|
|
|
op = 0;
|
|
optype = OP_NAME;
|
|
scope = PyST_GetScope(c->u->u_ste, mangled);
|
|
switch (scope) {
|
|
case FREE:
|
|
dict = c->u->u_freevars;
|
|
optype = OP_DEREF;
|
|
break;
|
|
case CELL:
|
|
dict = c->u->u_cellvars;
|
|
optype = OP_DEREF;
|
|
break;
|
|
case LOCAL:
|
|
if (c->u->u_ste->ste_type == FunctionBlock)
|
|
optype = OP_FAST;
|
|
break;
|
|
case GLOBAL_IMPLICIT:
|
|
if (c->u->u_ste->ste_type == FunctionBlock &&
|
|
!c->u->u_ste->ste_unoptimized)
|
|
optype = OP_GLOBAL;
|
|
break;
|
|
case GLOBAL_EXPLICIT:
|
|
optype = OP_GLOBAL;
|
|
break;
|
|
default:
|
|
/* scope can be 0 */
|
|
break;
|
|
}
|
|
|
|
/* XXX Leave assert here, but handle __doc__ and the like better */
|
|
assert(scope || PyString_AS_STRING(name)[0] == '_');
|
|
|
|
switch (optype) {
|
|
case OP_DEREF:
|
|
switch (ctx) {
|
|
case Load: op = LOAD_DEREF; break;
|
|
case Store: op = STORE_DEREF; break;
|
|
case AugLoad:
|
|
case AugStore:
|
|
break;
|
|
case Del:
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
"can not delete variable '%s' referenced "
|
|
"in nested scope",
|
|
PyString_AS_STRING(name));
|
|
Py_DECREF(mangled);
|
|
return 0;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid for deref variable");
|
|
return 0;
|
|
}
|
|
break;
|
|
case OP_FAST:
|
|
switch (ctx) {
|
|
case Load: op = LOAD_FAST; break;
|
|
case Store: op = STORE_FAST; break;
|
|
case Del: op = DELETE_FAST; break;
|
|
case AugLoad:
|
|
case AugStore:
|
|
break;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid for local variable");
|
|
return 0;
|
|
}
|
|
ADDOP_O(c, op, mangled, varnames);
|
|
Py_DECREF(mangled);
|
|
return 1;
|
|
case OP_GLOBAL:
|
|
switch (ctx) {
|
|
case Load: op = LOAD_GLOBAL; break;
|
|
case Store: op = STORE_GLOBAL; break;
|
|
case Del: op = DELETE_GLOBAL; break;
|
|
case AugLoad:
|
|
case AugStore:
|
|
break;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid for global variable");
|
|
return 0;
|
|
}
|
|
break;
|
|
case OP_NAME:
|
|
switch (ctx) {
|
|
case Load: op = LOAD_NAME; break;
|
|
case Store: op = STORE_NAME; break;
|
|
case Del: op = DELETE_NAME; break;
|
|
case AugLoad:
|
|
case AugStore:
|
|
break;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid for name variable");
|
|
return 0;
|
|
}
|
|
break;
|
|
}
|
|
|
|
assert(op);
|
|
arg = compiler_add_o(c, dict, mangled);
|
|
Py_DECREF(mangled);
|
|
if (arg < 0)
|
|
return 0;
|
|
return compiler_addop_i(c, op, arg);
|
|
}
|
|
|
|
static int
|
|
compiler_boolop(struct compiler *c, expr_ty e)
|
|
{
|
|
basicblock *end;
|
|
int jumpi, i, n;
|
|
asdl_seq *s;
|
|
|
|
assert(e->kind == BoolOp_kind);
|
|
if (e->v.BoolOp.op == And)
|
|
jumpi = JUMP_IF_FALSE;
|
|
else
|
|
jumpi = JUMP_IF_TRUE;
|
|
end = compiler_new_block(c);
|
|
if (end == NULL)
|
|
return 0;
|
|
s = e->v.BoolOp.values;
|
|
n = asdl_seq_LEN(s) - 1;
|
|
assert(n >= 0);
|
|
for (i = 0; i < n; ++i) {
|
|
VISIT(c, expr, (expr_ty)asdl_seq_GET(s, i));
|
|
ADDOP_JREL(c, jumpi, end);
|
|
ADDOP(c, POP_TOP)
|
|
}
|
|
VISIT(c, expr, (expr_ty)asdl_seq_GET(s, n));
|
|
compiler_use_next_block(c, end);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_list(struct compiler *c, expr_ty e)
|
|
{
|
|
int n = asdl_seq_LEN(e->v.List.elts);
|
|
if (e->v.List.ctx == Store) {
|
|
ADDOP_I(c, UNPACK_SEQUENCE, n);
|
|
}
|
|
VISIT_SEQ(c, expr, e->v.List.elts);
|
|
if (e->v.List.ctx == Load) {
|
|
ADDOP_I(c, BUILD_LIST, n);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_tuple(struct compiler *c, expr_ty e)
|
|
{
|
|
int n = asdl_seq_LEN(e->v.Tuple.elts);
|
|
if (e->v.Tuple.ctx == Store) {
|
|
ADDOP_I(c, UNPACK_SEQUENCE, n);
|
|
}
|
|
VISIT_SEQ(c, expr, e->v.Tuple.elts);
|
|
if (e->v.Tuple.ctx == Load) {
|
|
ADDOP_I(c, BUILD_TUPLE, n);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_compare(struct compiler *c, expr_ty e)
|
|
{
|
|
int i, n;
|
|
basicblock *cleanup = NULL;
|
|
|
|
/* XXX the logic can be cleaned up for 1 or multiple comparisons */
|
|
VISIT(c, expr, e->v.Compare.left);
|
|
n = asdl_seq_LEN(e->v.Compare.ops);
|
|
assert(n > 0);
|
|
if (n > 1) {
|
|
cleanup = compiler_new_block(c);
|
|
if (cleanup == NULL)
|
|
return 0;
|
|
VISIT(c, expr,
|
|
(expr_ty)asdl_seq_GET(e->v.Compare.comparators, 0));
|
|
}
|
|
for (i = 1; i < n; i++) {
|
|
ADDOP(c, DUP_TOP);
|
|
ADDOP(c, ROT_THREE);
|
|
ADDOP_I(c, COMPARE_OP,
|
|
cmpop((cmpop_ty)(asdl_seq_GET(
|
|
e->v.Compare.ops, i - 1))));
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, cleanup);
|
|
NEXT_BLOCK(c);
|
|
ADDOP(c, POP_TOP);
|
|
if (i < (n - 1))
|
|
VISIT(c, expr,
|
|
(expr_ty)asdl_seq_GET(e->v.Compare.comparators, i));
|
|
}
|
|
VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n - 1));
|
|
ADDOP_I(c, COMPARE_OP,
|
|
cmpop((cmpop_ty)(asdl_seq_GET(e->v.Compare.ops, n - 1))));
|
|
if (n > 1) {
|
|
basicblock *end = compiler_new_block(c);
|
|
if (end == NULL)
|
|
return 0;
|
|
ADDOP_JREL(c, JUMP_FORWARD, end);
|
|
compiler_use_next_block(c, cleanup);
|
|
ADDOP(c, ROT_TWO);
|
|
ADDOP(c, POP_TOP);
|
|
compiler_use_next_block(c, end);
|
|
}
|
|
return 1;
|
|
}
|
|
#undef CMPCAST
|
|
|
|
static int
|
|
compiler_call(struct compiler *c, expr_ty e)
|
|
{
|
|
int n, code = 0;
|
|
|
|
VISIT(c, expr, e->v.Call.func);
|
|
n = asdl_seq_LEN(e->v.Call.args);
|
|
VISIT_SEQ(c, expr, e->v.Call.args);
|
|
if (e->v.Call.keywords) {
|
|
VISIT_SEQ(c, keyword, e->v.Call.keywords);
|
|
n |= asdl_seq_LEN(e->v.Call.keywords) << 8;
|
|
}
|
|
if (e->v.Call.starargs) {
|
|
VISIT(c, expr, e->v.Call.starargs);
|
|
code |= 1;
|
|
}
|
|
if (e->v.Call.kwargs) {
|
|
VISIT(c, expr, e->v.Call.kwargs);
|
|
code |= 2;
|
|
}
|
|
switch (code) {
|
|
case 0:
|
|
ADDOP_I(c, CALL_FUNCTION, n);
|
|
break;
|
|
case 1:
|
|
ADDOP_I(c, CALL_FUNCTION_VAR, n);
|
|
break;
|
|
case 2:
|
|
ADDOP_I(c, CALL_FUNCTION_KW, n);
|
|
break;
|
|
case 3:
|
|
ADDOP_I(c, CALL_FUNCTION_VAR_KW, n);
|
|
break;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_listcomp_generator(struct compiler *c, PyObject *tmpname,
|
|
asdl_seq *generators, int gen_index,
|
|
expr_ty elt)
|
|
{
|
|
/* generate code for the iterator, then each of the ifs,
|
|
and then write to the element */
|
|
|
|
comprehension_ty l;
|
|
basicblock *start, *anchor, *skip, *if_cleanup;
|
|
int i, n;
|
|
|
|
start = compiler_new_block(c);
|
|
skip = compiler_new_block(c);
|
|
if_cleanup = compiler_new_block(c);
|
|
anchor = compiler_new_block(c);
|
|
|
|
if (start == NULL || skip == NULL || if_cleanup == NULL ||
|
|
anchor == NULL)
|
|
return 0;
|
|
|
|
l = (comprehension_ty)asdl_seq_GET(generators, gen_index);
|
|
VISIT(c, expr, l->iter);
|
|
ADDOP(c, GET_ITER);
|
|
compiler_use_next_block(c, start);
|
|
ADDOP_JREL(c, FOR_ITER, anchor);
|
|
NEXT_BLOCK(c);
|
|
VISIT(c, expr, l->target);
|
|
|
|
/* XXX this needs to be cleaned up...a lot! */
|
|
n = asdl_seq_LEN(l->ifs);
|
|
for (i = 0; i < n; i++) {
|
|
expr_ty e = (expr_ty)asdl_seq_GET(l->ifs, i);
|
|
VISIT(c, expr, e);
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
|
|
NEXT_BLOCK(c);
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
|
|
if (++gen_index < asdl_seq_LEN(generators))
|
|
if (!compiler_listcomp_generator(c, tmpname,
|
|
generators, gen_index, elt))
|
|
return 0;
|
|
|
|
/* only append after the last for generator */
|
|
if (gen_index >= asdl_seq_LEN(generators)) {
|
|
if (!compiler_nameop(c, tmpname, Load))
|
|
return 0;
|
|
VISIT(c, expr, elt);
|
|
ADDOP(c, LIST_APPEND);
|
|
|
|
compiler_use_next_block(c, skip);
|
|
}
|
|
for (i = 0; i < n; i++) {
|
|
ADDOP_I(c, JUMP_FORWARD, 1);
|
|
if (i == 0)
|
|
compiler_use_next_block(c, if_cleanup);
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
ADDOP_JABS(c, JUMP_ABSOLUTE, start);
|
|
compiler_use_next_block(c, anchor);
|
|
/* delete the append method added to locals */
|
|
if (gen_index == 1)
|
|
if (!compiler_nameop(c, tmpname, Del))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_listcomp(struct compiler *c, expr_ty e)
|
|
{
|
|
identifier tmp;
|
|
int rc = 0;
|
|
static identifier append;
|
|
asdl_seq *generators = e->v.ListComp.generators;
|
|
|
|
assert(e->kind == ListComp_kind);
|
|
if (!append) {
|
|
append = PyString_InternFromString("append");
|
|
if (!append)
|
|
return 0;
|
|
}
|
|
tmp = compiler_new_tmpname(c);
|
|
if (!tmp)
|
|
return 0;
|
|
ADDOP_I(c, BUILD_LIST, 0);
|
|
ADDOP(c, DUP_TOP);
|
|
if (compiler_nameop(c, tmp, Store))
|
|
rc = compiler_listcomp_generator(c, tmp, generators, 0,
|
|
e->v.ListComp.elt);
|
|
Py_DECREF(tmp);
|
|
return rc;
|
|
}
|
|
|
|
static int
|
|
compiler_genexp_generator(struct compiler *c,
|
|
asdl_seq *generators, int gen_index,
|
|
expr_ty elt)
|
|
{
|
|
/* generate code for the iterator, then each of the ifs,
|
|
and then write to the element */
|
|
|
|
comprehension_ty ge;
|
|
basicblock *start, *anchor, *skip, *if_cleanup, *end;
|
|
int i, n;
|
|
|
|
start = compiler_new_block(c);
|
|
skip = compiler_new_block(c);
|
|
if_cleanup = compiler_new_block(c);
|
|
anchor = compiler_new_block(c);
|
|
end = compiler_new_block(c);
|
|
|
|
if (start == NULL || skip == NULL || if_cleanup == NULL ||
|
|
anchor == NULL || end == NULL)
|
|
return 0;
|
|
|
|
ge = (comprehension_ty)asdl_seq_GET(generators, gen_index);
|
|
ADDOP_JREL(c, SETUP_LOOP, end);
|
|
if (!compiler_push_fblock(c, LOOP, start))
|
|
return 0;
|
|
|
|
if (gen_index == 0) {
|
|
/* Receive outermost iter as an implicit argument */
|
|
c->u->u_argcount = 1;
|
|
ADDOP_I(c, LOAD_FAST, 0);
|
|
}
|
|
else {
|
|
/* Sub-iter - calculate on the fly */
|
|
VISIT(c, expr, ge->iter);
|
|
ADDOP(c, GET_ITER);
|
|
}
|
|
compiler_use_next_block(c, start);
|
|
ADDOP_JREL(c, FOR_ITER, anchor);
|
|
NEXT_BLOCK(c);
|
|
VISIT(c, expr, ge->target);
|
|
|
|
/* XXX this needs to be cleaned up...a lot! */
|
|
n = asdl_seq_LEN(ge->ifs);
|
|
for (i = 0; i < n; i++) {
|
|
expr_ty e = (expr_ty)asdl_seq_GET(ge->ifs, i);
|
|
VISIT(c, expr, e);
|
|
ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
|
|
NEXT_BLOCK(c);
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
|
|
if (++gen_index < asdl_seq_LEN(generators))
|
|
if (!compiler_genexp_generator(c, generators, gen_index, elt))
|
|
return 0;
|
|
|
|
/* only append after the last 'for' generator */
|
|
if (gen_index >= asdl_seq_LEN(generators)) {
|
|
VISIT(c, expr, elt);
|
|
ADDOP(c, YIELD_VALUE);
|
|
ADDOP(c, POP_TOP);
|
|
|
|
compiler_use_next_block(c, skip);
|
|
}
|
|
for (i = 0; i < n; i++) {
|
|
ADDOP_I(c, JUMP_FORWARD, 1);
|
|
if (i == 0)
|
|
compiler_use_next_block(c, if_cleanup);
|
|
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
ADDOP_JABS(c, JUMP_ABSOLUTE, start);
|
|
compiler_use_next_block(c, anchor);
|
|
ADDOP(c, POP_BLOCK);
|
|
compiler_pop_fblock(c, LOOP, start);
|
|
compiler_use_next_block(c, end);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_genexp(struct compiler *c, expr_ty e)
|
|
{
|
|
static identifier name;
|
|
PyCodeObject *co;
|
|
expr_ty outermost_iter = ((comprehension_ty)
|
|
(asdl_seq_GET(e->v.GeneratorExp.generators,
|
|
0)))->iter;
|
|
|
|
if (!name) {
|
|
name = PyString_FromString("<genexpr>");
|
|
if (!name)
|
|
return 0;
|
|
}
|
|
|
|
if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
|
|
return 0;
|
|
compiler_genexp_generator(c, e->v.GeneratorExp.generators, 0,
|
|
e->v.GeneratorExp.elt);
|
|
co = assemble(c, 1);
|
|
compiler_exit_scope(c);
|
|
if (co == NULL)
|
|
return 0;
|
|
|
|
compiler_make_closure(c, co, 0);
|
|
Py_DECREF(co);
|
|
|
|
VISIT(c, expr, outermost_iter);
|
|
ADDOP(c, GET_ITER);
|
|
ADDOP_I(c, CALL_FUNCTION, 1);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_keyword(struct compiler *c, keyword_ty k)
|
|
{
|
|
ADDOP_O(c, LOAD_CONST, k->arg, consts);
|
|
VISIT(c, expr, k->value);
|
|
return 1;
|
|
}
|
|
|
|
/* Test whether expression is constant. For constants, report
|
|
whether they are true or false.
|
|
|
|
Return values: 1 for true, 0 for false, -1 for non-constant.
|
|
*/
|
|
|
|
static int
|
|
expr_constant(expr_ty e)
|
|
{
|
|
switch (e->kind) {
|
|
case Num_kind:
|
|
return PyObject_IsTrue(e->v.Num.n);
|
|
case Str_kind:
|
|
return PyObject_IsTrue(e->v.Str.s);
|
|
case Name_kind:
|
|
/* __debug__ is not assignable, so we can optimize
|
|
* it away in if and while statements */
|
|
if (strcmp(PyString_AS_STRING(e->v.Name.id),
|
|
"__debug__") == 0)
|
|
return ! Py_OptimizeFlag;
|
|
/* fall through */
|
|
default:
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/*
|
|
Implements the with statement from PEP 343.
|
|
|
|
The semantics outlined in that PEP are as follows:
|
|
|
|
with EXPR as VAR:
|
|
BLOCK
|
|
|
|
It is implemented roughly as:
|
|
|
|
context = EXPR
|
|
exit = context.__exit__ # not calling it
|
|
value = context.__enter__()
|
|
try:
|
|
VAR = value # if VAR present in the syntax
|
|
BLOCK
|
|
finally:
|
|
if an exception was raised:
|
|
exc = copy of (exception, instance, traceback)
|
|
else:
|
|
exc = (None, None, None)
|
|
exit(*exc)
|
|
*/
|
|
static int
|
|
compiler_with(struct compiler *c, stmt_ty s)
|
|
{
|
|
static identifier enter_attr, exit_attr;
|
|
basicblock *block, *finally;
|
|
identifier tmpexit, tmpvalue = NULL;
|
|
|
|
assert(s->kind == With_kind);
|
|
|
|
if (!enter_attr) {
|
|
enter_attr = PyString_InternFromString("__enter__");
|
|
if (!enter_attr)
|
|
return 0;
|
|
}
|
|
if (!exit_attr) {
|
|
exit_attr = PyString_InternFromString("__exit__");
|
|
if (!exit_attr)
|
|
return 0;
|
|
}
|
|
|
|
block = compiler_new_block(c);
|
|
finally = compiler_new_block(c);
|
|
if (!block || !finally)
|
|
return 0;
|
|
|
|
/* Create a temporary variable to hold context.__exit__ */
|
|
tmpexit = compiler_new_tmpname(c);
|
|
if (tmpexit == NULL)
|
|
return 0;
|
|
PyArena_AddPyObject(c->c_arena, tmpexit);
|
|
|
|
if (s->v.With.optional_vars) {
|
|
/* Create a temporary variable to hold context.__enter__().
|
|
We need to do this rather than preserving it on the stack
|
|
because SETUP_FINALLY remembers the stack level.
|
|
We need to do the assignment *inside* the try/finally
|
|
so that context.__exit__() is called when the assignment
|
|
fails. But we need to call context.__enter__() *before*
|
|
the try/finally so that if it fails we won't call
|
|
context.__exit__().
|
|
*/
|
|
tmpvalue = compiler_new_tmpname(c);
|
|
if (tmpvalue == NULL)
|
|
return 0;
|
|
PyArena_AddPyObject(c->c_arena, tmpvalue);
|
|
}
|
|
|
|
/* Evaluate EXPR */
|
|
VISIT(c, expr, s->v.With.context_expr);
|
|
|
|
/* Squirrel away context.__exit__ */
|
|
ADDOP(c, DUP_TOP);
|
|
ADDOP_O(c, LOAD_ATTR, exit_attr, names);
|
|
if (!compiler_nameop(c, tmpexit, Store))
|
|
return 0;
|
|
|
|
/* Call context.__enter__() */
|
|
ADDOP_O(c, LOAD_ATTR, enter_attr, names);
|
|
ADDOP_I(c, CALL_FUNCTION, 0);
|
|
|
|
if (s->v.With.optional_vars) {
|
|
/* Store it in tmpvalue */
|
|
if (!compiler_nameop(c, tmpvalue, Store))
|
|
return 0;
|
|
}
|
|
else {
|
|
/* Discard result from context.__enter__() */
|
|
ADDOP(c, POP_TOP);
|
|
}
|
|
|
|
/* Start the try block */
|
|
ADDOP_JREL(c, SETUP_FINALLY, finally);
|
|
|
|
compiler_use_next_block(c, block);
|
|
if (!compiler_push_fblock(c, FINALLY_TRY, block)) {
|
|
return 0;
|
|
}
|
|
|
|
if (s->v.With.optional_vars) {
|
|
/* Bind saved result of context.__enter__() to VAR */
|
|
if (!compiler_nameop(c, tmpvalue, Load) ||
|
|
!compiler_nameop(c, tmpvalue, Del))
|
|
return 0;
|
|
VISIT(c, expr, s->v.With.optional_vars);
|
|
}
|
|
|
|
/* BLOCK code */
|
|
VISIT_SEQ(c, stmt, s->v.With.body);
|
|
|
|
/* End of try block; start the finally block */
|
|
ADDOP(c, POP_BLOCK);
|
|
compiler_pop_fblock(c, FINALLY_TRY, block);
|
|
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
compiler_use_next_block(c, finally);
|
|
if (!compiler_push_fblock(c, FINALLY_END, finally))
|
|
return 0;
|
|
|
|
/* Finally block starts; push tmpexit and issue our magic opcode. */
|
|
if (!compiler_nameop(c, tmpexit, Load) ||
|
|
!compiler_nameop(c, tmpexit, Del))
|
|
return 0;
|
|
ADDOP(c, WITH_CLEANUP);
|
|
|
|
/* Finally block ends. */
|
|
ADDOP(c, END_FINALLY);
|
|
compiler_pop_fblock(c, FINALLY_END, finally);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_expr(struct compiler *c, expr_ty e)
|
|
{
|
|
int i, n;
|
|
|
|
/* If expr e has a different line number than the last expr/stmt,
|
|
set a new line number for the next instruction.
|
|
*/
|
|
if (e->lineno > c->u->u_lineno) {
|
|
c->u->u_lineno = e->lineno;
|
|
c->u->u_lineno_set = false;
|
|
}
|
|
switch (e->kind) {
|
|
case BoolOp_kind:
|
|
return compiler_boolop(c, e);
|
|
case BinOp_kind:
|
|
VISIT(c, expr, e->v.BinOp.left);
|
|
VISIT(c, expr, e->v.BinOp.right);
|
|
ADDOP(c, binop(c, e->v.BinOp.op));
|
|
break;
|
|
case UnaryOp_kind:
|
|
VISIT(c, expr, e->v.UnaryOp.operand);
|
|
ADDOP(c, unaryop(e->v.UnaryOp.op));
|
|
break;
|
|
case Lambda_kind:
|
|
return compiler_lambda(c, e);
|
|
case IfExp_kind:
|
|
return compiler_ifexp(c, e);
|
|
case Dict_kind:
|
|
/* XXX get rid of arg? */
|
|
ADDOP_I(c, BUILD_MAP, 0);
|
|
n = asdl_seq_LEN(e->v.Dict.values);
|
|
/* We must arrange things just right for STORE_SUBSCR.
|
|
It wants the stack to look like (value) (dict) (key) */
|
|
for (i = 0; i < n; i++) {
|
|
ADDOP(c, DUP_TOP);
|
|
VISIT(c, expr,
|
|
(expr_ty)asdl_seq_GET(e->v.Dict.values, i));
|
|
ADDOP(c, ROT_TWO);
|
|
VISIT(c, expr,
|
|
(expr_ty)asdl_seq_GET(e->v.Dict.keys, i));
|
|
ADDOP(c, STORE_SUBSCR);
|
|
}
|
|
break;
|
|
case ListComp_kind:
|
|
return compiler_listcomp(c, e);
|
|
case GeneratorExp_kind:
|
|
return compiler_genexp(c, e);
|
|
case Yield_kind:
|
|
if (c->u->u_ste->ste_type != FunctionBlock)
|
|
return compiler_error(c, "'yield' outside function");
|
|
/*
|
|
for (i = 0; i < c->u->u_nfblocks; i++) {
|
|
if (c->u->u_fblock[i].fb_type == FINALLY_TRY)
|
|
return compiler_error(
|
|
c, "'yield' not allowed in a 'try' "
|
|
"block with a 'finally' clause");
|
|
}
|
|
*/
|
|
if (e->v.Yield.value) {
|
|
VISIT(c, expr, e->v.Yield.value);
|
|
}
|
|
else {
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
}
|
|
ADDOP(c, YIELD_VALUE);
|
|
break;
|
|
case Compare_kind:
|
|
return compiler_compare(c, e);
|
|
case Call_kind:
|
|
return compiler_call(c, e);
|
|
case Repr_kind:
|
|
VISIT(c, expr, e->v.Repr.value);
|
|
ADDOP(c, UNARY_CONVERT);
|
|
break;
|
|
case Num_kind:
|
|
ADDOP_O(c, LOAD_CONST, e->v.Num.n, consts);
|
|
break;
|
|
case Str_kind:
|
|
ADDOP_O(c, LOAD_CONST, e->v.Str.s, consts);
|
|
break;
|
|
/* The following exprs can be assignment targets. */
|
|
case Attribute_kind:
|
|
if (e->v.Attribute.ctx != AugStore)
|
|
VISIT(c, expr, e->v.Attribute.value);
|
|
switch (e->v.Attribute.ctx) {
|
|
case AugLoad:
|
|
ADDOP(c, DUP_TOP);
|
|
/* Fall through to load */
|
|
case Load:
|
|
ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
|
|
break;
|
|
case AugStore:
|
|
ADDOP(c, ROT_TWO);
|
|
/* Fall through to save */
|
|
case Store:
|
|
ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
|
|
break;
|
|
case Del:
|
|
ADDOP_NAME(c, DELETE_ATTR, e->v.Attribute.attr, names);
|
|
break;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid in attribute expression");
|
|
return 0;
|
|
}
|
|
break;
|
|
case Subscript_kind:
|
|
switch (e->v.Subscript.ctx) {
|
|
case AugLoad:
|
|
VISIT(c, expr, e->v.Subscript.value);
|
|
VISIT_SLICE(c, e->v.Subscript.slice, AugLoad);
|
|
break;
|
|
case Load:
|
|
VISIT(c, expr, e->v.Subscript.value);
|
|
VISIT_SLICE(c, e->v.Subscript.slice, Load);
|
|
break;
|
|
case AugStore:
|
|
VISIT_SLICE(c, e->v.Subscript.slice, AugStore);
|
|
break;
|
|
case Store:
|
|
VISIT(c, expr, e->v.Subscript.value);
|
|
VISIT_SLICE(c, e->v.Subscript.slice, Store);
|
|
break;
|
|
case Del:
|
|
VISIT(c, expr, e->v.Subscript.value);
|
|
VISIT_SLICE(c, e->v.Subscript.slice, Del);
|
|
break;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid in subscript expression");
|
|
return 0;
|
|
}
|
|
break;
|
|
case Name_kind:
|
|
return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx);
|
|
/* child nodes of List and Tuple will have expr_context set */
|
|
case List_kind:
|
|
return compiler_list(c, e);
|
|
case Tuple_kind:
|
|
return compiler_tuple(c, e);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_augassign(struct compiler *c, stmt_ty s)
|
|
{
|
|
expr_ty e = s->v.AugAssign.target;
|
|
expr_ty auge;
|
|
|
|
assert(s->kind == AugAssign_kind);
|
|
|
|
switch (e->kind) {
|
|
case Attribute_kind:
|
|
auge = Attribute(e->v.Attribute.value, e->v.Attribute.attr,
|
|
AugLoad, e->lineno, e->col_offset, c->c_arena);
|
|
if (auge == NULL)
|
|
return 0;
|
|
VISIT(c, expr, auge);
|
|
VISIT(c, expr, s->v.AugAssign.value);
|
|
ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
|
|
auge->v.Attribute.ctx = AugStore;
|
|
VISIT(c, expr, auge);
|
|
break;
|
|
case Subscript_kind:
|
|
auge = Subscript(e->v.Subscript.value, e->v.Subscript.slice,
|
|
AugLoad, e->lineno, e->col_offset, c->c_arena);
|
|
if (auge == NULL)
|
|
return 0;
|
|
VISIT(c, expr, auge);
|
|
VISIT(c, expr, s->v.AugAssign.value);
|
|
ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
|
|
auge->v.Subscript.ctx = AugStore;
|
|
VISIT(c, expr, auge);
|
|
break;
|
|
case Name_kind:
|
|
if (!compiler_nameop(c, e->v.Name.id, Load))
|
|
return 0;
|
|
VISIT(c, expr, s->v.AugAssign.value);
|
|
ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
|
|
return compiler_nameop(c, e->v.Name.id, Store);
|
|
default:
|
|
PyErr_Format(PyExc_SystemError,
|
|
"invalid node type (%d) for augmented assignment",
|
|
e->kind);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
|
|
{
|
|
struct fblockinfo *f;
|
|
if (c->u->u_nfblocks >= CO_MAXBLOCKS)
|
|
return 0;
|
|
f = &c->u->u_fblock[c->u->u_nfblocks++];
|
|
f->fb_type = t;
|
|
f->fb_block = b;
|
|
return 1;
|
|
}
|
|
|
|
static void
|
|
compiler_pop_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
|
|
{
|
|
struct compiler_unit *u = c->u;
|
|
assert(u->u_nfblocks > 0);
|
|
u->u_nfblocks--;
|
|
assert(u->u_fblock[u->u_nfblocks].fb_type == t);
|
|
assert(u->u_fblock[u->u_nfblocks].fb_block == b);
|
|
}
|
|
|
|
/* Raises a SyntaxError and returns 0.
|
|
If something goes wrong, a different exception may be raised.
|
|
*/
|
|
|
|
static int
|
|
compiler_error(struct compiler *c, const char *errstr)
|
|
{
|
|
PyObject *loc;
|
|
PyObject *u = NULL, *v = NULL;
|
|
|
|
loc = PyErr_ProgramText(c->c_filename, c->u->u_lineno);
|
|
if (!loc) {
|
|
Py_INCREF(Py_None);
|
|
loc = Py_None;
|
|
}
|
|
u = Py_BuildValue("(ziOO)", c->c_filename, c->u->u_lineno,
|
|
Py_None, loc);
|
|
if (!u)
|
|
goto exit;
|
|
v = Py_BuildValue("(zO)", errstr, u);
|
|
if (!v)
|
|
goto exit;
|
|
PyErr_SetObject(PyExc_SyntaxError, v);
|
|
exit:
|
|
Py_DECREF(loc);
|
|
Py_XDECREF(u);
|
|
Py_XDECREF(v);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
compiler_handle_subscr(struct compiler *c, const char *kind,
|
|
expr_context_ty ctx)
|
|
{
|
|
int op = 0;
|
|
|
|
/* XXX this code is duplicated */
|
|
switch (ctx) {
|
|
case AugLoad: /* fall through to Load */
|
|
case Load: op = BINARY_SUBSCR; break;
|
|
case AugStore:/* fall through to Store */
|
|
case Store: op = STORE_SUBSCR; break;
|
|
case Del: op = DELETE_SUBSCR; break;
|
|
case Param:
|
|
PyErr_Format(PyExc_SystemError,
|
|
"invalid %s kind %d in subscript\n",
|
|
kind, ctx);
|
|
return 0;
|
|
}
|
|
if (ctx == AugLoad) {
|
|
ADDOP_I(c, DUP_TOPX, 2);
|
|
}
|
|
else if (ctx == AugStore) {
|
|
ADDOP(c, ROT_THREE);
|
|
}
|
|
ADDOP(c, op);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
|
|
{
|
|
int n = 2;
|
|
assert(s->kind == Slice_kind);
|
|
|
|
/* only handles the cases where BUILD_SLICE is emitted */
|
|
if (s->v.Slice.lower) {
|
|
VISIT(c, expr, s->v.Slice.lower);
|
|
}
|
|
else {
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
}
|
|
|
|
if (s->v.Slice.upper) {
|
|
VISIT(c, expr, s->v.Slice.upper);
|
|
}
|
|
else {
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
}
|
|
|
|
if (s->v.Slice.step) {
|
|
n++;
|
|
VISIT(c, expr, s->v.Slice.step);
|
|
}
|
|
ADDOP_I(c, BUILD_SLICE, n);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_simple_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
|
|
{
|
|
int op = 0, slice_offset = 0, stack_count = 0;
|
|
|
|
assert(s->v.Slice.step == NULL);
|
|
if (s->v.Slice.lower) {
|
|
slice_offset++;
|
|
stack_count++;
|
|
if (ctx != AugStore)
|
|
VISIT(c, expr, s->v.Slice.lower);
|
|
}
|
|
if (s->v.Slice.upper) {
|
|
slice_offset += 2;
|
|
stack_count++;
|
|
if (ctx != AugStore)
|
|
VISIT(c, expr, s->v.Slice.upper);
|
|
}
|
|
|
|
if (ctx == AugLoad) {
|
|
switch (stack_count) {
|
|
case 0: ADDOP(c, DUP_TOP); break;
|
|
case 1: ADDOP_I(c, DUP_TOPX, 2); break;
|
|
case 2: ADDOP_I(c, DUP_TOPX, 3); break;
|
|
}
|
|
}
|
|
else if (ctx == AugStore) {
|
|
switch (stack_count) {
|
|
case 0: ADDOP(c, ROT_TWO); break;
|
|
case 1: ADDOP(c, ROT_THREE); break;
|
|
case 2: ADDOP(c, ROT_FOUR); break;
|
|
}
|
|
}
|
|
|
|
switch (ctx) {
|
|
case AugLoad: /* fall through to Load */
|
|
case Load: op = SLICE; break;
|
|
case AugStore:/* fall through to Store */
|
|
case Store: op = STORE_SLICE; break;
|
|
case Del: op = DELETE_SLICE; break;
|
|
case Param:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"param invalid in simple slice");
|
|
return 0;
|
|
}
|
|
|
|
ADDOP(c, op + slice_offset);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_nested_slice(struct compiler *c, slice_ty s,
|
|
expr_context_ty ctx)
|
|
{
|
|
switch (s->kind) {
|
|
case Ellipsis_kind:
|
|
ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
|
|
break;
|
|
case Slice_kind:
|
|
return compiler_slice(c, s, ctx);
|
|
case Index_kind:
|
|
VISIT(c, expr, s->v.Index.value);
|
|
break;
|
|
case ExtSlice_kind:
|
|
default:
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"extended slice invalid in nested slice");
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
compiler_visit_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
|
|
{
|
|
char * kindname = NULL;
|
|
switch (s->kind) {
|
|
case Index_kind:
|
|
kindname = "index";
|
|
if (ctx != AugStore) {
|
|
VISIT(c, expr, s->v.Index.value);
|
|
}
|
|
break;
|
|
case Ellipsis_kind:
|
|
kindname = "ellipsis";
|
|
if (ctx != AugStore) {
|
|
ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
|
|
}
|
|
break;
|
|
case Slice_kind:
|
|
kindname = "slice";
|
|
if (!s->v.Slice.step)
|
|
return compiler_simple_slice(c, s, ctx);
|
|
if (ctx != AugStore) {
|
|
if (!compiler_slice(c, s, ctx))
|
|
return 0;
|
|
}
|
|
break;
|
|
case ExtSlice_kind:
|
|
kindname = "extended slice";
|
|
if (ctx != AugStore) {
|
|
int i, n = asdl_seq_LEN(s->v.ExtSlice.dims);
|
|
for (i = 0; i < n; i++) {
|
|
slice_ty sub = (slice_ty)asdl_seq_GET(
|
|
s->v.ExtSlice.dims, i);
|
|
if (!compiler_visit_nested_slice(c, sub, ctx))
|
|
return 0;
|
|
}
|
|
ADDOP_I(c, BUILD_TUPLE, n);
|
|
}
|
|
break;
|
|
default:
|
|
PyErr_Format(PyExc_SystemError,
|
|
"invalid subscript kind %d", s->kind);
|
|
return 0;
|
|
}
|
|
return compiler_handle_subscr(c, kindname, ctx);
|
|
}
|
|
|
|
/* do depth-first search of basic block graph, starting with block.
|
|
post records the block indices in post-order.
|
|
|
|
XXX must handle implicit jumps from one block to next
|
|
*/
|
|
|
|
static void
|
|
dfs(struct compiler *c, basicblock *b, struct assembler *a)
|
|
{
|
|
int i;
|
|
struct instr *instr = NULL;
|
|
|
|
if (b->b_seen)
|
|
return;
|
|
b->b_seen = 1;
|
|
if (b->b_next != NULL)
|
|
dfs(c, b->b_next, a);
|
|
for (i = 0; i < b->b_iused; i++) {
|
|
instr = &b->b_instr[i];
|
|
if (instr->i_jrel || instr->i_jabs)
|
|
dfs(c, instr->i_target, a);
|
|
}
|
|
a->a_postorder[a->a_nblocks++] = b;
|
|
}
|
|
|
|
static int
|
|
stackdepth_walk(struct compiler *c, basicblock *b, int depth, int maxdepth)
|
|
{
|
|
int i;
|
|
struct instr *instr;
|
|
if (b->b_seen || b->b_startdepth >= depth)
|
|
return maxdepth;
|
|
b->b_seen = 1;
|
|
b->b_startdepth = depth;
|
|
for (i = 0; i < b->b_iused; i++) {
|
|
instr = &b->b_instr[i];
|
|
depth += opcode_stack_effect(instr->i_opcode, instr->i_oparg);
|
|
if (depth > maxdepth)
|
|
maxdepth = depth;
|
|
assert(depth >= 0); /* invalid code or bug in stackdepth() */
|
|
if (instr->i_jrel || instr->i_jabs) {
|
|
maxdepth = stackdepth_walk(c, instr->i_target,
|
|
depth, maxdepth);
|
|
if (instr->i_opcode == JUMP_ABSOLUTE ||
|
|
instr->i_opcode == JUMP_FORWARD) {
|
|
goto out; /* remaining code is dead */
|
|
}
|
|
}
|
|
}
|
|
if (b->b_next)
|
|
maxdepth = stackdepth_walk(c, b->b_next, depth, maxdepth);
|
|
out:
|
|
b->b_seen = 0;
|
|
return maxdepth;
|
|
}
|
|
|
|
/* Find the flow path that needs the largest stack. We assume that
|
|
* cycles in the flow graph have no net effect on the stack depth.
|
|
*/
|
|
static int
|
|
stackdepth(struct compiler *c)
|
|
{
|
|
basicblock *b, *entryblock;
|
|
entryblock = NULL;
|
|
for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
|
|
b->b_seen = 0;
|
|
b->b_startdepth = INT_MIN;
|
|
entryblock = b;
|
|
}
|
|
if (!entryblock)
|
|
return 0;
|
|
return stackdepth_walk(c, entryblock, 0, 0);
|
|
}
|
|
|
|
static int
|
|
assemble_init(struct assembler *a, int nblocks, int firstlineno)
|
|
{
|
|
memset(a, 0, sizeof(struct assembler));
|
|
a->a_lineno = firstlineno;
|
|
a->a_bytecode = PyString_FromStringAndSize(NULL, DEFAULT_CODE_SIZE);
|
|
if (!a->a_bytecode)
|
|
return 0;
|
|
a->a_lnotab = PyString_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE);
|
|
if (!a->a_lnotab)
|
|
return 0;
|
|
a->a_postorder = (basicblock **)PyObject_Malloc(
|
|
sizeof(basicblock *) * nblocks);
|
|
if (!a->a_postorder) {
|
|
PyErr_NoMemory();
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static void
|
|
assemble_free(struct assembler *a)
|
|
{
|
|
Py_XDECREF(a->a_bytecode);
|
|
Py_XDECREF(a->a_lnotab);
|
|
if (a->a_postorder)
|
|
PyObject_Free(a->a_postorder);
|
|
}
|
|
|
|
/* Return the size of a basic block in bytes. */
|
|
|
|
static int
|
|
instrsize(struct instr *instr)
|
|
{
|
|
if (!instr->i_hasarg)
|
|
return 1;
|
|
if (instr->i_oparg > 0xffff)
|
|
return 6;
|
|
return 3;
|
|
}
|
|
|
|
static int
|
|
blocksize(basicblock *b)
|
|
{
|
|
int i;
|
|
int size = 0;
|
|
|
|
for (i = 0; i < b->b_iused; i++)
|
|
size += instrsize(&b->b_instr[i]);
|
|
return size;
|
|
}
|
|
|
|
/* All about a_lnotab.
|
|
|
|
c_lnotab is an array of unsigned bytes disguised as a Python string.
|
|
It is used to map bytecode offsets to source code line #s (when needed
|
|
for tracebacks).
|
|
|
|
The array is conceptually a list of
|
|
(bytecode offset increment, line number increment)
|
|
pairs. The details are important and delicate, best illustrated by example:
|
|
|
|
byte code offset source code line number
|
|
0 1
|
|
6 2
|
|
50 7
|
|
350 307
|
|
361 308
|
|
|
|
The first trick is that these numbers aren't stored, only the increments
|
|
from one row to the next (this doesn't really work, but it's a start):
|
|
|
|
0, 1, 6, 1, 44, 5, 300, 300, 11, 1
|
|
|
|
The second trick is that an unsigned byte can't hold negative values, or
|
|
values larger than 255, so (a) there's a deep assumption that byte code
|
|
offsets and their corresponding line #s both increase monotonically, and (b)
|
|
if at least one column jumps by more than 255 from one row to the next, more
|
|
than one pair is written to the table. In case #b, there's no way to know
|
|
from looking at the table later how many were written. That's the delicate
|
|
part. A user of c_lnotab desiring to find the source line number
|
|
corresponding to a bytecode address A should do something like this
|
|
|
|
lineno = addr = 0
|
|
for addr_incr, line_incr in c_lnotab:
|
|
addr += addr_incr
|
|
if addr > A:
|
|
return lineno
|
|
lineno += line_incr
|
|
|
|
In order for this to work, when the addr field increments by more than 255,
|
|
the line # increment in each pair generated must be 0 until the remaining addr
|
|
increment is < 256. So, in the example above, assemble_lnotab (it used
|
|
to be called com_set_lineno) should not (as was actually done until 2.2)
|
|
expand 300, 300 to 255, 255, 45, 45,
|
|
but to 255, 0, 45, 255, 0, 45.
|
|
*/
|
|
|
|
static int
|
|
assemble_lnotab(struct assembler *a, struct instr *i)
|
|
{
|
|
int d_bytecode, d_lineno;
|
|
int len;
|
|
unsigned char *lnotab;
|
|
|
|
d_bytecode = a->a_offset - a->a_lineno_off;
|
|
d_lineno = i->i_lineno - a->a_lineno;
|
|
|
|
assert(d_bytecode >= 0);
|
|
assert(d_lineno >= 0);
|
|
|
|
/* XXX(nnorwitz): is there a better way to handle this?
|
|
for loops are special, we want to be able to trace them
|
|
each time around, so we need to set an extra line number. */
|
|
if (d_lineno == 0 && i->i_opcode != FOR_ITER)
|
|
return 1;
|
|
|
|
if (d_bytecode > 255) {
|
|
int j, nbytes, ncodes = d_bytecode / 255;
|
|
nbytes = a->a_lnotab_off + 2 * ncodes;
|
|
len = PyString_GET_SIZE(a->a_lnotab);
|
|
if (nbytes >= len) {
|
|
if (len * 2 < nbytes)
|
|
len = nbytes;
|
|
else
|
|
len *= 2;
|
|
if (_PyString_Resize(&a->a_lnotab, len) < 0)
|
|
return 0;
|
|
}
|
|
lnotab = (unsigned char *)
|
|
PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
|
|
for (j = 0; j < ncodes; j++) {
|
|
*lnotab++ = 255;
|
|
*lnotab++ = 0;
|
|
}
|
|
d_bytecode -= ncodes * 255;
|
|
a->a_lnotab_off += ncodes * 2;
|
|
}
|
|
assert(d_bytecode <= 255);
|
|
if (d_lineno > 255) {
|
|
int j, nbytes, ncodes = d_lineno / 255;
|
|
nbytes = a->a_lnotab_off + 2 * ncodes;
|
|
len = PyString_GET_SIZE(a->a_lnotab);
|
|
if (nbytes >= len) {
|
|
if (len * 2 < nbytes)
|
|
len = nbytes;
|
|
else
|
|
len *= 2;
|
|
if (_PyString_Resize(&a->a_lnotab, len) < 0)
|
|
return 0;
|
|
}
|
|
lnotab = (unsigned char *)
|
|
PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
|
|
*lnotab++ = d_bytecode;
|
|
*lnotab++ = 255;
|
|
d_bytecode = 0;
|
|
for (j = 1; j < ncodes; j++) {
|
|
*lnotab++ = 0;
|
|
*lnotab++ = 255;
|
|
}
|
|
d_lineno -= ncodes * 255;
|
|
a->a_lnotab_off += ncodes * 2;
|
|
}
|
|
|
|
len = PyString_GET_SIZE(a->a_lnotab);
|
|
if (a->a_lnotab_off + 2 >= len) {
|
|
if (_PyString_Resize(&a->a_lnotab, len * 2) < 0)
|
|
return 0;
|
|
}
|
|
lnotab = (unsigned char *)
|
|
PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
|
|
|
|
a->a_lnotab_off += 2;
|
|
if (d_bytecode) {
|
|
*lnotab++ = d_bytecode;
|
|
*lnotab++ = d_lineno;
|
|
}
|
|
else { /* First line of a block; def stmt, etc. */
|
|
*lnotab++ = 0;
|
|
*lnotab++ = d_lineno;
|
|
}
|
|
a->a_lineno = i->i_lineno;
|
|
a->a_lineno_off = a->a_offset;
|
|
return 1;
|
|
}
|
|
|
|
/* assemble_emit()
|
|
Extend the bytecode with a new instruction.
|
|
Update lnotab if necessary.
|
|
*/
|
|
|
|
static int
|
|
assemble_emit(struct assembler *a, struct instr *i)
|
|
{
|
|
int size, arg = 0, ext = 0;
|
|
Py_ssize_t len = PyString_GET_SIZE(a->a_bytecode);
|
|
char *code;
|
|
|
|
size = instrsize(i);
|
|
if (i->i_hasarg) {
|
|
arg = i->i_oparg;
|
|
ext = arg >> 16;
|
|
}
|
|
if (i->i_lineno && !assemble_lnotab(a, i))
|
|
return 0;
|
|
if (a->a_offset + size >= len) {
|
|
if (_PyString_Resize(&a->a_bytecode, len * 2) < 0)
|
|
return 0;
|
|
}
|
|
code = PyString_AS_STRING(a->a_bytecode) + a->a_offset;
|
|
a->a_offset += size;
|
|
if (size == 6) {
|
|
assert(i->i_hasarg);
|
|
*code++ = (char)EXTENDED_ARG;
|
|
*code++ = ext & 0xff;
|
|
*code++ = ext >> 8;
|
|
arg &= 0xffff;
|
|
}
|
|
*code++ = i->i_opcode;
|
|
if (i->i_hasarg) {
|
|
assert(size == 3 || size == 6);
|
|
*code++ = arg & 0xff;
|
|
*code++ = arg >> 8;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static void
|
|
assemble_jump_offsets(struct assembler *a, struct compiler *c)
|
|
{
|
|
basicblock *b;
|
|
int bsize, totsize, extended_arg_count, last_extended_arg_count = 0;
|
|
int i;
|
|
|
|
/* Compute the size of each block and fixup jump args.
|
|
Replace block pointer with position in bytecode. */
|
|
start:
|
|
totsize = 0;
|
|
for (i = a->a_nblocks - 1; i >= 0; i--) {
|
|
b = a->a_postorder[i];
|
|
bsize = blocksize(b);
|
|
b->b_offset = totsize;
|
|
totsize += bsize;
|
|
}
|
|
extended_arg_count = 0;
|
|
for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
|
|
bsize = b->b_offset;
|
|
for (i = 0; i < b->b_iused; i++) {
|
|
struct instr *instr = &b->b_instr[i];
|
|
/* Relative jumps are computed relative to
|
|
the instruction pointer after fetching
|
|
the jump instruction.
|
|
*/
|
|
bsize += instrsize(instr);
|
|
if (instr->i_jabs)
|
|
instr->i_oparg = instr->i_target->b_offset;
|
|
else if (instr->i_jrel) {
|
|
int delta = instr->i_target->b_offset - bsize;
|
|
instr->i_oparg = delta;
|
|
}
|
|
else
|
|
continue;
|
|
if (instr->i_oparg > 0xffff)
|
|
extended_arg_count++;
|
|
}
|
|
}
|
|
|
|
/* XXX: This is an awful hack that could hurt performance, but
|
|
on the bright side it should work until we come up
|
|
with a better solution.
|
|
|
|
In the meantime, should the goto be dropped in favor
|
|
of a loop?
|
|
|
|
The issue is that in the first loop blocksize() is called
|
|
which calls instrsize() which requires i_oparg be set
|
|
appropriately. There is a bootstrap problem because
|
|
i_oparg is calculated in the second loop above.
|
|
|
|
So we loop until we stop seeing new EXTENDED_ARGs.
|
|
The only EXTENDED_ARGs that could be popping up are
|
|
ones in jump instructions. So this should converge
|
|
fairly quickly.
|
|
*/
|
|
if (last_extended_arg_count != extended_arg_count) {
|
|
last_extended_arg_count = extended_arg_count;
|
|
goto start;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
dict_keys_inorder(PyObject *dict, int offset)
|
|
{
|
|
PyObject *tuple, *k, *v;
|
|
Py_ssize_t i, pos = 0, size = PyDict_Size(dict);
|
|
|
|
tuple = PyTuple_New(size);
|
|
if (tuple == NULL)
|
|
return NULL;
|
|
while (PyDict_Next(dict, &pos, &k, &v)) {
|
|
i = PyInt_AS_LONG(v);
|
|
k = PyTuple_GET_ITEM(k, 0);
|
|
Py_INCREF(k);
|
|
assert((i - offset) < size);
|
|
assert((i - offset) >= 0);
|
|
PyTuple_SET_ITEM(tuple, i - offset, k);
|
|
}
|
|
return tuple;
|
|
}
|
|
|
|
static int
|
|
compute_code_flags(struct compiler *c)
|
|
{
|
|
PySTEntryObject *ste = c->u->u_ste;
|
|
int flags = 0, n;
|
|
if (ste->ste_type != ModuleBlock)
|
|
flags |= CO_NEWLOCALS;
|
|
if (ste->ste_type == FunctionBlock) {
|
|
if (!ste->ste_unoptimized)
|
|
flags |= CO_OPTIMIZED;
|
|
if (ste->ste_nested)
|
|
flags |= CO_NESTED;
|
|
if (ste->ste_generator)
|
|
flags |= CO_GENERATOR;
|
|
}
|
|
if (ste->ste_varargs)
|
|
flags |= CO_VARARGS;
|
|
if (ste->ste_varkeywords)
|
|
flags |= CO_VARKEYWORDS;
|
|
if (ste->ste_generator)
|
|
flags |= CO_GENERATOR;
|
|
|
|
/* (Only) inherit compilerflags in PyCF_MASK */
|
|
flags |= (c->c_flags->cf_flags & PyCF_MASK);
|
|
|
|
n = PyDict_Size(c->u->u_freevars);
|
|
if (n < 0)
|
|
return -1;
|
|
if (n == 0) {
|
|
n = PyDict_Size(c->u->u_cellvars);
|
|
if (n < 0)
|
|
return -1;
|
|
if (n == 0) {
|
|
flags |= CO_NOFREE;
|
|
}
|
|
}
|
|
|
|
return flags;
|
|
}
|
|
|
|
static PyCodeObject *
|
|
makecode(struct compiler *c, struct assembler *a)
|
|
{
|
|
PyObject *tmp;
|
|
PyCodeObject *co = NULL;
|
|
PyObject *consts = NULL;
|
|
PyObject *names = NULL;
|
|
PyObject *varnames = NULL;
|
|
PyObject *filename = NULL;
|
|
PyObject *name = NULL;
|
|
PyObject *freevars = NULL;
|
|
PyObject *cellvars = NULL;
|
|
PyObject *bytecode = NULL;
|
|
int nlocals, flags;
|
|
|
|
tmp = dict_keys_inorder(c->u->u_consts, 0);
|
|
if (!tmp)
|
|
goto error;
|
|
consts = PySequence_List(tmp); /* optimize_code requires a list */
|
|
Py_DECREF(tmp);
|
|
|
|
names = dict_keys_inorder(c->u->u_names, 0);
|
|
varnames = dict_keys_inorder(c->u->u_varnames, 0);
|
|
if (!consts || !names || !varnames)
|
|
goto error;
|
|
|
|
cellvars = dict_keys_inorder(c->u->u_cellvars, 0);
|
|
if (!cellvars)
|
|
goto error;
|
|
freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_Size(cellvars));
|
|
if (!freevars)
|
|
goto error;
|
|
filename = PyString_FromString(c->c_filename);
|
|
if (!filename)
|
|
goto error;
|
|
|
|
nlocals = PyDict_Size(c->u->u_varnames);
|
|
flags = compute_code_flags(c);
|
|
if (flags < 0)
|
|
goto error;
|
|
|
|
bytecode = PyCode_Optimize(a->a_bytecode, consts, names, a->a_lnotab);
|
|
if (!bytecode)
|
|
goto error;
|
|
|
|
tmp = PyList_AsTuple(consts); /* PyCode_New requires a tuple */
|
|
if (!tmp)
|
|
goto error;
|
|
Py_DECREF(consts);
|
|
consts = tmp;
|
|
|
|
co = PyCode_New(c->u->u_argcount, nlocals, stackdepth(c), flags,
|
|
bytecode, consts, names, varnames,
|
|
freevars, cellvars,
|
|
filename, c->u->u_name,
|
|
c->u->u_firstlineno,
|
|
a->a_lnotab);
|
|
error:
|
|
Py_XDECREF(consts);
|
|
Py_XDECREF(names);
|
|
Py_XDECREF(varnames);
|
|
Py_XDECREF(filename);
|
|
Py_XDECREF(name);
|
|
Py_XDECREF(freevars);
|
|
Py_XDECREF(cellvars);
|
|
Py_XDECREF(bytecode);
|
|
return co;
|
|
}
|
|
|
|
|
|
/* For debugging purposes only */
|
|
#if 0
|
|
static void
|
|
dump_instr(const struct instr *i)
|
|
{
|
|
const char *jrel = i->i_jrel ? "jrel " : "";
|
|
const char *jabs = i->i_jabs ? "jabs " : "";
|
|
char arg[128];
|
|
|
|
*arg = '\0';
|
|
if (i->i_hasarg)
|
|
sprintf(arg, "arg: %d ", i->i_oparg);
|
|
|
|
fprintf(stderr, "line: %d, opcode: %d %s%s%s\n",
|
|
i->i_lineno, i->i_opcode, arg, jabs, jrel);
|
|
}
|
|
|
|
static void
|
|
dump_basicblock(const basicblock *b)
|
|
{
|
|
const char *seen = b->b_seen ? "seen " : "";
|
|
const char *b_return = b->b_return ? "return " : "";
|
|
fprintf(stderr, "used: %d, depth: %d, offset: %d %s%s\n",
|
|
b->b_iused, b->b_startdepth, b->b_offset, seen, b_return);
|
|
if (b->b_instr) {
|
|
int i;
|
|
for (i = 0; i < b->b_iused; i++) {
|
|
fprintf(stderr, " [%02d] ", i);
|
|
dump_instr(b->b_instr + i);
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
static PyCodeObject *
|
|
assemble(struct compiler *c, int addNone)
|
|
{
|
|
basicblock *b, *entryblock;
|
|
struct assembler a;
|
|
int i, j, nblocks;
|
|
PyCodeObject *co = NULL;
|
|
|
|
/* Make sure every block that falls off the end returns None.
|
|
XXX NEXT_BLOCK() isn't quite right, because if the last
|
|
block ends with a jump or return b_next shouldn't set.
|
|
*/
|
|
if (!c->u->u_curblock->b_return) {
|
|
NEXT_BLOCK(c);
|
|
if (addNone)
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
ADDOP(c, RETURN_VALUE);
|
|
}
|
|
|
|
nblocks = 0;
|
|
entryblock = NULL;
|
|
for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
|
|
nblocks++;
|
|
entryblock = b;
|
|
}
|
|
|
|
/* Set firstlineno if it wasn't explicitly set. */
|
|
if (!c->u->u_firstlineno) {
|
|
if (entryblock && entryblock->b_instr)
|
|
c->u->u_firstlineno = entryblock->b_instr->i_lineno;
|
|
else
|
|
c->u->u_firstlineno = 1;
|
|
}
|
|
if (!assemble_init(&a, nblocks, c->u->u_firstlineno))
|
|
goto error;
|
|
dfs(c, entryblock, &a);
|
|
|
|
/* Can't modify the bytecode after computing jump offsets. */
|
|
assemble_jump_offsets(&a, c);
|
|
|
|
/* Emit code in reverse postorder from dfs. */
|
|
for (i = a.a_nblocks - 1; i >= 0; i--) {
|
|
b = a.a_postorder[i];
|
|
for (j = 0; j < b->b_iused; j++)
|
|
if (!assemble_emit(&a, &b->b_instr[j]))
|
|
goto error;
|
|
}
|
|
|
|
if (_PyString_Resize(&a.a_lnotab, a.a_lnotab_off) < 0)
|
|
goto error;
|
|
if (_PyString_Resize(&a.a_bytecode, a.a_offset) < 0)
|
|
goto error;
|
|
|
|
co = makecode(c, &a);
|
|
error:
|
|
assemble_free(&a);
|
|
return co;
|
|
}
|