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

Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
3905 lines
92 KiB
C
3905 lines
92 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.
|
|
* 5. Optimize the byte code (peephole optimizations). See peephole.c
|
|
*
|
|
* 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. Use the arena to manage
|
|
* objects.
|
|
*/
|
|
|
|
#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;
|
|
|
|
#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 */
|
|
int u_kwonlyargcount; /* number of keyword only 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 */
|
|
};
|
|
|
|
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 *);
|
|
/* Returns true if there is a loop on the fblock stack. */
|
|
static int compiler_in_loop(struct compiler *);
|
|
|
|
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;
|
|
}
|
|
|
|
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_kwonlyargcount = 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_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 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:
|
|
case BUILD_SET:
|
|
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;
|
|
case MAKE_FUNCTION:
|
|
return -NARGS(oparg);
|
|
#undef NARGS
|
|
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) {
|
|
if (PyErr_Occurred())
|
|
return -1;
|
|
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.
|
|
*/
|
|
|
|
/* The returns inside these macros make it impossible to decref objects
|
|
created in the local function. Local objects should use the arena.
|
|
*/
|
|
|
|
|
|
#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_visit_kwonlydefaults(struct compiler *c, asdl_seq *kwonlyargs,
|
|
asdl_seq *kw_defaults)
|
|
{
|
|
int i, default_count = 0;
|
|
for (i = 0; i < asdl_seq_LEN(kwonlyargs); i++) {
|
|
expr_ty arg = asdl_seq_GET(kwonlyargs, i);
|
|
expr_ty default_ = asdl_seq_GET(kw_defaults, i);
|
|
if (default_) {
|
|
ADDOP_O(c, LOAD_CONST, arg->v.Name.id, consts);
|
|
if (!compiler_visit_expr(c, default_)) {
|
|
return -1;
|
|
}
|
|
default_count++;
|
|
}
|
|
}
|
|
return default_count;
|
|
}
|
|
|
|
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, kw_default_count = 0, arglength;
|
|
|
|
assert(s->kind == FunctionDef_kind);
|
|
|
|
if (!compiler_decorators(c, decos))
|
|
return 0;
|
|
if (args->kwonlyargs) {
|
|
int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs,
|
|
args->kw_defaults);
|
|
if (res < 0)
|
|
return 0;
|
|
kw_default_count = res;
|
|
}
|
|
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);
|
|
c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
|
|
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;
|
|
|
|
arglength = asdl_seq_LEN(args->defaults);
|
|
arglength |= kw_default_count << 8;
|
|
compiler_make_closure(c, co, arglength);
|
|
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;
|
|
int kw_default_count = 0, arglength;
|
|
arguments_ty args = e->v.Lambda.args;
|
|
assert(e->kind == Lambda_kind);
|
|
|
|
if (!name) {
|
|
name = PyString_InternFromString("<lambda>");
|
|
if (!name)
|
|
return 0;
|
|
}
|
|
|
|
if (args->kwonlyargs) {
|
|
int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs,
|
|
args->kw_defaults);
|
|
if (res < 0) return 0;
|
|
kw_default_count = res;
|
|
}
|
|
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);
|
|
c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
|
|
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;
|
|
|
|
arglength = asdl_seq_LEN(args->defaults);
|
|
arglength |= kw_default_count << 8;
|
|
compiler_make_closure(c, co, arglength);
|
|
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";
|
|
static const char IN_FINALLY_ERROR_MSG[] =
|
|
"'continue' not supported inside 'finally' clause";
|
|
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) {
|
|
/* Prevent continue anywhere under a finally
|
|
even if hidden in a sub-try or except. */
|
|
if (c->u->u_fblock[i].fb_type == FINALLY_END)
|
|
return compiler_error(c, IN_FINALLY_ERROR_MSG);
|
|
}
|
|
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, IN_FINALLY_ERROR_MSG);
|
|
}
|
|
|
|
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 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 (!compiler_in_loop(c))
|
|
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;
|
|
}
|
|
|
|
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 temporary list name 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;
|
|
asdl_seq *generators = e->v.ListComp.generators;
|
|
|
|
assert(e->kind == ListComp_kind);
|
|
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 Ellipsis_kind:
|
|
return 1;
|
|
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 Set_kind:
|
|
n = asdl_seq_LEN(e->v.Set.elts);
|
|
VISIT_SEQ(c, expr, e->v.Set.elts);
|
|
ADDOP_I(c, BUILD_SET, n);
|
|
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");
|
|
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 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;
|
|
case Ellipsis_kind:
|
|
ADDOP_O(c, LOAD_CONST, Py_Ellipsis, 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) {
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"too many statically nested blocks");
|
|
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);
|
|
}
|
|
|
|
static int
|
|
compiler_in_loop(struct compiler *c) {
|
|
int i;
|
|
struct compiler_unit *u = c->u;
|
|
for (i = 0; i < u->u_nfblocks; ++i) {
|
|
if (u->u_fblock[i].fb_type == LOOP)
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
/* 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 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 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);
|
|
}
|
|
|
|
|
|
/* End of the compiler section, beginning of the assembler section */
|
|
|
|
/* 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
|
|
*/
|
|
|
|
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 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, c->u->u_kwonlyargcount,
|
|
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;
|
|
}
|