mirror of
https://github.com/python/cpython.git
synced 2024-12-02 06:14:49 +08:00
d8faa3654c
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines Do not copy free variables to locals in class namespaces. Fixes bug 1569356, but at the cost of a minor incompatibility in locals(). Add test that verifies that the class namespace is not polluted. Also clarify the behavior in the library docs. Along the way, cleaned up the dict_to_map and map_to_dict implementations and added some comments that explain what they do. ........ r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines Fix assertion. ........ r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. ........ r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line Markup fix ........ r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions are gone. ........ r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line Add some items ........ r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines Fix long-standing bug in name mangling for package imports Reported by Mike Verdone. ........ r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines tabify ........ r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines tabify Note that ast.c still has a mix of tabs and spaces, because it attempts to use four-space indents for more of the new code. ........ r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines whitespace normalization ........ r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines Add checking for a number of metaclass error conditions. We add some new rules that are required for preserving internal invariants of types. 1. If type (or a subclass of type) appears in bases, it must appear before any non-type bases. If a non-type base (like a regular new-style class) occurred first, it could trick type into allocating the new class an __dict__ which must be impossible. 2. There are several checks that are made of bases when creating a type. Those checks are now repeated when assigning to __bases__. We also add the restriction that assignment to __bases__ may not change the metaclass of the type. Add new tests for these cases and for a few other oddball errors that were no previously tested. Remove a crasher test that was fixed. Also some internal refactoring: Extract the code to find the most derived metaclass of a type and its bases. It is now needed in two places. Rewrite the TypeError checks in test_descr to use doctest. The tests now clearly show what exception they expect to see. ........ r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines Add news about changes to metaclasses and __bases__ error checking. ........ r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines Modify the segfaulting example to show why r53997 is not a solution to it. ........ r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines Add a test for instantiating SyntaxError with no arguments. ........ r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line Docstring nit. ........ r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line Prepare collections module for pure python code entries. ........ r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line Add collections.NamedTuple ........ r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line Add Pat and Eric for work on PEP 3101 in the sandbox ........ r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line Add NamedTuple ........ r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines Bug #1628895: some better tries to find HTML documentation in pydoc. ........ r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line Fix embarrassing typo and fix constantification of None ........ r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize. ........ r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines Fix a bug in test_dict and test_userdict, found at the PyPy sprint. ........ r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines Teach setup.py how to find Berkeley DB on Macs using MacPorts. ........ r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line note MacPorts/BerkDB change in setup.py ........ r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line Added Pete for 3101 too ........ r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line Minor corrections to docs, and an explanation comentary ........ r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines Patch #1674228: when assigning a slice (old-style), check for the sq_ass_slice instead of the sq_slice slot. ........ r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines Nit: a struct field is set to GenericAlloc, not GenericAlloc(). ........ r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1671450: add a section about subclassing builtin types to the "extending and embedding" tutorial. ........ r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1121142: Implement ZipFile.open. ........ r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the fix in #1674228. ........ r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1672481: fix bug in idlelib.MultiCall. ........ r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line Bug #1674503: close the file opened by execfile() in an error condition. ........ r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines Fix another reincarnation of bug #1576657 in defaultdict. ........ r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the defaultdict KeyError bug. ........ r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1663234: you can now run doctest on test files and modules using "python -m doctest [-v] filename ...". ........ r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #912410: Replace HTML entity references for attribute values in HTMLParser. ........ r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line patch 1673619 - identify extension modules which cannot be built ........ r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines Patch #1646728: datetime.fromtimestamp fails with negative fractional times. With unittest. Somebody please backport to 2.5. ........ r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines Fix cmp vs. key argument for list.sort. ........ r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines Small nit, found by Neal. ........ r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1602128: clarify that richcmp methods can return NotImplemented and should return True or False otherwise. ........ r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1638879: don't accept strings with embedded NUL bytes in long(). ........ r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1673121: update README wrt. OSX default shell. ........ r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1654417: make operator.{get,set,del}slice use the full range of Py_ssize_t. ........ r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines Patch for bug #1633621: if curses.resizeterm() or curses.resize_term() is called, update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS. ........ r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines Document change to curses. ........ r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines Variant of patch #697613: don't exit the interpreter on a SystemExit exception if the -i command line option or PYTHONINSPECT environment variable is given, but break into the interactive interpreter just like on other exceptions or normal program exit. (backport) ........ r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines Patch #703779: unset __file__ in __main__ after running a file. This makes the filenames the warning module prints much more sensible when a PYTHONSTARTUP file is used. ........ r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines add versionadded info ........ r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler. ........ r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #1001604: glob.glob() now returns unicode filenames if it was given a unicode argument and os.listdir() returns unicode filenames. ........ r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines Patches #1550273, #1550272: fix a few bugs in unittest and add a comprehensive test suite for the module. ........ r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #787789: allow to pass custom TestRunner instances to unittest's main() function. ........ r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position. ........ r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', ''). ........ r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1675471: convert test_pty to unittest. ........ r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines Add some sanity checks to unittest.TestSuite's addTest(s) methods. Fixes #878275. ........ r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines Windows doesn't support negative timestamps. Skip the tests involving them if os.name == "nt". ........ r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines Add missing ) in parenthical remark. ........ r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines Fix #1676656: \em is different from \emph... ........ r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines Add a NEWS entry for rev. 54207,8. ........ r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line SF 1676321: empty() returned wrong result ........ r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order. ........ r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line SF #1637850: make_table in difflib did not work with unicode ........ r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1668482: don't use '-' in mkstemp ........ r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines Introduce test.test_support.TransientResource. It's a context manager to surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit). ........ r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py ........ r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line Add NEWS item for patch #1481079 (r54234). ........ r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line Fix SF #1676971, Complex OverflowError has a typo ........ r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines Typo. ........ r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #957003: Implement smtplib.LMTP. ........ r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822. ........ r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0) returned string up to the first NUL character. ........ r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines Add Ziga Seilnacht. ........ r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError. ........ r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. The crash was caused by a section of code that should have been removed long ago, at that time ctypes had other ways to pass parameters to function calls. ........ r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line Hashing simplification pointed out by Thomas Wouters. ........ r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink. * Drop safe_remove() in favor of test_support.unlink(). * Fix the indentation of test_samefile so that it runs. ........ r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. ........ r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. ........ r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line Add proper attribution for a bug fix. ........ r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines Typos. ........ r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line Convert an assert to a raise so it works even in the presence of -O. ........ r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer. ........ r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines Add missing "return" statements in exception handler. ........ r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1675981: remove unreachable code from type.__new__() method. __dict__ and __weakref__ are removed from the slots tuple earlier in the code, in the loop that mangles slot names. Will backport. ........ r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number. Will backport. ........ r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line Fix resource leak reported in SF #1516995. ........ r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more stable FTP. Will backport. ........ r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the display name of an email address, e.g. Foo \tBar <foo@example.com> Test case added by Barry. ........ r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines Sane humans would call these invalid tests, but Andrew McNamara pointed out that given the inputs in these tests Excel does indeed produce the output these tests expect. Document that for future confused folks. ........ r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. ........ r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines Patch #1677862: Require a space or tab after import in .pth files. ........ r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines Backport from Py3k branch: Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Had to change a few bits of the patch because classobjs and __methods__ are still in Py2.6. ........ r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #1678647: write a newline after printing an exception in any case, even when converting the value to a string failed. ........ r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. ........ r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Will backport. ........ r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines Typo fix. ........ r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1670993: Refactor test_threadedtempfile.py to use unittest. ........ r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines Whitespace normalization. ........ r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines Add test.test_support.transient_internet . Returns a context manager that nests test.test_support.TransientResource context managers that capture exceptions raised when the Internet connection is flaky. Initially using in test_socket_ssl but should probably be expanded to cover any test that should not raise the captured exceptions if the Internet connection works. ........ r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines Fix a typo where the variable name was not updated. ........ r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line Add Jerry Seutter for a bunch of his recent patches refactoring tests ........ r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines Add some other acks for recent checkins: Brian Leair - 922167 Tomer Filiba - 1591665 Jeremy Jones - 1192590 ........ r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines Fix some style nits: * lines too long * wrong indentation * space after a function name * wrong function name in error string * simplifying some logic Also add an error check to PyDict_SetItemString. ........ r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines Typo and grammar fixes. ........ r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1679379: add documentation for fnmatch.translate(). ........ r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1642844: comments to clarify the complexobject constructor. ........ r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1668100: urllib2 now correctly raises URLError instead of OSError if accessing a local file via the file:// protocol fails. ........ r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1635454: the csv.DictWriter class now includes the offending field names in its exception message if you try to write a record with a dictionary containing fields not in the CSV field names list. ........ r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1555098: use str.join() instead of repeated string concatenation in robotparser. ........ r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. ........ r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. ........ r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1449244: Support Unicode strings in email.message.Message.{set_charset,get_content_charset}. Will backport. ........ r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines This is the implementation of POSIX.1-2001 (pax) format read/write support. The TarInfo class now contains all necessary logic to process and create tar header data which has been moved there from the TarFile class. The fromtarfile() method was added. The new path and linkpath properties are aliases for the name and linkname attributes in correspondence to the pax naming scheme. The TarFile constructor and classmethods now accept a number of keyword arguments which could only be set as attributes before (e.g. dereference, ignore_zeros). The encoding and pax_headers arguments were added for pax support. There is a new tarinfo keyword argument that allows using subclassed TarInfo objects in TarFile. The boolean TarFile.posix attribute is deprecated, because now three tar formats are supported. Instead, the desired format for writing is specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT as the format keyword argument. This change affects TarInfo.tobuf() as well. The test suite has been heavily reorganized and partially rewritten. A new testtar.tar was added that contains sample data in many formats from 4 different tar programs. Some bugs and quirks that also have been fixed: Directory names do no longer have a trailing slash in TarInfo.name or TarFile.getnames(). Adding the same file twice does not create a hardlink file member. The TarFile constructor does no longer need a name argument. The TarFile._mode attribute was renamed to mode and contains either 'r', 'w' or 'a'. ........ r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines Bug #1622896: fix a rare corner case where the bz2 module raised an error in spite of a succesful compression. ........ r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines Quick fix for tests that fail on systems with an encoding other than 'iso8859-1'. ........ r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1603688: ConfigParser.SafeConfigParser now checks values that are set for invalid interpolation sequences that would lead to errors on reading back those values. ........ r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1581073: add a flag to textwrap that prevents the dropping of whitespace while wrapping. ........ r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1605192: list allowed states in error messages for imaplib. ........ r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter which can be set to False to prevent the default delete-on-close behavior. ........ r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines Add acks for recent patch checkins: Arvin Schnell - 1668482 S?\195?\169bastien Martini - 1481079 Heiko Wundram - 1491866 Damon Kohler - 1545011 Peter Parente - 1599845 Bjorn Lindqvist - 1678662 ........ r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines Acks for recent patches. ........ r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines Fix a tab. ........ r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1533909: the timeit module now accepts callables in addition to strings for the code to time and the setup code. Also added two convenience functions for instantiating a Timer and calling its methods. ........ r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1530482: add pydoc.render_doc() which returns the documentation for a thing instead of paging it to stdout, which pydoc.doc() does. ........ r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. ........ r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1444529: the builtin compile() now accepts keyword arguments. (backport) ........ r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line Add versionadded marker for ctypes.c_bool. ........ r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1393667: pdb now has a "run" command which restarts the debugged Python program, optionally with different arguments. ........ r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines Deprecate commands.getstatus(). ........ r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines NEWS entry for getstatus() deprecation. ........ r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1429539: pdb now correctly initializes the __main__ module for the debugged script, which means that imports from __main__ work correctly now. ........ r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #957650: "%var%" environment variable references are now properly expanded in ntpath.expandvars(), also "~user" home directory references are recognized and handled on Windows. ........ r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1194449: correctly detect unbound methods in pydoc. ........ r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line. ........ r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line Inline PyImport_GetModulesReloading(). ........ r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines SF bug #1582282; decode_header() incorrectly splits not-conformant RFC 2047-like headers where there is no whitespace between encoded words. This fix changes the matching regexp to include a trailing lookahead assertion that the closing ?= must be followed by whitespace, newline, or end-of-string. This also changes the regexp to add the MULTILINE flag. ........ r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines correct order and names of the less often used keyword parameters. ........ r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9" now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform items are all OS X special API specific since OS X is unixy enough for these modules to be available out of the box. ........ r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines Bug #767111: fix long-standing bug in urllib which caused an AttributeError instead of an IOError when the server's response didn't contain a valid HTTP status line. ........ r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines Patch #1680015: Don't modify __slots__ tuple if it contains an unicode name. Remove a reference leak that happened if the name could not be converted to string. Will backport. ........ r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines Patch #1559413: Fix test_cmd_line if sys.executable contains a space. Will backport. ........ r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines Note how test_socket_ssl has various exceptions that deal with a flaky Net connection are silenced. ........ r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines Raise ResourceDenied in test_urllib2net when the Net connection goes bad. ........ r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line Wrap a long line and fix a typo (is -> if) ........ r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1680978: consistently use "alive" instead of "active" in the thread lib doc. ........ r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1681153: the wave module now closes a file object it opened if initialization failed. ........ r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1462488: prevent a segfault in object_reduce_ex() by splitting the implementation for __reduce__ and __reduce_ex__ into two separate functions. Fixes bug #931877. Will backport. ........ r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Will backport. ........ r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines Bug #1681228: the webbrowser module now correctly uses the default GNOME or KDE browser, depending on whether there is a session of one of those present. Also, it tries the Windows default browser before trying Mozilla variants. (backport) ........ r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines Patch #1273829: os.walk() now has a "followlinks" parameter. If set to True (which is not the default), it visits symlinks pointing to directories. ........ r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines Add \versionadded tag. ........ r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines RFE #1670167: fix in isinstance() docs. ........ r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines Patch #1623563: allow __class__ assignment for classes with __slots__. The old and the new class are still required to have the same slot names, but the order in which they are specified is not relevant. ........ r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines Whitespace cleanup. Also remove the empty lines from the previous check in. ........ r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines Remove warning: funcion declaration isn't a prototype ........ r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines Clean up formatting of this file. The file should now follow PEP 7, except that it uses 4 space indents (in the style of Py3k). This particular code would be really hard to read with the regular tab idents. Other changes: - reflow long lines - change multi-line conditionals to have test at end of line ........ r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line Patch #1676994: Refactor test_popen2 to use unittest. ........ r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line Remove test/output/test_popen2 (missed in r54417). ........ r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line Patch 1339796: add a relpath() function to os.path. ........ r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines Patch #1675423: PyComplex_AsCComplex() now tries to convert an object to complex using its __complex__() method before falling back to the __float__() method. Therefore, the functions in the cmath module now can operate on objects that define a __complex__() method. (backport) ........ r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines move note to the correct section ........ r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf. ........ r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1678339: test case for bug in difflib. ........ r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line Patch #1630118: add a SpooledTemporaryFile class to tempfile. ........ r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines Patch #1683328: fixes and enhancements for "unparse" demo. ........ r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line Add some doc that was left out from some change to platform.py ........ r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line Add a comment about 3k migration ........ r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line Get rid of deprecation warning when testing commands.getstatus() ........ r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines Try backing out 54407 to see if it corrects the problems on the Windows buildbots. This rev was backported, so we will need to keep both branches in sync, pending the outcome of the test after this checkin. ........ r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines Try to be a little more resilient to errors. This might help the test pass, but my guess is that it won't. I'm guessing that some other test is leaving this file open which means it can't be removed under Windows AFAIK. ........ r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines Try to get test_urllib to pass on Windows by closing the file. I'm guessing that's the problem. h.getfile() must be called *after* h.getreply() and the fp can be None. I'm not entirely convinced this is the best fix (or even correct). The buildbots will tell us if things improve or not. I don't know if this needs to be backported (assuming it actually works). ........ r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. ........ r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines Fix for glob.py if filesystem encoding is None. ........ r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line Remove unused file spotted by Paul Hankin ........ r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". ........ r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines New test for rev. 54407 which only uses directories under TESTFN. ........ r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines Patch #1684834: document some utility C API functions. ........ r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'. ........ r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line Add comments on maintenance of this file ........ r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line Fix sentence, and fix typo in example ........ r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line Put code examples at left margin instead of indenting them ........ r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line Minor clarification, saying that blocking means no timeout (from bug #882297) ........ r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines Bug #1675967: re patterns pickled with older Python versions can now be unpickled. Will backport. ........ r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line Add test and fix for fromkeys() optional argument. ........ r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines Bug #1685704: use -m switch in timeit docs. ........ r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines Back out "Patch #1643874: memory leak in ctypes fixed." The code in this patch leaves no way to give up the ownership of a BSTR instance. ........ r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines Explain the purpose of the b_needsfree flag (forward ported from release25-maint). ........ r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines - Bug #1683368: The object.__init__() and object.__new__() methods are now stricter in rejecting excess arguments. The only time when either allows excess arguments is when it is not overridden and the other one is. For backwards compatibility, when both are overridden, it is a deprecation warning (for now; maybe a Py3k warning later). When merging this into 3.0, the warnings should become errors. Note: without the change to string.py, lots of spurious warnings happen. What's going on there? ........ r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line Add Mark Dickinson for SF # 1675423. ........ r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}. Will backport. ........ r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines Bug #978833: Revert r50844, as it broke _socketobject.dup. Will backport. ........ r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines Add a type.__init__() method that enforces the same signature as type.__new__(), and then calls object.__init__(cls), just to be anal. This allows us to restore the code in string.py's _TemplateMetaclass that called super(...).__init__(name, bases, dct), which I commented out yesterday since it broke due to the stricter argument checking added to object.__init__(). ........ r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines Added a 'create_connect()' function to socket.py, which creates a connection with an optional timeout, and modified httplib.py to use this function in HTTPConnection. Applies patch 1676823. ........ r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines Add note about type.__init__(). ........ r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines Prevent creation (followed by a segfault) of array types when the size overflows the valid Py_ssize_t range. Check return values of PyMem_Malloc. Will backport to release25-maint. ........ r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines Surrounded with try/finally to socket's default timeout setting changes in the tests, so failing one test won't produce strange results in others. Also relaxed the timeout settings in the test (where actually the value didn't mean anything). ........ r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line Make test_relpath() pass on Windows. ........ r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines Patch #1489771: update syntax rules in Python Reference Manual. Python 2.5 added support for explicit relative import statements and yield expressions, which were missing in the manual. Also fix grammar productions that used the names from the Grammar file, markup that broke the generated grammar.txt, and wrap some lines that broke the pdf output. Will backport. ........ r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines Remove typo accent. ........ r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines Revert accidental change. ........ r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines Change the docs to no longer claim that unittest is preferred over doctest for regression tests. ........ r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines Redone the tests, using the infrastructure already present for threading and socket serving. ........ r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines Closing the HTTP connection after each test, and listening more. ........ r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines Added an optional timeout to FTP class. Also I started a test_ftplib.py file to test the ftp lib (right now I included a basic test, the timeout one, and nothing else). ........ r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines Some nits. ........ r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines Forgot to add the file before the previous commit, here go the ftplib tests. ........ r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines Added an optional timeout to poplib.POP3. Also created a test_poplib.py file with a basic test and the timeout ones. Docs are also updated. ........ r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines The basic test cases of poplib.py. ........ r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines Bug 1688393. Adds a control of negative values in socket.recvfrom, which caused an ugly crash. ........ r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines Added timeout to smtplib (to SMTP and SMTP_SSL). Also created the test_smtplib.py file, with a basic test and the timeout ones. Docs are updated too. ........ r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file. Thanks to Jerry Seutter for all three patches. ........ r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line Make test_zipfile clean up its temporary files properly. ........ r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines These are actually methods. ........ r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines In Windows' time.clock(), when QueryPerformanceFrequency() fails, the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC as for the POSIX implementation (thanks to #pypy). ........ r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines Added timout parameter to telnetlib.Telnet. Also created test_telnetlib.py with a basic test and timeout ones. Docs are also updated. ........ r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines Added the posibility to pass the timeout to FTP.connect, not only when instantiating the class. Docs and tests are updated. ........ r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line Bug #1688274: add documentation for C-level class objects. ........ r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines Bump the patch level version of distutils since there were a few bug fixes since the 2.5.0 release. ........ r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines Label name fix. ........ r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line Add item. (Oops, accidentally checked this in on my branch) ........ r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines repair string literal. ........ r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines Markup fix. ........ r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines Duplicate label fix. ........ r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines Typo fix. ........ r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line Fix method names. Will backport. ........ r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-config if Python was built with --enable-shared because that prevented the shared library from being used. ........ r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line Shut up an occaisonal buildbot error due to test files being left around. ........ r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines SF #1685563, MSVCCompiler creates redundant and long PATH strings If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored. Will backport. ........ r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines time.strptime's caching of its locale object was being recreated when the locale changed but not used during the function call it was recreated during. The test in this checkin is untested (OS X does not have the proper locale support for me to test), although the fix for the bug this deals with was tested by the OP (#1290505). Once the buildbots verify the test at least doesn't fail it becomes a backport candidate. ........ r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines Fix the test for recreating the locale cache object by not worrying about if one of the test locales cannot be set. ........ r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines Fix a lot of markup and meta-information glitches. ........ r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines Another fix. ........ r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines Lots of explicit class names for method and member descs. ........ r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines Explicit class names. ........ r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines Some semantic fixes. ........ r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines Remove bogus entry. ........ r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines Fix the class name of strings. ........ r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line SF #1693079: Cannot save empty array in shelve ........ r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines Array module's buffer interface can now handle empty arrays. ........ r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines Fix warnings about object.__init__() signature. Two (test_array and test_descr) were bug IMO; the third (copy_reg) is a work-around which recognizes that object.__init__() doesn't do anything. ........ r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line SF 1602378 Clarify docstrings for bisect ........ r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes ........ r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines - Fix an off-by-one bug in locale.strxfrm(). patch taken from http://bugs.debian.org/416934. ........ r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines Fix the strange case of \begin{methoddesc}[NNTP]{...} where \ifx#1\@undefined ended up comparing N and N, therefore executing the true part of the conditional, blowing up at \@undefined. ........ r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines Now using unittest for the tests infraestructure. Also split the tests in those who need the network, and that who doesn't. ........ r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines Move the functionality for catching warnings in test_warnings.py into a separate class to that reusing the functionality in test_structmembers.py doesn't rerun the tests from test_warnings.py. ........ r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines Document that CatchWarningTests is reused by test_structmembers.py. ........ r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines Add tests for the filename. Test that the stacklevel is handled correctly. ........ r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines Added a SSL server to test_socket_ssl.py to be able to test locally. Now, it checks if have openssl available and run those specific tests (it starts openssl at the beggining of all the tests and then kills it at the end). ........ r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines Implement a contextmanager test.test_support.catch_warning that can be used to catch the last warning issued by the warning framework. Change test_warnings.py and test_structmembers.py to use this new contextmanager. ........ r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines Changed the whole structure of startup and checking if the server is available. Hope to not get more false alarms. ........ r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines Fixed the way that the .pem files are looked for, and changed how to kill the process in win32 to use the _handle attribute. ........ r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines Fix a race condition in this test -- instead of assuming that it will take the test server thread at most 0.5 seconds to get ready, use an event variable. ........ r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line Clean up imports. ........ r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line Stop using test_support.verify(). ........ r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines Bug #1686475: Support stat'ing open files on Windows again. Will backport to 2.5. ........ r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line Make test_getopt use unittest. ........ r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line Make test_softspace use unittest. ........ r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines Fix WalkTests.test_traversal() on Windows. The cleanup in MakedirTests.setUp() can now be removed. ........ r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines Bug #1563759: struct.unpack doens't support buffer protocol objects ........ r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_long_future to use unittest. ........ r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_normalization to use unittest. ........ r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line Some grammar fixes ........ r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_stringprep to use unittest. ........ r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line Import cleanup in test_crypt. ........ r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_gc to use unittest. ........ r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_module to use unittest. ........ r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_fileinput to use unittest. ........ r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines Doc that file.next() has undefined behaviour when called on a file opened with 'w'. Closes bug #1569057. To be backported once 2.5 branch is unfrozen. ........ r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line Added optional timeout to SocketHandler.makeSocket (SF #1695948) ........ r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines Patch #1695862: remove old test directory that causes test_urllib failures on Windows buildbots. The change is a one time fix and will be removed after a successful buildbot run. ........ r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines Minor fix to the tests pass ok even with -O. ........ r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line Typo fix. ........ r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines General clean-up. Lot of margin corrections, comments, some typos. Exceptions now are raised in the new style. And a mockup class is now also new style. Thanks Santiago Pereson. ........ r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines Repair a duplicate label and some obsolete uses of \setindexsubitem. ........ r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line Add window.chgat() method, submitted via e-mail by Fabian Kreutz ........ r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line Point readers at the patch submission instructions ........ r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line Describe undocumented third argument to touchline() ........ r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines Add some missing NULL checks which trigger crashes on low-memory conditions. Found by Victor Stinner. Will backport when 2.5 branch is unfrozen. ........ r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line SF 1191699: Make slices picklable ........ r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines Exceptions are no longer old-style instances. Fix accordingly. ........ r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines Repair missing spaces after \UNIX. ........ r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line SF 1193128: Let str.translate(None) be an identity transformation ........ r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1698951: clarify deprecation message in rexec and Bastion ........ r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1695862: remove the cleanup code, now that Windows buildbots are green again. ........ r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the first chunk fed to the decoder started with a BOM, but was longer than 3 bytes. ........ r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines Port r54805 from python25-maint branch: Add code to read from master_fd in the parent, breaking when we get an OSError (EIO can occur on Linux) or there's no more data to read. Without this, test_pty.py can hang on the waitpid() because the child is blocking on the stdout write. This will definitely happen on Mac OS X and could potentially happen on other platforms. See the comment for details. ........ r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127 ........ r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line Fix potential crash in path manipulation on windows ........ r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore' is built before '_ctypes' is attempted. Will backport to 2.5 once it is unfrozen for 2.5.1. ........ r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines When __slots__ are set to a unicode string, make it work the same as setting a plain string, ie don't expand to single letter identifiers. ........ r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line SF #1701207, Fix bogus assertion (and test it!) ........ r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line Check the availability of the urlfetch resource earlier than before. ........ r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines Add Travis Oliphant. ........ r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines Silence a compiler warning about incompatible pointer types. ........ r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines SF #1703270, add missing declaration in readline.c to avoid compiler warning. ........ r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines Revert r53997 as per http://mail.python.org/pipermail/python-dev/2007-March/071796.html . I've kept a couple of still-valid extra tests in test_descr, but didn't bother to sort through the new comments and refactorings added in r53997 to see if some of them could be kept. If so, they could go in a follow-up check-in. ........ r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines Fix a usage of the dangerous pattern decref - modify field - incref. ........ r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines Add an optional address to copy the failure mails to. Detect a conflict in the only file that should have outstanding changes when this script is run. This doesn't matter on the trunk, but does when run on a branch. Trunk always has the date set to today in boilerplate.tex. Each time a release is cut with a different date, a conflict occurs. (We could copy a known good version, but then we would lose changes to this file.) ........ r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines Bug #1704790: bind name "sys" locally in __del__ method so that it is not cleared before __del__ is run. ........ r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines Added tests for other methods of SSL object. Now we cover all the object methods. This is the final step to close the #451607 bug. ........ r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines As specified in RFC 2616, 2xx code indicates that the client's request was successfully received, understood, and accepted. Now in these cases no error is raised. Also fixed tests. ........ r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line Convert PyUnit -> unittest. ........ r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line Remove code that hasn't been called in years. ........ r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line Fix SF #1703110, Incorrect example for add_password() (use uri, not host) ........ r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines Some new year updates. ........ r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines Added a comment about last change in urllib2.py (all 2xx responses are ok now). ........ r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines Bug #1705717: error in sys.argv docs. ........ r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. ........ r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line Fix markup ........ r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition ........ r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h ........ r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now. ........ r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines Patch #1698768: updated the "using Python on the Mac" intro. ........ r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines Markup fix. ........ r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines Whitespace normalization. Ugh, we really need to do this more often. You might want to review this change as it's my first time. Be gentle. :-) ........ r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule(). ........ r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing. ........ r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line Change test_support.have_unicode to use True/False instead of 1/0. ........ r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines Whitespace normalization. ........ r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line Import and raise statement cleanup. ........ r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line Convert test_ossaudiodev to use unittest. ........ r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line Fix an issue related to the unittest conversion. ........ r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line fix some markup errors ........ r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile. ........ r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build ........ r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line Minor wording change on slicing aide-memoire. ........ r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line Accomodate 64 bit time_t in the _bsddb module. ........
4151 lines
98 KiB
C
4151 lines
98 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
|
|
|
|
#define COMP_GENEXP 0
|
|
#define COMP_LISTCOMP 1
|
|
#define COMP_SETCOMP 2
|
|
|
|
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 */
|
|
int 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 int compiler_call_helper(struct compiler *c, int n,
|
|
asdl_seq *args,
|
|
asdl_seq *keywords,
|
|
expr_ty starargs,
|
|
expr_ty kwargs);
|
|
|
|
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);
|
|
/* Don't mangle __id__ or names with dots.
|
|
|
|
The only time a name with a dot can occur is when
|
|
we are compiling an import statement that has a
|
|
package name.
|
|
|
|
TODO(jhylton): Decide whether we want to support
|
|
mangling of the module name, e.g. __M.X.
|
|
*/
|
|
if ((name[nlen-1] == '_' && name[nlen-2] == '_')
|
|
|| strchr(name, '.')) {
|
|
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_OFFSET) & 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 = 0;
|
|
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 = 1;
|
|
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 SET_ADD:
|
|
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 LOAD_BUILD_CLASS:
|
|
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 STORE_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 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 MAKE_BYTES:
|
|
return 0;
|
|
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) % 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) - ((oparg >> 16) & 0xffff);
|
|
case MAKE_CLOSURE:
|
|
return -1 - NARGS(oparg) - ((oparg >> 16) & 0xffff);
|
|
#undef NARGS
|
|
case BUILD_SLICE:
|
|
if (oparg == 3)
|
|
return -2;
|
|
else
|
|
return -1;
|
|
|
|
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_unpack_nested(struct compiler *c, asdl_seq *args) {
|
|
int i, len;
|
|
len = asdl_seq_LEN(args);
|
|
ADDOP_I(c, UNPACK_SEQUENCE, len);
|
|
for (i = 0; i < len; i++) {
|
|
arg_ty elt = (arg_ty)asdl_seq_GET(args, i);
|
|
switch (elt->kind) {
|
|
case SimpleArg_kind:
|
|
if (!compiler_nameop(c, elt->v.SimpleArg.arg, Store))
|
|
return 0;
|
|
break;
|
|
case NestedArgs_kind:
|
|
if (!compiler_unpack_nested(c, elt->v.NestedArgs.args))
|
|
return 0;
|
|
break;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_arguments(struct compiler *c, arguments_ty args)
|
|
{
|
|
int i;
|
|
int n = asdl_seq_LEN(args->args);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
arg_ty arg = (arg_ty)asdl_seq_GET(args->args, i);
|
|
if (arg->kind == NestedArgs_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);
|
|
if (!compiler_unpack_nested(c, arg->v.NestedArgs.args))
|
|
return 0;
|
|
}
|
|
}
|
|
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++) {
|
|
arg_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.SimpleArg.arg, consts);
|
|
if (!compiler_visit_expr(c, default_)) {
|
|
return -1;
|
|
}
|
|
default_count++;
|
|
}
|
|
}
|
|
return default_count;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_argannotation(struct compiler *c, identifier id,
|
|
expr_ty annotation, PyObject *names)
|
|
{
|
|
if (annotation) {
|
|
VISIT(c, expr, annotation);
|
|
if (PyList_Append(names, id))
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_argannotations(struct compiler *c, asdl_seq* args,
|
|
PyObject *names)
|
|
{
|
|
int i, error;
|
|
for (i = 0; i < asdl_seq_LEN(args); i++) {
|
|
arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
|
|
if (arg->kind == NestedArgs_kind)
|
|
error = compiler_visit_argannotations(
|
|
c,
|
|
arg->v.NestedArgs.args,
|
|
names);
|
|
else
|
|
error = compiler_visit_argannotation(
|
|
c,
|
|
arg->v.SimpleArg.arg,
|
|
arg->v.SimpleArg.annotation,
|
|
names);
|
|
if (error)
|
|
return error;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
compiler_visit_annotations(struct compiler *c, arguments_ty args,
|
|
expr_ty returns)
|
|
{
|
|
/* Push arg annotations and a list of the argument names. Return the #
|
|
of items pushed. The expressions are evaluated out-of-order wrt the
|
|
source code.
|
|
|
|
More than 2^16-1 annotations is a SyntaxError. Returns -1 on error.
|
|
*/
|
|
static identifier return_str;
|
|
PyObject *names;
|
|
int len;
|
|
names = PyList_New(0);
|
|
if (!names)
|
|
return -1;
|
|
|
|
if (compiler_visit_argannotations(c, args->args, names))
|
|
goto error;
|
|
if (args->varargannotation &&
|
|
compiler_visit_argannotation(c, args->vararg,
|
|
args->varargannotation, names))
|
|
goto error;
|
|
if (compiler_visit_argannotations(c, args->kwonlyargs, names))
|
|
goto error;
|
|
if (args->kwargannotation &&
|
|
compiler_visit_argannotation(c, args->kwarg,
|
|
args->kwargannotation, names))
|
|
goto error;
|
|
|
|
if (!return_str) {
|
|
return_str = PyString_InternFromString("return");
|
|
if (!return_str)
|
|
goto error;
|
|
}
|
|
if (compiler_visit_argannotation(c, return_str, returns, names)) {
|
|
goto error;
|
|
}
|
|
|
|
len = PyList_GET_SIZE(names);
|
|
if (len > 65534) {
|
|
/* len must fit in 16 bits, and len is incremented below */
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
"too many annotations");
|
|
goto error;
|
|
}
|
|
if (len) {
|
|
/* convert names to a tuple and place on stack */
|
|
PyObject *elt;
|
|
int i;
|
|
PyObject *s = PyTuple_New(len);
|
|
if (!s)
|
|
goto error;
|
|
for (i = 0; i < len; i++) {
|
|
elt = PyList_GET_ITEM(names, i);
|
|
Py_INCREF(elt);
|
|
PyTuple_SET_ITEM(s, i, elt);
|
|
}
|
|
ADDOP_O(c, LOAD_CONST, s, consts);
|
|
Py_DECREF(s);
|
|
len++; /* include the just-pushed tuple */
|
|
}
|
|
Py_DECREF(names);
|
|
return len;
|
|
|
|
error:
|
|
Py_DECREF(names);
|
|
return -1;
|
|
}
|
|
|
|
static int
|
|
compiler_function(struct compiler *c, stmt_ty s)
|
|
{
|
|
PyCodeObject *co;
|
|
PyObject *first_const = Py_None;
|
|
arguments_ty args = s->v.FunctionDef.args;
|
|
expr_ty returns = s->v.FunctionDef.returns;
|
|
asdl_seq* decos = s->v.FunctionDef.decorators;
|
|
stmt_ty st;
|
|
int i, n, docstring, kw_default_count = 0, arglength;
|
|
int num_annotations;
|
|
|
|
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);
|
|
num_annotations = compiler_visit_annotations(c, args, returns);
|
|
if (num_annotations < 0)
|
|
return 0;
|
|
assert((num_annotations & 0xFFFF) == num_annotations);
|
|
|
|
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;
|
|
arglength |= num_annotations << 16;
|
|
compiler_make_closure(c, co, arglength);
|
|
Py_DECREF(co);
|
|
|
|
/* decorators */
|
|
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)
|
|
{
|
|
static PyObject *build_class = NULL;
|
|
static PyObject *locals = NULL;
|
|
PyCodeObject *co;
|
|
PyObject *str;
|
|
PySTEntryObject *ste;
|
|
int err;
|
|
|
|
/* initialize statics */
|
|
if (build_class == NULL) {
|
|
build_class = PyString_FromString("__build_class__");
|
|
if (build_class == NULL)
|
|
return 0;
|
|
}
|
|
if (locals == NULL) {
|
|
locals = PyString_FromString("__locals__");
|
|
if (locals == NULL)
|
|
return 0;
|
|
}
|
|
|
|
/* ultimately generate code for:
|
|
<name> = __build_class__(<func>, <name>, *<bases>, **<keywords>)
|
|
where:
|
|
<func> is a function/closure created from the class body
|
|
<name> is the class name
|
|
<bases> is the positional arguments and *varargs argument
|
|
<keywords> is the keyword arguments and **kwds argument
|
|
This borrows from compiler_call.
|
|
*/
|
|
|
|
/* 0. Create a fake variable named __locals__ */
|
|
ste = PySymtable_Lookup(c->c_st, s);
|
|
if (ste == NULL)
|
|
return 0;
|
|
assert(PyList_Check(ste->ste_varnames));
|
|
err = PyList_Append(ste->ste_varnames, locals);
|
|
Py_DECREF(ste);
|
|
if (err < 0)
|
|
return 0;
|
|
|
|
/* 1. compile the class body into a code object */
|
|
if (!compiler_enter_scope(c, s->v.ClassDef.name, (void *)s, s->lineno))
|
|
return 0;
|
|
/* this block represents what we do in the new scope */
|
|
{
|
|
/* use the class name for name mangling */
|
|
Py_INCREF(s->v.ClassDef.name);
|
|
c->u->u_private = s->v.ClassDef.name;
|
|
/* force it to have one mandatory argument */
|
|
c->u->u_argcount = 1;
|
|
/* load the first argument ... */
|
|
ADDOP_I(c, LOAD_FAST, 0);
|
|
/* ... and store it into f_locals */
|
|
ADDOP_IN_SCOPE(c, STORE_LOCALS);
|
|
/* load __name__ ... */
|
|
str = PyString_InternFromString("__name__");
|
|
if (!str || !compiler_nameop(c, str, Load)) {
|
|
Py_XDECREF(str);
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
Py_DECREF(str);
|
|
/* ... and store it as __module__ */
|
|
str = PyString_InternFromString("__module__");
|
|
if (!str || !compiler_nameop(c, str, Store)) {
|
|
Py_XDECREF(str);
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
Py_DECREF(str);
|
|
/* compile the body proper */
|
|
if (!compiler_body(c, s->v.ClassDef.body)) {
|
|
compiler_exit_scope(c);
|
|
return 0;
|
|
}
|
|
/* return None */
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
ADDOP_IN_SCOPE(c, RETURN_VALUE);
|
|
/* create the code object */
|
|
co = assemble(c, 1);
|
|
}
|
|
/* leave the new scope */
|
|
compiler_exit_scope(c);
|
|
if (co == NULL)
|
|
return 0;
|
|
|
|
/* 2. load the 'build_class' function */
|
|
ADDOP(c, LOAD_BUILD_CLASS);
|
|
|
|
/* 3. load a function (or closure) made from the code object */
|
|
compiler_make_closure(c, co, 0);
|
|
Py_DECREF(co);
|
|
|
|
/* 4. load class name */
|
|
ADDOP_O(c, LOAD_CONST, s->v.ClassDef.name, consts);
|
|
|
|
/* 5. generate the rest of the code for the call */
|
|
if (!compiler_call_helper(c, 2,
|
|
s->v.ClassDef.bases,
|
|
s->v.ClassDef.keywords,
|
|
s->v.ClassDef.starargs,
|
|
s->v.ClassDef.kwargs))
|
|
return 0;
|
|
|
|
/* 6. store into <name> */
|
|
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_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 = 0;
|
|
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 = 0;
|
|
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) {
|
|
basicblock *cleanup_end, *cleanup_body;
|
|
|
|
cleanup_end = compiler_new_block(c);
|
|
cleanup_body = compiler_new_block(c);
|
|
if(!(cleanup_end || cleanup_body))
|
|
return 0;
|
|
|
|
compiler_nameop(c, handler->name, Store);
|
|
ADDOP(c, POP_TOP);
|
|
|
|
/*
|
|
try:
|
|
# body
|
|
except type as name:
|
|
try:
|
|
# body
|
|
finally:
|
|
name = None
|
|
del name
|
|
*/
|
|
|
|
/* second try: */
|
|
ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
|
|
compiler_use_next_block(c, cleanup_body);
|
|
if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
|
|
return 0;
|
|
|
|
/* second # body */
|
|
VISIT_SEQ(c, stmt, handler->body);
|
|
ADDOP(c, POP_BLOCK);
|
|
compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
|
|
|
|
/* finally: */
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
compiler_use_next_block(c, cleanup_end);
|
|
if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
|
|
return 0;
|
|
|
|
/* name = None */
|
|
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
|
compiler_nameop(c, handler->name, Store);
|
|
|
|
/* del name */
|
|
compiler_nameop(c, handler->name, Del);
|
|
|
|
ADDOP(c, END_FINALLY);
|
|
compiler_pop_fblock(c, FINALLY_END, cleanup_end);
|
|
}
|
|
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 = 0;
|
|
|
|
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 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:
|
|
case Nonlocal_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)
|
|
{
|
|
VISIT(c, expr, e->v.Call.func);
|
|
return compiler_call_helper(c, 0,
|
|
e->v.Call.args,
|
|
e->v.Call.keywords,
|
|
e->v.Call.starargs,
|
|
e->v.Call.kwargs);
|
|
}
|
|
|
|
/* shared code between compiler_call and compiler_class */
|
|
static int
|
|
compiler_call_helper(struct compiler *c,
|
|
int n, /* Args already pushed */
|
|
asdl_seq *args,
|
|
asdl_seq *keywords,
|
|
expr_ty starargs,
|
|
expr_ty kwargs)
|
|
{
|
|
int code = 0;
|
|
|
|
n += asdl_seq_LEN(args);
|
|
VISIT_SEQ(c, expr, args);
|
|
if (keywords) {
|
|
VISIT_SEQ(c, keyword, keywords);
|
|
n |= asdl_seq_LEN(keywords) << 8;
|
|
}
|
|
if (starargs) {
|
|
VISIT(c, expr, starargs);
|
|
code |= 1;
|
|
}
|
|
if (kwargs) {
|
|
VISIT(c, expr, 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;
|
|
}
|
|
|
|
|
|
/* List and set comprehensions and generator expressions work by creating a
|
|
nested function to perform the actual iteration. This means that the
|
|
iteration variables don't leak into the current scope.
|
|
The defined function is called immediately following its definition, with the
|
|
result of that call being the result of the expression.
|
|
The LC/SC version returns the populated container, while the GE version is
|
|
flagged in symtable.c as a generator, so it returns the generator object
|
|
when the function is called.
|
|
This code *knows* that the loop cannot contain break, continue, or return,
|
|
so it cheats and skips the SETUP_LOOP/POP_BLOCK steps used in normal loops.
|
|
|
|
Possible cleanups:
|
|
- iterate over the generator sequence instead of using recursion
|
|
*/
|
|
|
|
static int
|
|
compiler_comprehension_generator(struct compiler *c, PyObject *tmpname,
|
|
asdl_seq *generators, int gen_index,
|
|
expr_ty elt, int type)
|
|
{
|
|
/* generate code for the iterator, then each of the ifs,
|
|
and then write to the element */
|
|
|
|
comprehension_ty gen;
|
|
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;
|
|
|
|
gen = (comprehension_ty)asdl_seq_GET(generators, gen_index);
|
|
|
|
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, gen->iter);
|
|
ADDOP(c, GET_ITER);
|
|
}
|
|
compiler_use_next_block(c, start);
|
|
ADDOP_JREL(c, FOR_ITER, anchor);
|
|
NEXT_BLOCK(c);
|
|
VISIT(c, expr, gen->target);
|
|
|
|
/* XXX this needs to be cleaned up...a lot! */
|
|
n = asdl_seq_LEN(gen->ifs);
|
|
for (i = 0; i < n; i++) {
|
|
expr_ty e = (expr_ty)asdl_seq_GET(gen->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_comprehension_generator(c, tmpname,
|
|
generators, gen_index,
|
|
elt, type))
|
|
return 0;
|
|
|
|
/* only append after the last for generator */
|
|
if (gen_index >= asdl_seq_LEN(generators)) {
|
|
/* comprehension specific code */
|
|
switch (type) {
|
|
case COMP_GENEXP:
|
|
VISIT(c, expr, elt);
|
|
ADDOP(c, YIELD_VALUE);
|
|
ADDOP(c, POP_TOP);
|
|
break;
|
|
case COMP_LISTCOMP:
|
|
if (!compiler_nameop(c, tmpname, Load))
|
|
return 0;
|
|
VISIT(c, expr, elt);
|
|
ADDOP(c, LIST_APPEND);
|
|
break;
|
|
case COMP_SETCOMP:
|
|
if (!compiler_nameop(c, tmpname, Load))
|
|
return 0;
|
|
VISIT(c, expr, elt);
|
|
ADDOP(c, SET_ADD);
|
|
break;
|
|
default:
|
|
return 0;
|
|
}
|
|
|
|
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);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
compiler_comprehension(struct compiler *c, expr_ty e, int type, identifier name,
|
|
asdl_seq *generators, expr_ty elt)
|
|
{
|
|
PyCodeObject *co = NULL;
|
|
identifier tmp = NULL;
|
|
expr_ty outermost_iter;
|
|
|
|
outermost_iter = ((comprehension_ty)
|
|
asdl_seq_GET(generators, 0))->iter;
|
|
|
|
if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
|
|
goto error;
|
|
|
|
if (type != COMP_GENEXP) {
|
|
tmp = compiler_new_tmpname(c);
|
|
if (!tmp)
|
|
goto error_in_scope;
|
|
|
|
ADDOP_I(c, (type == COMP_LISTCOMP ?
|
|
BUILD_LIST : BUILD_SET), 0);
|
|
ADDOP(c, DUP_TOP);
|
|
if (!compiler_nameop(c, tmp, Store))
|
|
goto error_in_scope;
|
|
}
|
|
|
|
if (!compiler_comprehension_generator(c, tmp, generators, 0, elt, type))
|
|
goto error_in_scope;
|
|
|
|
if (type != COMP_GENEXP) {
|
|
ADDOP(c, RETURN_VALUE);
|
|
}
|
|
|
|
co = assemble(c, 1);
|
|
compiler_exit_scope(c);
|
|
if (co == NULL)
|
|
goto error;
|
|
|
|
if (!compiler_make_closure(c, co, 0))
|
|
goto error;
|
|
Py_DECREF(co);
|
|
Py_XDECREF(tmp);
|
|
|
|
VISIT(c, expr, outermost_iter);
|
|
ADDOP(c, GET_ITER);
|
|
ADDOP_I(c, CALL_FUNCTION, 1);
|
|
return 1;
|
|
error_in_scope:
|
|
compiler_exit_scope(c);
|
|
error:
|
|
Py_XDECREF(co);
|
|
Py_XDECREF(tmp);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
compiler_genexp(struct compiler *c, expr_ty e)
|
|
{
|
|
static identifier name;
|
|
if (!name) {
|
|
name = PyString_FromString("<genexp>");
|
|
if (!name)
|
|
return 0;
|
|
}
|
|
assert(e->kind == GeneratorExp_kind);
|
|
return compiler_comprehension(c, e, COMP_GENEXP, name,
|
|
e->v.GeneratorExp.generators,
|
|
e->v.GeneratorExp.elt);
|
|
}
|
|
|
|
static int
|
|
compiler_listcomp(struct compiler *c, expr_ty e)
|
|
{
|
|
static identifier name;
|
|
if (!name) {
|
|
name = PyString_FromString("<listcomp>");
|
|
if (!name)
|
|
return 0;
|
|
}
|
|
assert(e->kind == ListComp_kind);
|
|
return compiler_comprehension(c, e, COMP_LISTCOMP, name,
|
|
e->v.ListComp.generators,
|
|
e->v.ListComp.elt);
|
|
}
|
|
|
|
static int
|
|
compiler_setcomp(struct compiler *c, expr_ty e)
|
|
{
|
|
static identifier name;
|
|
if (!name) {
|
|
name = PyString_FromString("<setcomp>");
|
|
if (!name)
|
|
return 0;
|
|
}
|
|
assert(e->kind == SetComp_kind);
|
|
return compiler_comprehension(c, e, COMP_SETCOMP, name,
|
|
e->v.SetComp.generators,
|
|
e->v.SetComp.elt);
|
|
}
|
|
|
|
|
|
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 = 0;
|
|
}
|
|
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 GeneratorExp_kind:
|
|
return compiler_genexp(c, e);
|
|
case ListComp_kind:
|
|
return compiler_listcomp(c, e);
|
|
case SetComp_kind:
|
|
return compiler_setcomp(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 Bytes_kind:
|
|
ADDOP_O(c, LOAD_CONST, e->v.Bytes.s, consts);
|
|
ADDOP(c, MAKE_BYTES);
|
|
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;
|
|
}
|