mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00

Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
3404 lines
83 KiB
C
3404 lines
83 KiB
C
/* Long (arbitrary precision) integer object implementation */
|
|
|
|
/* XXX The functional organization of this file is terrible */
|
|
|
|
#include "Python.h"
|
|
#include "longintrepr.h"
|
|
|
|
#include <ctype.h>
|
|
|
|
/* For long multiplication, use the O(N**2) school algorithm unless
|
|
* both operands contain more than KARATSUBA_CUTOFF digits (this
|
|
* being an internal Python long digit, in base BASE).
|
|
*/
|
|
#define KARATSUBA_CUTOFF 70
|
|
#define KARATSUBA_SQUARE_CUTOFF (2 * KARATSUBA_CUTOFF)
|
|
|
|
/* For exponentiation, use the binary left-to-right algorithm
|
|
* unless the exponent contains more than FIVEARY_CUTOFF digits.
|
|
* In that case, do 5 bits at a time. The potential drawback is that
|
|
* a table of 2**5 intermediate results is computed.
|
|
*/
|
|
#define FIVEARY_CUTOFF 8
|
|
|
|
#define ABS(x) ((x) < 0 ? -(x) : (x))
|
|
|
|
#undef MIN
|
|
#undef MAX
|
|
#define MAX(x, y) ((x) < (y) ? (y) : (x))
|
|
#define MIN(x, y) ((x) > (y) ? (y) : (x))
|
|
|
|
/* Forward */
|
|
static PyLongObject *long_normalize(PyLongObject *);
|
|
static PyLongObject *mul1(PyLongObject *, wdigit);
|
|
static PyLongObject *muladd1(PyLongObject *, wdigit, wdigit);
|
|
static PyLongObject *divrem1(PyLongObject *, digit, digit *);
|
|
static PyObject *long_format(PyObject *aa, int base);
|
|
|
|
#define SIGCHECK(PyTryBlock) \
|
|
if (--_Py_Ticker < 0) { \
|
|
_Py_Ticker = _Py_CheckInterval; \
|
|
if (PyErr_CheckSignals()) PyTryBlock \
|
|
}
|
|
|
|
/* Normalize (remove leading zeros from) a long int object.
|
|
Doesn't attempt to free the storage--in most cases, due to the nature
|
|
of the algorithms used, this could save at most be one word anyway. */
|
|
|
|
static PyLongObject *
|
|
long_normalize(register PyLongObject *v)
|
|
{
|
|
Py_ssize_t j = ABS(v->ob_size);
|
|
Py_ssize_t i = j;
|
|
|
|
while (i > 0 && v->ob_digit[i-1] == 0)
|
|
--i;
|
|
if (i != j)
|
|
v->ob_size = (v->ob_size < 0) ? -(i) : i;
|
|
return v;
|
|
}
|
|
|
|
/* Allocate a new long int object with size digits.
|
|
Return NULL and set exception if we run out of memory. */
|
|
|
|
PyLongObject *
|
|
_PyLong_New(Py_ssize_t size)
|
|
{
|
|
if (size > PY_SSIZE_T_MAX) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
return PyObject_NEW_VAR(PyLongObject, &PyLong_Type, size);
|
|
}
|
|
|
|
PyObject *
|
|
_PyLong_Copy(PyLongObject *src)
|
|
{
|
|
PyLongObject *result;
|
|
Py_ssize_t i;
|
|
|
|
assert(src != NULL);
|
|
i = src->ob_size;
|
|
if (i < 0)
|
|
i = -(i);
|
|
result = _PyLong_New(i);
|
|
if (result != NULL) {
|
|
result->ob_size = src->ob_size;
|
|
while (--i >= 0)
|
|
result->ob_digit[i] = src->ob_digit[i];
|
|
}
|
|
return (PyObject *)result;
|
|
}
|
|
|
|
/* Create a new long int object from a C long int */
|
|
|
|
PyObject *
|
|
PyLong_FromLong(long ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned long t; /* unsigned so >> doesn't propagate sign bit */
|
|
int ndigits = 0;
|
|
int negative = 0;
|
|
|
|
if (ival < 0) {
|
|
ival = -ival;
|
|
negative = 1;
|
|
}
|
|
|
|
/* Count the number of Python digits.
|
|
We used to pick 5 ("big enough for anything"), but that's a
|
|
waste of time and space given that 5*15 = 75 bits are rarely
|
|
needed. */
|
|
t = (unsigned long)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = negative ? -ndigits : ndigits;
|
|
t = (unsigned long)ival;
|
|
while (t) {
|
|
*p++ = (digit)(t & MASK);
|
|
t >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C unsigned long int */
|
|
|
|
PyObject *
|
|
PyLong_FromUnsignedLong(unsigned long ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned long t;
|
|
int ndigits = 0;
|
|
|
|
/* Count the number of Python digits. */
|
|
t = (unsigned long)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = ndigits;
|
|
while (ival) {
|
|
*p++ = (digit)(ival & MASK);
|
|
ival >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C double */
|
|
|
|
PyObject *
|
|
PyLong_FromDouble(double dval)
|
|
{
|
|
PyLongObject *v;
|
|
double frac;
|
|
int i, ndig, expo, neg;
|
|
neg = 0;
|
|
if (Py_IS_INFINITY(dval)) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"cannot convert float infinity to long");
|
|
return NULL;
|
|
}
|
|
if (dval < 0.0) {
|
|
neg = 1;
|
|
dval = -dval;
|
|
}
|
|
frac = frexp(dval, &expo); /* dval = frac*2**expo; 0.0 <= frac < 1.0 */
|
|
if (expo <= 0)
|
|
return PyLong_FromLong(0L);
|
|
ndig = (expo-1) / SHIFT + 1; /* Number of 'digits' in result */
|
|
v = _PyLong_New(ndig);
|
|
if (v == NULL)
|
|
return NULL;
|
|
frac = ldexp(frac, (expo-1) % SHIFT + 1);
|
|
for (i = ndig; --i >= 0; ) {
|
|
long bits = (long)frac;
|
|
v->ob_digit[i] = (digit) bits;
|
|
frac = frac - (double)bits;
|
|
frac = ldexp(frac, SHIFT);
|
|
}
|
|
if (neg)
|
|
v->ob_size = -(v->ob_size);
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Checking for overflow in PyLong_AsLong is a PITA since C doesn't define
|
|
* anything about what happens when a signed integer operation overflows,
|
|
* and some compilers think they're doing you a favor by being "clever"
|
|
* then. The bit pattern for the largest postive signed long is
|
|
* (unsigned long)LONG_MAX, and for the smallest negative signed long
|
|
* it is abs(LONG_MIN), which we could write -(unsigned long)LONG_MIN.
|
|
* However, some other compilers warn about applying unary minus to an
|
|
* unsigned operand. Hence the weird "0-".
|
|
*/
|
|
#define PY_ABS_LONG_MIN (0-(unsigned long)LONG_MIN)
|
|
#define PY_ABS_SSIZE_T_MIN (0-(size_t)PY_SSIZE_T_MIN)
|
|
|
|
/* Get a C long int from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
long
|
|
PyLong_AsLong(PyObject *vv)
|
|
{
|
|
/* This version by Tim Peters */
|
|
register PyLongObject *v;
|
|
unsigned long x, prev;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
if (vv != NULL && PyInt_Check(vv))
|
|
return PyInt_AsLong(vv);
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev)
|
|
goto overflow;
|
|
}
|
|
/* Haven't lost any bits, but casting to long requires extra care
|
|
* (see comment above).
|
|
*/
|
|
if (x <= (unsigned long)LONG_MAX) {
|
|
return (long)x * sign;
|
|
}
|
|
else if (sign < 0 && x == PY_ABS_LONG_MIN) {
|
|
return LONG_MIN;
|
|
}
|
|
/* else overflow */
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"long int too large to convert to int");
|
|
return -1;
|
|
}
|
|
|
|
/* Get a Py_ssize_t from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
Py_ssize_t
|
|
_PyLong_AsSsize_t(PyObject *vv) {
|
|
register PyLongObject *v;
|
|
size_t x, prev;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev)
|
|
goto overflow;
|
|
}
|
|
/* Haven't lost any bits, but casting to a signed type requires
|
|
* extra care (see comment above).
|
|
*/
|
|
if (x <= (size_t)PY_SSIZE_T_MAX) {
|
|
return (Py_ssize_t)x * sign;
|
|
}
|
|
else if (sign < 0 && x == PY_ABS_SSIZE_T_MIN) {
|
|
return PY_SSIZE_T_MIN;
|
|
}
|
|
/* else overflow */
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"long int too large to convert to int");
|
|
return -1;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
unsigned long
|
|
PyLong_AsUnsignedLong(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
unsigned long x, prev;
|
|
Py_ssize_t i;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
if (vv != NULL && PyInt_Check(vv)) {
|
|
long val = PyInt_AsLong(vv);
|
|
if (val < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"can't convert negative value to unsigned long");
|
|
return (unsigned long) -1;
|
|
}
|
|
return val;
|
|
}
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
x = 0;
|
|
if (i < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"can't convert negative value to unsigned long");
|
|
return (unsigned long) -1;
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"long int too large to convert");
|
|
return (unsigned long) -1;
|
|
}
|
|
}
|
|
return x;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object, ignoring the high bits.
|
|
Returns -1 and sets an error condition if an error occurs. */
|
|
|
|
unsigned long
|
|
PyLong_AsUnsignedLongMask(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
unsigned long x;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
if (vv != NULL && PyInt_Check(vv))
|
|
return PyInt_AsUnsignedLongMask(vv);
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -i;
|
|
}
|
|
while (--i >= 0) {
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
}
|
|
return x * sign;
|
|
}
|
|
|
|
int
|
|
_PyLong_Sign(PyObject *vv)
|
|
{
|
|
PyLongObject *v = (PyLongObject *)vv;
|
|
|
|
assert(v != NULL);
|
|
assert(PyLong_Check(v));
|
|
|
|
return v->ob_size == 0 ? 0 : (v->ob_size < 0 ? -1 : 1);
|
|
}
|
|
|
|
size_t
|
|
_PyLong_NumBits(PyObject *vv)
|
|
{
|
|
PyLongObject *v = (PyLongObject *)vv;
|
|
size_t result = 0;
|
|
Py_ssize_t ndigits;
|
|
|
|
assert(v != NULL);
|
|
assert(PyLong_Check(v));
|
|
ndigits = ABS(v->ob_size);
|
|
assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0);
|
|
if (ndigits > 0) {
|
|
digit msd = v->ob_digit[ndigits - 1];
|
|
|
|
result = (ndigits - 1) * SHIFT;
|
|
if (result / SHIFT != (size_t)(ndigits - 1))
|
|
goto Overflow;
|
|
do {
|
|
++result;
|
|
if (result == 0)
|
|
goto Overflow;
|
|
msd >>= 1;
|
|
} while (msd);
|
|
}
|
|
return result;
|
|
|
|
Overflow:
|
|
PyErr_SetString(PyExc_OverflowError, "long has too many bits "
|
|
"to express in a platform size_t");
|
|
return (size_t)-1;
|
|
}
|
|
|
|
PyObject *
|
|
_PyLong_FromByteArray(const unsigned char* bytes, size_t n,
|
|
int little_endian, int is_signed)
|
|
{
|
|
const unsigned char* pstartbyte;/* LSB of bytes */
|
|
int incr; /* direction to move pstartbyte */
|
|
const unsigned char* pendbyte; /* MSB of bytes */
|
|
size_t numsignificantbytes; /* number of bytes that matter */
|
|
size_t ndigits; /* number of Python long digits */
|
|
PyLongObject* v; /* result */
|
|
int idigit = 0; /* next free index in v->ob_digit */
|
|
|
|
if (n == 0)
|
|
return PyLong_FromLong(0L);
|
|
|
|
if (little_endian) {
|
|
pstartbyte = bytes;
|
|
pendbyte = bytes + n - 1;
|
|
incr = 1;
|
|
}
|
|
else {
|
|
pstartbyte = bytes + n - 1;
|
|
pendbyte = bytes;
|
|
incr = -1;
|
|
}
|
|
|
|
if (is_signed)
|
|
is_signed = *pendbyte >= 0x80;
|
|
|
|
/* Compute numsignificantbytes. This consists of finding the most
|
|
significant byte. Leading 0 bytes are insignficant if the number
|
|
is positive, and leading 0xff bytes if negative. */
|
|
{
|
|
size_t i;
|
|
const unsigned char* p = pendbyte;
|
|
const int pincr = -incr; /* search MSB to LSB */
|
|
const unsigned char insignficant = is_signed ? 0xff : 0x00;
|
|
|
|
for (i = 0; i < n; ++i, p += pincr) {
|
|
if (*p != insignficant)
|
|
break;
|
|
}
|
|
numsignificantbytes = n - i;
|
|
/* 2's-comp is a bit tricky here, e.g. 0xff00 == -0x0100, so
|
|
actually has 2 significant bytes. OTOH, 0xff0001 ==
|
|
-0x00ffff, so we wouldn't *need* to bump it there; but we
|
|
do for 0xffff = -0x0001. To be safe without bothering to
|
|
check every case, bump it regardless. */
|
|
if (is_signed && numsignificantbytes < n)
|
|
++numsignificantbytes;
|
|
}
|
|
|
|
/* How many Python long digits do we need? We have
|
|
8*numsignificantbytes bits, and each Python long digit has SHIFT
|
|
bits, so it's the ceiling of the quotient. */
|
|
ndigits = (numsignificantbytes * 8 + SHIFT - 1) / SHIFT;
|
|
if (ndigits > (size_t)INT_MAX)
|
|
return PyErr_NoMemory();
|
|
v = _PyLong_New((int)ndigits);
|
|
if (v == NULL)
|
|
return NULL;
|
|
|
|
/* Copy the bits over. The tricky parts are computing 2's-comp on
|
|
the fly for signed numbers, and dealing with the mismatch between
|
|
8-bit bytes and (probably) 15-bit Python digits.*/
|
|
{
|
|
size_t i;
|
|
twodigits carry = 1; /* for 2's-comp calculation */
|
|
twodigits accum = 0; /* sliding register */
|
|
unsigned int accumbits = 0; /* number of bits in accum */
|
|
const unsigned char* p = pstartbyte;
|
|
|
|
for (i = 0; i < numsignificantbytes; ++i, p += incr) {
|
|
twodigits thisbyte = *p;
|
|
/* Compute correction for 2's comp, if needed. */
|
|
if (is_signed) {
|
|
thisbyte = (0xff ^ thisbyte) + carry;
|
|
carry = thisbyte >> 8;
|
|
thisbyte &= 0xff;
|
|
}
|
|
/* Because we're going LSB to MSB, thisbyte is
|
|
more significant than what's already in accum,
|
|
so needs to be prepended to accum. */
|
|
accum |= thisbyte << accumbits;
|
|
accumbits += 8;
|
|
if (accumbits >= SHIFT) {
|
|
/* There's enough to fill a Python digit. */
|
|
assert(idigit < (int)ndigits);
|
|
v->ob_digit[idigit] = (digit)(accum & MASK);
|
|
++idigit;
|
|
accum >>= SHIFT;
|
|
accumbits -= SHIFT;
|
|
assert(accumbits < SHIFT);
|
|
}
|
|
}
|
|
assert(accumbits < SHIFT);
|
|
if (accumbits) {
|
|
assert(idigit < (int)ndigits);
|
|
v->ob_digit[idigit] = (digit)accum;
|
|
++idigit;
|
|
}
|
|
}
|
|
|
|
v->ob_size = is_signed ? -idigit : idigit;
|
|
return (PyObject *)long_normalize(v);
|
|
}
|
|
|
|
int
|
|
_PyLong_AsByteArray(PyLongObject* v,
|
|
unsigned char* bytes, size_t n,
|
|
int little_endian, int is_signed)
|
|
{
|
|
int i; /* index into v->ob_digit */
|
|
Py_ssize_t ndigits; /* |v->ob_size| */
|
|
twodigits accum; /* sliding register */
|
|
unsigned int accumbits; /* # bits in accum */
|
|
int do_twos_comp; /* store 2's-comp? is_signed and v < 0 */
|
|
twodigits carry; /* for computing 2's-comp */
|
|
size_t j; /* # bytes filled */
|
|
unsigned char* p; /* pointer to next byte in bytes */
|
|
int pincr; /* direction to move p */
|
|
|
|
assert(v != NULL && PyLong_Check(v));
|
|
|
|
if (v->ob_size < 0) {
|
|
ndigits = -(v->ob_size);
|
|
if (!is_signed) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"can't convert negative long to unsigned");
|
|
return -1;
|
|
}
|
|
do_twos_comp = 1;
|
|
}
|
|
else {
|
|
ndigits = v->ob_size;
|
|
do_twos_comp = 0;
|
|
}
|
|
|
|
if (little_endian) {
|
|
p = bytes;
|
|
pincr = 1;
|
|
}
|
|
else {
|
|
p = bytes + n - 1;
|
|
pincr = -1;
|
|
}
|
|
|
|
/* Copy over all the Python digits.
|
|
It's crucial that every Python digit except for the MSD contribute
|
|
exactly SHIFT bits to the total, so first assert that the long is
|
|
normalized. */
|
|
assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0);
|
|
j = 0;
|
|
accum = 0;
|
|
accumbits = 0;
|
|
carry = do_twos_comp ? 1 : 0;
|
|
for (i = 0; i < ndigits; ++i) {
|
|
twodigits thisdigit = v->ob_digit[i];
|
|
if (do_twos_comp) {
|
|
thisdigit = (thisdigit ^ MASK) + carry;
|
|
carry = thisdigit >> SHIFT;
|
|
thisdigit &= MASK;
|
|
}
|
|
/* Because we're going LSB to MSB, thisdigit is more
|
|
significant than what's already in accum, so needs to be
|
|
prepended to accum. */
|
|
accum |= thisdigit << accumbits;
|
|
accumbits += SHIFT;
|
|
|
|
/* The most-significant digit may be (probably is) at least
|
|
partly empty. */
|
|
if (i == ndigits - 1) {
|
|
/* Count # of sign bits -- they needn't be stored,
|
|
* although for signed conversion we need later to
|
|
* make sure at least one sign bit gets stored.
|
|
* First shift conceptual sign bit to real sign bit.
|
|
*/
|
|
stwodigits s = (stwodigits)(thisdigit <<
|
|
(8*sizeof(stwodigits) - SHIFT));
|
|
unsigned int nsignbits = 0;
|
|
while ((s < 0) == do_twos_comp && nsignbits < SHIFT) {
|
|
++nsignbits;
|
|
s <<= 1;
|
|
}
|
|
accumbits -= nsignbits;
|
|
}
|
|
|
|
/* Store as many bytes as possible. */
|
|
while (accumbits >= 8) {
|
|
if (j >= n)
|
|
goto Overflow;
|
|
++j;
|
|
*p = (unsigned char)(accum & 0xff);
|
|
p += pincr;
|
|
accumbits -= 8;
|
|
accum >>= 8;
|
|
}
|
|
}
|
|
|
|
/* Store the straggler (if any). */
|
|
assert(accumbits < 8);
|
|
assert(carry == 0); /* else do_twos_comp and *every* digit was 0 */
|
|
if (accumbits > 0) {
|
|
if (j >= n)
|
|
goto Overflow;
|
|
++j;
|
|
if (do_twos_comp) {
|
|
/* Fill leading bits of the byte with sign bits
|
|
(appropriately pretending that the long had an
|
|
infinite supply of sign bits). */
|
|
accum |= (~(twodigits)0) << accumbits;
|
|
}
|
|
*p = (unsigned char)(accum & 0xff);
|
|
p += pincr;
|
|
}
|
|
else if (j == n && n > 0 && is_signed) {
|
|
/* The main loop filled the byte array exactly, so the code
|
|
just above didn't get to ensure there's a sign bit, and the
|
|
loop below wouldn't add one either. Make sure a sign bit
|
|
exists. */
|
|
unsigned char msb = *(p - pincr);
|
|
int sign_bit_set = msb >= 0x80;
|
|
assert(accumbits == 0);
|
|
if (sign_bit_set == do_twos_comp)
|
|
return 0;
|
|
else
|
|
goto Overflow;
|
|
}
|
|
|
|
/* Fill remaining bytes with copies of the sign bit. */
|
|
{
|
|
unsigned char signbyte = do_twos_comp ? 0xffU : 0U;
|
|
for ( ; j < n; ++j, p += pincr)
|
|
*p = signbyte;
|
|
}
|
|
|
|
return 0;
|
|
|
|
Overflow:
|
|
PyErr_SetString(PyExc_OverflowError, "long too big to convert");
|
|
return -1;
|
|
|
|
}
|
|
|
|
double
|
|
_PyLong_AsScaledDouble(PyObject *vv, int *exponent)
|
|
{
|
|
/* NBITS_WANTED should be > the number of bits in a double's precision,
|
|
but small enough so that 2**NBITS_WANTED is within the normal double
|
|
range. nbitsneeded is set to 1 less than that because the most-significant
|
|
Python digit contains at least 1 significant bit, but we don't want to
|
|
bother counting them (catering to the worst case cheaply).
|
|
|
|
57 is one more than VAX-D double precision; I (Tim) don't know of a double
|
|
format with more precision than that; it's 1 larger so that we add in at
|
|
least one round bit to stand in for the ignored least-significant bits.
|
|
*/
|
|
#define NBITS_WANTED 57
|
|
PyLongObject *v;
|
|
double x;
|
|
const double multiplier = (double)(1L << SHIFT);
|
|
Py_ssize_t i;
|
|
int sign;
|
|
int nbitsneeded;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
else if (i == 0) {
|
|
*exponent = 0;
|
|
return 0.0;
|
|
}
|
|
--i;
|
|
x = (double)v->ob_digit[i];
|
|
nbitsneeded = NBITS_WANTED - 1;
|
|
/* Invariant: i Python digits remain unaccounted for. */
|
|
while (i > 0 && nbitsneeded > 0) {
|
|
--i;
|
|
x = x * multiplier + (double)v->ob_digit[i];
|
|
nbitsneeded -= SHIFT;
|
|
}
|
|
/* There are i digits we didn't shift in. Pretending they're all
|
|
zeroes, the true value is x * 2**(i*SHIFT). */
|
|
*exponent = i;
|
|
assert(x > 0.0);
|
|
return x * sign;
|
|
#undef NBITS_WANTED
|
|
}
|
|
|
|
/* Get a C double from a long int object. */
|
|
|
|
double
|
|
PyLong_AsDouble(PyObject *vv)
|
|
{
|
|
int e = -1;
|
|
double x;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
x = _PyLong_AsScaledDouble(vv, &e);
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
return -1.0;
|
|
/* 'e' initialized to -1 to silence gcc-4.0.x, but it should be
|
|
set correctly after a successful _PyLong_AsScaledDouble() call */
|
|
assert(e >= 0);
|
|
if (e > INT_MAX / SHIFT)
|
|
goto overflow;
|
|
errno = 0;
|
|
x = ldexp(x, e * SHIFT);
|
|
if (Py_OVERFLOWED(x))
|
|
goto overflow;
|
|
return x;
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"long int too large to convert to float");
|
|
return -1.0;
|
|
}
|
|
|
|
/* Create a new long (or int) object from a C pointer */
|
|
|
|
PyObject *
|
|
PyLong_FromVoidPtr(void *p)
|
|
{
|
|
#if SIZEOF_VOID_P <= SIZEOF_LONG
|
|
if ((long)p < 0)
|
|
return PyLong_FromUnsignedLong((unsigned long)p);
|
|
return PyInt_FromLong((long)p);
|
|
#else
|
|
|
|
#ifndef HAVE_LONG_LONG
|
|
# error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long"
|
|
#endif
|
|
#if SIZEOF_LONG_LONG < SIZEOF_VOID_P
|
|
# error "PyLong_FromVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
|
|
#endif
|
|
/* optimize null pointers */
|
|
if (p == NULL)
|
|
return PyInt_FromLong(0);
|
|
return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)p);
|
|
|
|
#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
|
|
}
|
|
|
|
/* Get a C pointer from a long object (or an int object in some cases) */
|
|
|
|
void *
|
|
PyLong_AsVoidPtr(PyObject *vv)
|
|
{
|
|
/* This function will allow int or long objects. If vv is neither,
|
|
then the PyLong_AsLong*() functions will raise the exception:
|
|
PyExc_SystemError, "bad argument to internal function"
|
|
*/
|
|
#if SIZEOF_VOID_P <= SIZEOF_LONG
|
|
long x;
|
|
|
|
if (PyInt_Check(vv))
|
|
x = PyInt_AS_LONG(vv);
|
|
else if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0)
|
|
x = PyLong_AsLong(vv);
|
|
else
|
|
x = PyLong_AsUnsignedLong(vv);
|
|
#else
|
|
|
|
#ifndef HAVE_LONG_LONG
|
|
# error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long"
|
|
#endif
|
|
#if SIZEOF_LONG_LONG < SIZEOF_VOID_P
|
|
# error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
|
|
#endif
|
|
PY_LONG_LONG x;
|
|
|
|
if (PyInt_Check(vv))
|
|
x = PyInt_AS_LONG(vv);
|
|
else if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0)
|
|
x = PyLong_AsLongLong(vv);
|
|
else
|
|
x = PyLong_AsUnsignedLongLong(vv);
|
|
|
|
#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
|
|
|
|
if (x == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
return (void *)x;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
/* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later
|
|
* rewritten to use the newer PyLong_{As,From}ByteArray API.
|
|
*/
|
|
|
|
#define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one
|
|
|
|
/* Create a new long int object from a C PY_LONG_LONG int. */
|
|
|
|
PyObject *
|
|
PyLong_FromLongLong(PY_LONG_LONG ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned PY_LONG_LONG t; /* unsigned so >> doesn't propagate sign bit */
|
|
int ndigits = 0;
|
|
int negative = 0;
|
|
|
|
if (ival < 0) {
|
|
ival = -ival;
|
|
negative = 1;
|
|
}
|
|
|
|
/* Count the number of Python digits.
|
|
We used to pick 5 ("big enough for anything"), but that's a
|
|
waste of time and space given that 5*15 = 75 bits are rarely
|
|
needed. */
|
|
t = (unsigned PY_LONG_LONG)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = negative ? -ndigits : ndigits;
|
|
t = (unsigned PY_LONG_LONG)ival;
|
|
while (t) {
|
|
*p++ = (digit)(t & MASK);
|
|
t >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C unsigned PY_LONG_LONG int. */
|
|
|
|
PyObject *
|
|
PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned PY_LONG_LONG t;
|
|
int ndigits = 0;
|
|
|
|
/* Count the number of Python digits. */
|
|
t = (unsigned PY_LONG_LONG)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = ndigits;
|
|
while (ival) {
|
|
*p++ = (digit)(ival & MASK);
|
|
ival >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C Py_ssize_t. */
|
|
|
|
PyObject *
|
|
_PyLong_FromSsize_t(Py_ssize_t ival)
|
|
{
|
|
Py_ssize_t bytes = ival;
|
|
int one = 1;
|
|
return _PyLong_FromByteArray(
|
|
(unsigned char *)&bytes,
|
|
SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 0);
|
|
}
|
|
|
|
/* Create a new long int object from a C size_t. */
|
|
|
|
PyObject *
|
|
_PyLong_FromSize_t(size_t ival)
|
|
{
|
|
size_t bytes = ival;
|
|
int one = 1;
|
|
return _PyLong_FromByteArray(
|
|
(unsigned char *)&bytes,
|
|
SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 0);
|
|
}
|
|
|
|
/* Get a C PY_LONG_LONG int from a long int object.
|
|
Return -1 and set an error if overflow occurs. */
|
|
|
|
PY_LONG_LONG
|
|
PyLong_AsLongLong(PyObject *vv)
|
|
{
|
|
PY_LONG_LONG bytes;
|
|
int one = 1;
|
|
int res;
|
|
|
|
if (vv == NULL) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
if (!PyLong_Check(vv)) {
|
|
PyNumberMethods *nb;
|
|
PyObject *io;
|
|
if (PyInt_Check(vv))
|
|
return (PY_LONG_LONG)PyInt_AsLong(vv);
|
|
if ((nb = vv->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return -1;
|
|
}
|
|
io = (*nb->nb_int) (vv);
|
|
if (io == NULL)
|
|
return -1;
|
|
if (PyInt_Check(io)) {
|
|
bytes = PyInt_AsLong(io);
|
|
Py_DECREF(io);
|
|
return bytes;
|
|
}
|
|
if (PyLong_Check(io)) {
|
|
bytes = PyLong_AsLongLong(io);
|
|
Py_DECREF(io);
|
|
return bytes;
|
|
}
|
|
Py_DECREF(io);
|
|
PyErr_SetString(PyExc_TypeError, "integer conversion failed");
|
|
return -1;
|
|
}
|
|
|
|
res = _PyLong_AsByteArray(
|
|
(PyLongObject *)vv, (unsigned char *)&bytes,
|
|
SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1);
|
|
|
|
/* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
|
|
if (res < 0)
|
|
return (PY_LONG_LONG)-1;
|
|
else
|
|
return bytes;
|
|
}
|
|
|
|
/* Get a C unsigned PY_LONG_LONG int from a long int object.
|
|
Return -1 and set an error if overflow occurs. */
|
|
|
|
unsigned PY_LONG_LONG
|
|
PyLong_AsUnsignedLongLong(PyObject *vv)
|
|
{
|
|
unsigned PY_LONG_LONG bytes;
|
|
int one = 1;
|
|
int res;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
}
|
|
|
|
res = _PyLong_AsByteArray(
|
|
(PyLongObject *)vv, (unsigned char *)&bytes,
|
|
SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0);
|
|
|
|
/* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
|
|
if (res < 0)
|
|
return (unsigned PY_LONG_LONG)res;
|
|
else
|
|
return bytes;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object, ignoring the high bits.
|
|
Returns -1 and sets an error condition if an error occurs. */
|
|
|
|
unsigned PY_LONG_LONG
|
|
PyLong_AsUnsignedLongLongMask(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
unsigned PY_LONG_LONG x;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -i;
|
|
}
|
|
while (--i >= 0) {
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
}
|
|
return x * sign;
|
|
}
|
|
#undef IS_LITTLE_ENDIAN
|
|
|
|
#endif /* HAVE_LONG_LONG */
|
|
|
|
|
|
static int
|
|
convert_binop(PyObject *v, PyObject *w, PyLongObject **a, PyLongObject **b) {
|
|
if (PyLong_Check(v)) {
|
|
*a = (PyLongObject *) v;
|
|
Py_INCREF(v);
|
|
}
|
|
else if (PyInt_Check(v)) {
|
|
*a = (PyLongObject *) PyLong_FromLong(PyInt_AS_LONG(v));
|
|
}
|
|
else {
|
|
return 0;
|
|
}
|
|
if (PyLong_Check(w)) {
|
|
*b = (PyLongObject *) w;
|
|
Py_INCREF(w);
|
|
}
|
|
else if (PyInt_Check(w)) {
|
|
*b = (PyLongObject *) PyLong_FromLong(PyInt_AS_LONG(w));
|
|
}
|
|
else {
|
|
Py_DECREF(*a);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
#define CONVERT_BINOP(v, w, a, b) \
|
|
if (!convert_binop(v, w, a, b)) { \
|
|
Py_INCREF(Py_NotImplemented); \
|
|
return Py_NotImplemented; \
|
|
}
|
|
|
|
/* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
|
|
* is modified in place, by adding y to it. Carries are propagated as far as
|
|
* x[m-1], and the remaining carry (0 or 1) is returned.
|
|
*/
|
|
static digit
|
|
v_iadd(digit *x, Py_ssize_t m, digit *y, Py_ssize_t n)
|
|
{
|
|
int i;
|
|
digit carry = 0;
|
|
|
|
assert(m >= n);
|
|
for (i = 0; i < n; ++i) {
|
|
carry += x[i] + y[i];
|
|
x[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
assert((carry & 1) == carry);
|
|
}
|
|
for (; carry && i < m; ++i) {
|
|
carry += x[i];
|
|
x[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
assert((carry & 1) == carry);
|
|
}
|
|
return carry;
|
|
}
|
|
|
|
/* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
|
|
* is modified in place, by subtracting y from it. Borrows are propagated as
|
|
* far as x[m-1], and the remaining borrow (0 or 1) is returned.
|
|
*/
|
|
static digit
|
|
v_isub(digit *x, Py_ssize_t m, digit *y, Py_ssize_t n)
|
|
{
|
|
int i;
|
|
digit borrow = 0;
|
|
|
|
assert(m >= n);
|
|
for (i = 0; i < n; ++i) {
|
|
borrow = x[i] - y[i] - borrow;
|
|
x[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1; /* keep only 1 sign bit */
|
|
}
|
|
for (; borrow && i < m; ++i) {
|
|
borrow = x[i] - borrow;
|
|
x[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1;
|
|
}
|
|
return borrow;
|
|
}
|
|
|
|
/* Multiply by a single digit, ignoring the sign. */
|
|
|
|
static PyLongObject *
|
|
mul1(PyLongObject *a, wdigit n)
|
|
{
|
|
return muladd1(a, n, (digit)0);
|
|
}
|
|
|
|
/* Multiply by a single digit and add a single digit, ignoring the sign. */
|
|
|
|
static PyLongObject *
|
|
muladd1(PyLongObject *a, wdigit n, wdigit extra)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size);
|
|
PyLongObject *z = _PyLong_New(size_a+1);
|
|
twodigits carry = extra;
|
|
Py_ssize_t i;
|
|
|
|
if (z == NULL)
|
|
return NULL;
|
|
for (i = 0; i < size_a; ++i) {
|
|
carry += (twodigits)a->ob_digit[i] * n;
|
|
z->ob_digit[i] = (digit) (carry & MASK);
|
|
carry >>= SHIFT;
|
|
}
|
|
z->ob_digit[i] = (digit) carry;
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* Divide long pin, w/ size digits, by non-zero digit n, storing quotient
|
|
in pout, and returning the remainder. pin and pout point at the LSD.
|
|
It's OK for pin == pout on entry, which saves oodles of mallocs/frees in
|
|
long_format, but that should be done with great care since longs are
|
|
immutable. */
|
|
|
|
static digit
|
|
inplace_divrem1(digit *pout, digit *pin, Py_ssize_t size, digit n)
|
|
{
|
|
twodigits rem = 0;
|
|
|
|
assert(n > 0 && n <= MASK);
|
|
pin += size;
|
|
pout += size;
|
|
while (--size >= 0) {
|
|
digit hi;
|
|
rem = (rem << SHIFT) + *--pin;
|
|
*--pout = hi = (digit)(rem / n);
|
|
rem -= hi * n;
|
|
}
|
|
return (digit)rem;
|
|
}
|
|
|
|
/* Divide a long integer by a digit, returning both the quotient
|
|
(as function result) and the remainder (through *prem).
|
|
The sign of a is ignored; n should not be zero. */
|
|
|
|
static PyLongObject *
|
|
divrem1(PyLongObject *a, digit n, digit *prem)
|
|
{
|
|
const Py_ssize_t size = ABS(a->ob_size);
|
|
PyLongObject *z;
|
|
|
|
assert(n > 0 && n <= MASK);
|
|
z = _PyLong_New(size);
|
|
if (z == NULL)
|
|
return NULL;
|
|
*prem = inplace_divrem1(z->ob_digit, a->ob_digit, size, n);
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* Convert a long int object to a string, using a given conversion base.
|
|
Return a string object.
|
|
If base is 8 or 16, add the proper prefix '0' or '0x'. */
|
|
|
|
static PyObject *
|
|
long_format(PyObject *aa, int base)
|
|
{
|
|
register PyLongObject *a = (PyLongObject *)aa;
|
|
PyStringObject *str;
|
|
Py_ssize_t i, j, sz;
|
|
Py_ssize_t size_a;
|
|
char *p;
|
|
int bits;
|
|
char sign = '\0';
|
|
|
|
if (a == NULL || !PyLong_Check(a)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
assert(base >= 2 && base <= 36);
|
|
size_a = ABS(a->ob_size);
|
|
|
|
/* Compute a rough upper bound for the length of the string */
|
|
i = base;
|
|
bits = 0;
|
|
while (i > 1) {
|
|
++bits;
|
|
i >>= 1;
|
|
}
|
|
i = 5;
|
|
j = size_a*SHIFT + bits-1;
|
|
sz = i + j / bits;
|
|
if (j / SHIFT < size_a || sz < i) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"long is too large to format");
|
|
return NULL;
|
|
}
|
|
str = (PyStringObject *) PyString_FromStringAndSize((char *)0, sz);
|
|
if (str == NULL)
|
|
return NULL;
|
|
p = PyString_AS_STRING(str) + sz;
|
|
*p = '\0';
|
|
if (a->ob_size < 0)
|
|
sign = '-';
|
|
|
|
if (a->ob_size == 0) {
|
|
*--p = '0';
|
|
}
|
|
else if ((base & (base - 1)) == 0) {
|
|
/* JRH: special case for power-of-2 bases */
|
|
twodigits accum = 0;
|
|
int accumbits = 0; /* # of bits in accum */
|
|
int basebits = 1; /* # of bits in base-1 */
|
|
i = base;
|
|
while ((i >>= 1) > 1)
|
|
++basebits;
|
|
|
|
for (i = 0; i < size_a; ++i) {
|
|
accum |= (twodigits)a->ob_digit[i] << accumbits;
|
|
accumbits += SHIFT;
|
|
assert(accumbits >= basebits);
|
|
do {
|
|
char cdigit = (char)(accum & (base - 1));
|
|
cdigit += (cdigit < 10) ? '0' : 'a'-10;
|
|
assert(p > PyString_AS_STRING(str));
|
|
*--p = cdigit;
|
|
accumbits -= basebits;
|
|
accum >>= basebits;
|
|
} while (i < size_a-1 ? accumbits >= basebits :
|
|
accum > 0);
|
|
}
|
|
}
|
|
else {
|
|
/* Not 0, and base not a power of 2. Divide repeatedly by
|
|
base, but for speed use the highest power of base that
|
|
fits in a digit. */
|
|
Py_ssize_t size = size_a;
|
|
digit *pin = a->ob_digit;
|
|
PyLongObject *scratch;
|
|
/* powbasw <- largest power of base that fits in a digit. */
|
|
digit powbase = base; /* powbase == base ** power */
|
|
int power = 1;
|
|
for (;;) {
|
|
unsigned long newpow = powbase * (unsigned long)base;
|
|
if (newpow >> SHIFT) /* doesn't fit in a digit */
|
|
break;
|
|
powbase = (digit)newpow;
|
|
++power;
|
|
}
|
|
|
|
/* Get a scratch area for repeated division. */
|
|
scratch = _PyLong_New(size);
|
|
if (scratch == NULL) {
|
|
Py_DECREF(str);
|
|
return NULL;
|
|
}
|
|
|
|
/* Repeatedly divide by powbase. */
|
|
do {
|
|
int ntostore = power;
|
|
digit rem = inplace_divrem1(scratch->ob_digit,
|
|
pin, size, powbase);
|
|
pin = scratch->ob_digit; /* no need to use a again */
|
|
if (pin[size - 1] == 0)
|
|
--size;
|
|
SIGCHECK({
|
|
Py_DECREF(scratch);
|
|
Py_DECREF(str);
|
|
return NULL;
|
|
})
|
|
|
|
/* Break rem into digits. */
|
|
assert(ntostore > 0);
|
|
do {
|
|
digit nextrem = (digit)(rem / base);
|
|
char c = (char)(rem - nextrem * base);
|
|
assert(p > PyString_AS_STRING(str));
|
|
c += (c < 10) ? '0' : 'a'-10;
|
|
*--p = c;
|
|
rem = nextrem;
|
|
--ntostore;
|
|
/* Termination is a bit delicate: must not
|
|
store leading zeroes, so must get out if
|
|
remaining quotient and rem are both 0. */
|
|
} while (ntostore && (size || rem));
|
|
} while (size != 0);
|
|
Py_DECREF(scratch);
|
|
}
|
|
|
|
if (base == 8) {
|
|
if (size_a != 0)
|
|
*--p = '0';
|
|
}
|
|
else if (base == 16) {
|
|
*--p = 'x';
|
|
*--p = '0';
|
|
}
|
|
else if (base != 10) {
|
|
*--p = '#';
|
|
*--p = '0' + base%10;
|
|
if (base > 10)
|
|
*--p = '0' + base/10;
|
|
}
|
|
if (sign)
|
|
*--p = sign;
|
|
if (p != PyString_AS_STRING(str)) {
|
|
char *q = PyString_AS_STRING(str);
|
|
assert(p > q);
|
|
do {
|
|
} while ((*q++ = *p++) != '\0');
|
|
q--;
|
|
_PyString_Resize((PyObject **)&str,
|
|
(Py_ssize_t) (q - PyString_AS_STRING(str)));
|
|
}
|
|
return (PyObject *)str;
|
|
}
|
|
|
|
/* Table of digit values for 8-bit string -> integer conversion.
|
|
* '0' maps to 0, ..., '9' maps to 9.
|
|
* 'a' and 'A' map to 10, ..., 'z' and 'Z' map to 35.
|
|
* All other indices map to 37.
|
|
* Note that when converting a base B string, a char c is a legitimate
|
|
* base B digit iff _PyLong_DigitValue[Py_CHARMASK(c)] < B.
|
|
*/
|
|
int _PyLong_DigitValue[256] = {
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 37, 37, 37, 37, 37, 37,
|
|
37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
|
|
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37,
|
|
37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
|
|
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
};
|
|
|
|
/* *str points to the first digit in a string of base `base` digits. base
|
|
* is a power of 2 (2, 4, 8, 16, or 32). *str is set to point to the first
|
|
* non-digit (which may be *str!). A normalized long is returned.
|
|
* The point to this routine is that it takes time linear in the number of
|
|
* string characters.
|
|
*/
|
|
static PyLongObject *
|
|
long_from_binary_base(char **str, int base)
|
|
{
|
|
char *p = *str;
|
|
char *start = p;
|
|
int bits_per_char;
|
|
Py_ssize_t n;
|
|
PyLongObject *z;
|
|
twodigits accum;
|
|
int bits_in_accum;
|
|
digit *pdigit;
|
|
|
|
assert(base >= 2 && base <= 32 && (base & (base - 1)) == 0);
|
|
n = base;
|
|
for (bits_per_char = -1; n; ++bits_per_char)
|
|
n >>= 1;
|
|
/* n <- total # of bits needed, while setting p to end-of-string */
|
|
n = 0;
|
|
while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base)
|
|
++p;
|
|
*str = p;
|
|
/* n <- # of Python digits needed, = ceiling(n/SHIFT). */
|
|
n = (p - start) * bits_per_char + SHIFT - 1;
|
|
if (n / bits_per_char < p - start) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"long string too large to convert");
|
|
return NULL;
|
|
}
|
|
n = n / SHIFT;
|
|
z = _PyLong_New(n);
|
|
if (z == NULL)
|
|
return NULL;
|
|
/* Read string from right, and fill in long from left; i.e.,
|
|
* from least to most significant in both.
|
|
*/
|
|
accum = 0;
|
|
bits_in_accum = 0;
|
|
pdigit = z->ob_digit;
|
|
while (--p >= start) {
|
|
int k = _PyLong_DigitValue[Py_CHARMASK(*p)];
|
|
assert(k >= 0 && k < base);
|
|
accum |= (twodigits)(k << bits_in_accum);
|
|
bits_in_accum += bits_per_char;
|
|
if (bits_in_accum >= SHIFT) {
|
|
*pdigit++ = (digit)(accum & MASK);
|
|
assert(pdigit - z->ob_digit <= (int)n);
|
|
accum >>= SHIFT;
|
|
bits_in_accum -= SHIFT;
|
|
assert(bits_in_accum < SHIFT);
|
|
}
|
|
}
|
|
if (bits_in_accum) {
|
|
assert(bits_in_accum <= SHIFT);
|
|
*pdigit++ = (digit)accum;
|
|
assert(pdigit - z->ob_digit <= (int)n);
|
|
}
|
|
while (pdigit - z->ob_digit < n)
|
|
*pdigit++ = 0;
|
|
return long_normalize(z);
|
|
}
|
|
|
|
PyObject *
|
|
PyLong_FromString(char *str, char **pend, int base)
|
|
{
|
|
int sign = 1;
|
|
char *start, *orig_str = str;
|
|
PyLongObject *z;
|
|
PyObject *strobj, *strrepr;
|
|
Py_ssize_t slen;
|
|
|
|
if ((base != 0 && base < 2) || base > 36) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"long() arg 2 must be >= 2 and <= 36");
|
|
return NULL;
|
|
}
|
|
while (*str != '\0' && isspace(Py_CHARMASK(*str)))
|
|
str++;
|
|
if (*str == '+')
|
|
++str;
|
|
else if (*str == '-') {
|
|
++str;
|
|
sign = -1;
|
|
}
|
|
while (*str != '\0' && isspace(Py_CHARMASK(*str)))
|
|
str++;
|
|
if (base == 0) {
|
|
if (str[0] != '0')
|
|
base = 10;
|
|
else if (str[1] == 'x' || str[1] == 'X')
|
|
base = 16;
|
|
else
|
|
base = 8;
|
|
}
|
|
if (base == 16 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
|
|
str += 2;
|
|
|
|
start = str;
|
|
if ((base & (base - 1)) == 0)
|
|
z = long_from_binary_base(&str, base);
|
|
else {
|
|
/***
|
|
Binary bases can be converted in time linear in the number of digits, because
|
|
Python's representation base is binary. Other bases (including decimal!) use
|
|
the simple quadratic-time algorithm below, complicated by some speed tricks.
|
|
|
|
First some math: the largest integer that can be expressed in N base-B digits
|
|
is B**N-1. Consequently, if we have an N-digit input in base B, the worst-
|
|
case number of Python digits needed to hold it is the smallest integer n s.t.
|
|
|
|
BASE**n-1 >= B**N-1 [or, adding 1 to both sides]
|
|
BASE**n >= B**N [taking logs to base BASE]
|
|
n >= log(B**N)/log(BASE) = N * log(B)/log(BASE)
|
|
|
|
The static array log_base_BASE[base] == log(base)/log(BASE) so we can compute
|
|
this quickly. A Python long with that much space is reserved near the start,
|
|
and the result is computed into it.
|
|
|
|
The input string is actually treated as being in base base**i (i.e., i digits
|
|
are processed at a time), where two more static arrays hold:
|
|
|
|
convwidth_base[base] = the largest integer i such that base**i <= BASE
|
|
convmultmax_base[base] = base ** convwidth_base[base]
|
|
|
|
The first of these is the largest i such that i consecutive input digits
|
|
must fit in a single Python digit. The second is effectively the input
|
|
base we're really using.
|
|
|
|
Viewing the input as a sequence <c0, c1, ..., c_n-1> of digits in base
|
|
convmultmax_base[base], the result is "simply"
|
|
|
|
(((c0*B + c1)*B + c2)*B + c3)*B + ... ))) + c_n-1
|
|
|
|
where B = convmultmax_base[base].
|
|
|
|
Error analysis: as above, the number of Python digits `n` needed is worst-
|
|
case
|
|
|
|
n >= N * log(B)/log(BASE)
|
|
|
|
where `N` is the number of input digits in base `B`. This is computed via
|
|
|
|
size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1;
|
|
|
|
below. Two numeric concerns are how much space this can waste, and whether
|
|
the computed result can be too small. To be concrete, assume BASE = 2**15,
|
|
which is the default (and it's unlikely anyone changes that).
|
|
|
|
Waste isn't a problem: provided the first input digit isn't 0, the difference
|
|
between the worst-case input with N digits and the smallest input with N
|
|
digits is about a factor of B, but B is small compared to BASE so at most
|
|
one allocated Python digit can remain unused on that count. If
|
|
N*log(B)/log(BASE) is mathematically an exact integer, then truncating that
|
|
and adding 1 returns a result 1 larger than necessary. However, that can't
|
|
happen: whenever B is a power of 2, long_from_binary_base() is called
|
|
instead, and it's impossible for B**i to be an integer power of 2**15 when
|
|
B is not a power of 2 (i.e., it's impossible for N*log(B)/log(BASE) to be
|
|
an exact integer when B is not a power of 2, since B**i has a prime factor
|
|
other than 2 in that case, but (2**15)**j's only prime factor is 2).
|
|
|
|
The computed result can be too small if the true value of N*log(B)/log(BASE)
|
|
is a little bit larger than an exact integer, but due to roundoff errors (in
|
|
computing log(B), log(BASE), their quotient, and/or multiplying that by N)
|
|
yields a numeric result a little less than that integer. Unfortunately, "how
|
|
close can a transcendental function get to an integer over some range?"
|
|
questions are generally theoretically intractable. Computer analysis via
|
|
continued fractions is practical: expand log(B)/log(BASE) via continued
|
|
fractions, giving a sequence i/j of "the best" rational approximations. Then
|
|
j*log(B)/log(BASE) is approximately equal to (the integer) i. This shows that
|
|
we can get very close to being in trouble, but very rarely. For example,
|
|
76573 is a denominator in one of the continued-fraction approximations to
|
|
log(10)/log(2**15), and indeed:
|
|
|
|
>>> log(10)/log(2**15)*76573
|
|
16958.000000654003
|
|
|
|
is very close to an integer. If we were working with IEEE single-precision,
|
|
rounding errors could kill us. Finding worst cases in IEEE double-precision
|
|
requires better-than-double-precision log() functions, and Tim didn't bother.
|
|
Instead the code checks to see whether the allocated space is enough as each
|
|
new Python digit is added, and copies the whole thing to a larger long if not.
|
|
This should happen extremely rarely, and in fact I don't have a test case
|
|
that triggers it(!). Instead the code was tested by artificially allocating
|
|
just 1 digit at the start, so that the copying code was exercised for every
|
|
digit beyond the first.
|
|
***/
|
|
register twodigits c; /* current input character */
|
|
Py_ssize_t size_z;
|
|
int i;
|
|
int convwidth;
|
|
twodigits convmultmax, convmult;
|
|
digit *pz, *pzstop;
|
|
char* scan;
|
|
|
|
static double log_base_BASE[37] = {0.0e0,};
|
|
static int convwidth_base[37] = {0,};
|
|
static twodigits convmultmax_base[37] = {0,};
|
|
|
|
if (log_base_BASE[base] == 0.0) {
|
|
twodigits convmax = base;
|
|
int i = 1;
|
|
|
|
log_base_BASE[base] = log((double)base) /
|
|
log((double)BASE);
|
|
for (;;) {
|
|
twodigits next = convmax * base;
|
|
if (next > BASE)
|
|
break;
|
|
convmax = next;
|
|
++i;
|
|
}
|
|
convmultmax_base[base] = convmax;
|
|
assert(i > 0);
|
|
convwidth_base[base] = i;
|
|
}
|
|
|
|
/* Find length of the string of numeric characters. */
|
|
scan = str;
|
|
while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base)
|
|
++scan;
|
|
|
|
/* Create a long object that can contain the largest possible
|
|
* integer with this base and length. Note that there's no
|
|
* need to initialize z->ob_digit -- no slot is read up before
|
|
* being stored into.
|
|
*/
|
|
size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1;
|
|
/* Uncomment next line to test exceedingly rare copy code */
|
|
/* size_z = 1; */
|
|
assert(size_z > 0);
|
|
z = _PyLong_New(size_z);
|
|
if (z == NULL)
|
|
return NULL;
|
|
z->ob_size = 0;
|
|
|
|
/* `convwidth` consecutive input digits are treated as a single
|
|
* digit in base `convmultmax`.
|
|
*/
|
|
convwidth = convwidth_base[base];
|
|
convmultmax = convmultmax_base[base];
|
|
|
|
/* Work ;-) */
|
|
while (str < scan) {
|
|
/* grab up to convwidth digits from the input string */
|
|
c = (digit)_PyLong_DigitValue[Py_CHARMASK(*str++)];
|
|
for (i = 1; i < convwidth && str != scan; ++i, ++str) {
|
|
c = (twodigits)(c * base +
|
|
_PyLong_DigitValue[Py_CHARMASK(*str)]);
|
|
assert(c < BASE);
|
|
}
|
|
|
|
convmult = convmultmax;
|
|
/* Calculate the shift only if we couldn't get
|
|
* convwidth digits.
|
|
*/
|
|
if (i != convwidth) {
|
|
convmult = base;
|
|
for ( ; i > 1; --i)
|
|
convmult *= base;
|
|
}
|
|
|
|
/* Multiply z by convmult, and add c. */
|
|
pz = z->ob_digit;
|
|
pzstop = pz + z->ob_size;
|
|
for (; pz < pzstop; ++pz) {
|
|
c += (twodigits)*pz * convmult;
|
|
*pz = (digit)(c & MASK);
|
|
c >>= SHIFT;
|
|
}
|
|
/* carry off the current end? */
|
|
if (c) {
|
|
assert(c < BASE);
|
|
if (z->ob_size < size_z) {
|
|
*pz = (digit)c;
|
|
++z->ob_size;
|
|
}
|
|
else {
|
|
PyLongObject *tmp;
|
|
/* Extremely rare. Get more space. */
|
|
assert(z->ob_size == size_z);
|
|
tmp = _PyLong_New(size_z + 1);
|
|
if (tmp == NULL) {
|
|
Py_DECREF(z);
|
|
return NULL;
|
|
}
|
|
memcpy(tmp->ob_digit,
|
|
z->ob_digit,
|
|
sizeof(digit) * size_z);
|
|
Py_DECREF(z);
|
|
z = tmp;
|
|
z->ob_digit[size_z] = (digit)c;
|
|
++size_z;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (z == NULL)
|
|
return NULL;
|
|
if (str == start)
|
|
goto onError;
|
|
if (sign < 0)
|
|
z->ob_size = -(z->ob_size);
|
|
if (*str == 'L' || *str == 'l')
|
|
str++;
|
|
while (*str && isspace(Py_CHARMASK(*str)))
|
|
str++;
|
|
if (*str != '\0')
|
|
goto onError;
|
|
if (pend)
|
|
*pend = str;
|
|
return (PyObject *) z;
|
|
|
|
onError:
|
|
Py_XDECREF(z);
|
|
slen = strlen(orig_str) < 200 ? strlen(orig_str) : 200;
|
|
strobj = PyString_FromStringAndSize(orig_str, slen);
|
|
if (strobj == NULL)
|
|
return NULL;
|
|
strrepr = PyObject_Repr(strobj);
|
|
Py_DECREF(strobj);
|
|
if (strrepr == NULL)
|
|
return NULL;
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid literal for long() with base %d: %s",
|
|
base, PyString_AS_STRING(strrepr));
|
|
Py_DECREF(strrepr);
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
PyObject *
|
|
PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base)
|
|
{
|
|
PyObject *result;
|
|
char *buffer = (char *)PyMem_MALLOC(length+1);
|
|
|
|
if (buffer == NULL)
|
|
return NULL;
|
|
|
|
if (PyUnicode_EncodeDecimal(u, length, buffer, NULL)) {
|
|
PyMem_FREE(buffer);
|
|
return NULL;
|
|
}
|
|
result = PyLong_FromString(buffer, NULL, base);
|
|
PyMem_FREE(buffer);
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
/* forward */
|
|
static PyLongObject *x_divrem
|
|
(PyLongObject *, PyLongObject *, PyLongObject **);
|
|
static PyObject *long_pos(PyLongObject *);
|
|
static int long_divrem(PyLongObject *, PyLongObject *,
|
|
PyLongObject **, PyLongObject **);
|
|
|
|
/* Long division with remainder, top-level routine */
|
|
|
|
static int
|
|
long_divrem(PyLongObject *a, PyLongObject *b,
|
|
PyLongObject **pdiv, PyLongObject **prem)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size), size_b = ABS(b->ob_size);
|
|
PyLongObject *z;
|
|
|
|
if (size_b == 0) {
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
"long division or modulo by zero");
|
|
return -1;
|
|
}
|
|
if (size_a < size_b ||
|
|
(size_a == size_b &&
|
|
a->ob_digit[size_a-1] < b->ob_digit[size_b-1])) {
|
|
/* |a| < |b|. */
|
|
*pdiv = _PyLong_New(0);
|
|
Py_INCREF(a);
|
|
*prem = (PyLongObject *) a;
|
|
return 0;
|
|
}
|
|
if (size_b == 1) {
|
|
digit rem = 0;
|
|
z = divrem1(a, b->ob_digit[0], &rem);
|
|
if (z == NULL)
|
|
return -1;
|
|
*prem = (PyLongObject *) PyLong_FromLong((long)rem);
|
|
}
|
|
else {
|
|
z = x_divrem(a, b, prem);
|
|
if (z == NULL)
|
|
return -1;
|
|
}
|
|
/* Set the signs.
|
|
The quotient z has the sign of a*b;
|
|
the remainder r has the sign of a,
|
|
so a = b*z + r. */
|
|
if ((a->ob_size < 0) != (b->ob_size < 0))
|
|
z->ob_size = -(z->ob_size);
|
|
if (a->ob_size < 0 && (*prem)->ob_size != 0)
|
|
(*prem)->ob_size = -((*prem)->ob_size);
|
|
*pdiv = z;
|
|
return 0;
|
|
}
|
|
|
|
/* Unsigned long division with remainder -- the algorithm */
|
|
|
|
static PyLongObject *
|
|
x_divrem(PyLongObject *v1, PyLongObject *w1, PyLongObject **prem)
|
|
{
|
|
Py_ssize_t size_v = ABS(v1->ob_size), size_w = ABS(w1->ob_size);
|
|
digit d = (digit) ((twodigits)BASE / (w1->ob_digit[size_w-1] + 1));
|
|
PyLongObject *v = mul1(v1, d);
|
|
PyLongObject *w = mul1(w1, d);
|
|
PyLongObject *a;
|
|
Py_ssize_t j, k;
|
|
|
|
if (v == NULL || w == NULL) {
|
|
Py_XDECREF(v);
|
|
Py_XDECREF(w);
|
|
return NULL;
|
|
}
|
|
|
|
assert(size_v >= size_w && size_w > 1); /* Assert checks by div() */
|
|
assert(v->ob_refcnt == 1); /* Since v will be used as accumulator! */
|
|
assert(size_w == ABS(w->ob_size)); /* That's how d was calculated */
|
|
|
|
size_v = ABS(v->ob_size);
|
|
k = size_v - size_w;
|
|
a = _PyLong_New(k + 1);
|
|
|
|
for (j = size_v; a != NULL && k >= 0; --j, --k) {
|
|
digit vj = (j >= size_v) ? 0 : v->ob_digit[j];
|
|
twodigits q;
|
|
stwodigits carry = 0;
|
|
int i;
|
|
|
|
SIGCHECK({
|
|
Py_DECREF(a);
|
|
a = NULL;
|
|
break;
|
|
})
|
|
if (vj == w->ob_digit[size_w-1])
|
|
q = MASK;
|
|
else
|
|
q = (((twodigits)vj << SHIFT) + v->ob_digit[j-1]) /
|
|
w->ob_digit[size_w-1];
|
|
|
|
while (w->ob_digit[size_w-2]*q >
|
|
((
|
|
((twodigits)vj << SHIFT)
|
|
+ v->ob_digit[j-1]
|
|
- q*w->ob_digit[size_w-1]
|
|
) << SHIFT)
|
|
+ v->ob_digit[j-2])
|
|
--q;
|
|
|
|
for (i = 0; i < size_w && i+k < size_v; ++i) {
|
|
twodigits z = w->ob_digit[i] * q;
|
|
digit zz = (digit) (z >> SHIFT);
|
|
carry += v->ob_digit[i+k] - z
|
|
+ ((twodigits)zz << SHIFT);
|
|
v->ob_digit[i+k] = (digit)(carry & MASK);
|
|
carry = Py_ARITHMETIC_RIGHT_SHIFT(BASE_TWODIGITS_TYPE,
|
|
carry, SHIFT);
|
|
carry -= zz;
|
|
}
|
|
|
|
if (i+k < size_v) {
|
|
carry += v->ob_digit[i+k];
|
|
v->ob_digit[i+k] = 0;
|
|
}
|
|
|
|
if (carry == 0)
|
|
a->ob_digit[k] = (digit) q;
|
|
else {
|
|
assert(carry == -1);
|
|
a->ob_digit[k] = (digit) q-1;
|
|
carry = 0;
|
|
for (i = 0; i < size_w && i+k < size_v; ++i) {
|
|
carry += v->ob_digit[i+k] + w->ob_digit[i];
|
|
v->ob_digit[i+k] = (digit)(carry & MASK);
|
|
carry = Py_ARITHMETIC_RIGHT_SHIFT(
|
|
BASE_TWODIGITS_TYPE,
|
|
carry, SHIFT);
|
|
}
|
|
}
|
|
} /* for j, k */
|
|
|
|
if (a == NULL)
|
|
*prem = NULL;
|
|
else {
|
|
a = long_normalize(a);
|
|
*prem = divrem1(v, d, &d);
|
|
/* d receives the (unused) remainder */
|
|
if (*prem == NULL) {
|
|
Py_DECREF(a);
|
|
a = NULL;
|
|
}
|
|
}
|
|
Py_DECREF(v);
|
|
Py_DECREF(w);
|
|
return a;
|
|
}
|
|
|
|
/* Methods */
|
|
|
|
static void
|
|
long_dealloc(PyObject *v)
|
|
{
|
|
v->ob_type->tp_free(v);
|
|
}
|
|
|
|
static PyObject *
|
|
long_repr(PyObject *v)
|
|
{
|
|
return long_format(v, 10);
|
|
}
|
|
|
|
static int
|
|
long_compare(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t sign;
|
|
|
|
if (a->ob_size != b->ob_size) {
|
|
if (ABS(a->ob_size) == 0 && ABS(b->ob_size) == 0)
|
|
sign = 0;
|
|
else
|
|
sign = a->ob_size - b->ob_size;
|
|
}
|
|
else {
|
|
Py_ssize_t i = ABS(a->ob_size);
|
|
while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
|
|
;
|
|
if (i < 0)
|
|
sign = 0;
|
|
else {
|
|
sign = (int)a->ob_digit[i] - (int)b->ob_digit[i];
|
|
if (a->ob_size < 0)
|
|
sign = -sign;
|
|
}
|
|
}
|
|
return sign < 0 ? -1 : sign > 0 ? 1 : 0;
|
|
}
|
|
|
|
static PyObject *
|
|
long_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
PyLongObject *a, *b;
|
|
CONVERT_BINOP((PyObject *)self, (PyObject *)other, &a, &b);
|
|
return Py_CmpToRich(op, long_compare(a, b));
|
|
}
|
|
|
|
static long
|
|
long_hash(PyLongObject *v)
|
|
{
|
|
long x;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
/* This is designed so that Python ints and longs with the
|
|
same value hash to the same value, otherwise comparisons
|
|
of mapping keys will turn out weird */
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
#define LONG_BIT_SHIFT (8*sizeof(long) - SHIFT)
|
|
while (--i >= 0) {
|
|
/* Force a native long #-bits (32 or 64) circular shift */
|
|
x = ((x << SHIFT) & ~MASK) | ((x >> LONG_BIT_SHIFT) & MASK);
|
|
x += v->ob_digit[i];
|
|
}
|
|
#undef LONG_BIT_SHIFT
|
|
x = x * sign;
|
|
if (x == -1)
|
|
x = -2;
|
|
return x;
|
|
}
|
|
|
|
|
|
/* Add the absolute values of two long integers. */
|
|
|
|
static PyLongObject *
|
|
x_add(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size), size_b = ABS(b->ob_size);
|
|
PyLongObject *z;
|
|
int i;
|
|
digit carry = 0;
|
|
|
|
/* Ensure a is the larger of the two: */
|
|
if (size_a < size_b) {
|
|
{ PyLongObject *temp = a; a = b; b = temp; }
|
|
{ Py_ssize_t size_temp = size_a;
|
|
size_a = size_b;
|
|
size_b = size_temp; }
|
|
}
|
|
z = _PyLong_New(size_a+1);
|
|
if (z == NULL)
|
|
return NULL;
|
|
for (i = 0; i < size_b; ++i) {
|
|
carry += a->ob_digit[i] + b->ob_digit[i];
|
|
z->ob_digit[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
}
|
|
for (; i < size_a; ++i) {
|
|
carry += a->ob_digit[i];
|
|
z->ob_digit[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
}
|
|
z->ob_digit[i] = carry;
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* Subtract the absolute values of two integers. */
|
|
|
|
static PyLongObject *
|
|
x_sub(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size), size_b = ABS(b->ob_size);
|
|
PyLongObject *z;
|
|
Py_ssize_t i;
|
|
int sign = 1;
|
|
digit borrow = 0;
|
|
|
|
/* Ensure a is the larger of the two: */
|
|
if (size_a < size_b) {
|
|
sign = -1;
|
|
{ PyLongObject *temp = a; a = b; b = temp; }
|
|
{ Py_ssize_t size_temp = size_a;
|
|
size_a = size_b;
|
|
size_b = size_temp; }
|
|
}
|
|
else if (size_a == size_b) {
|
|
/* Find highest digit where a and b differ: */
|
|
i = size_a;
|
|
while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
|
|
;
|
|
if (i < 0)
|
|
return _PyLong_New(0);
|
|
if (a->ob_digit[i] < b->ob_digit[i]) {
|
|
sign = -1;
|
|
{ PyLongObject *temp = a; a = b; b = temp; }
|
|
}
|
|
size_a = size_b = i+1;
|
|
}
|
|
z = _PyLong_New(size_a);
|
|
if (z == NULL)
|
|
return NULL;
|
|
for (i = 0; i < size_b; ++i) {
|
|
/* The following assumes unsigned arithmetic
|
|
works module 2**N for some N>SHIFT. */
|
|
borrow = a->ob_digit[i] - b->ob_digit[i] - borrow;
|
|
z->ob_digit[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1; /* Keep only one sign bit */
|
|
}
|
|
for (; i < size_a; ++i) {
|
|
borrow = a->ob_digit[i] - borrow;
|
|
z->ob_digit[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1; /* Keep only one sign bit */
|
|
}
|
|
assert(borrow == 0);
|
|
if (sign < 0)
|
|
z->ob_size = -(z->ob_size);
|
|
return long_normalize(z);
|
|
}
|
|
|
|
static PyObject *
|
|
long_add(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b, *z;
|
|
|
|
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
|
|
|
|
if (a->ob_size < 0) {
|
|
if (b->ob_size < 0) {
|
|
z = x_add(a, b);
|
|
if (z != NULL && z->ob_size != 0)
|
|
z->ob_size = -(z->ob_size);
|
|
}
|
|
else
|
|
z = x_sub(b, a);
|
|
}
|
|
else {
|
|
if (b->ob_size < 0)
|
|
z = x_sub(a, b);
|
|
else
|
|
z = x_add(a, b);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
static PyObject *
|
|
long_sub(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b, *z;
|
|
|
|
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
|
|
|
|
if (a->ob_size < 0) {
|
|
if (b->ob_size < 0)
|
|
z = x_sub(a, b);
|
|
else
|
|
z = x_add(a, b);
|
|
if (z != NULL && z->ob_size != 0)
|
|
z->ob_size = -(z->ob_size);
|
|
}
|
|
else {
|
|
if (b->ob_size < 0)
|
|
z = x_add(a, b);
|
|
else
|
|
z = x_sub(a, b);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
/* Grade school multiplication, ignoring the signs.
|
|
* Returns the absolute value of the product, or NULL if error.
|
|
*/
|
|
static PyLongObject *
|
|
x_mul(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
PyLongObject *z;
|
|
Py_ssize_t size_a = ABS(a->ob_size);
|
|
Py_ssize_t size_b = ABS(b->ob_size);
|
|
Py_ssize_t i;
|
|
|
|
z = _PyLong_New(size_a + size_b);
|
|
if (z == NULL)
|
|
return NULL;
|
|
|
|
memset(z->ob_digit, 0, z->ob_size * sizeof(digit));
|
|
if (a == b) {
|
|
/* Efficient squaring per HAC, Algorithm 14.16:
|
|
* http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
|
|
* Gives slightly less than a 2x speedup when a == b,
|
|
* via exploiting that each entry in the multiplication
|
|
* pyramid appears twice (except for the size_a squares).
|
|
*/
|
|
for (i = 0; i < size_a; ++i) {
|
|
twodigits carry;
|
|
twodigits f = a->ob_digit[i];
|
|
digit *pz = z->ob_digit + (i << 1);
|
|
digit *pa = a->ob_digit + i + 1;
|
|
digit *paend = a->ob_digit + size_a;
|
|
|
|
SIGCHECK({
|
|
Py_DECREF(z);
|
|
return NULL;
|
|
})
|
|
|
|
carry = *pz + f * f;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
assert(carry <= MASK);
|
|
|
|
/* Now f is added in twice in each column of the
|
|
* pyramid it appears. Same as adding f<<1 once.
|
|
*/
|
|
f <<= 1;
|
|
while (pa < paend) {
|
|
carry += *pz + *pa++ * f;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
assert(carry <= (MASK << 1));
|
|
}
|
|
if (carry) {
|
|
carry += *pz;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
}
|
|
if (carry)
|
|
*pz += (digit)(carry & MASK);
|
|
assert((carry >> SHIFT) == 0);
|
|
}
|
|
}
|
|
else { /* a is not the same as b -- gradeschool long mult */
|
|
for (i = 0; i < size_a; ++i) {
|
|
twodigits carry = 0;
|
|
twodigits f = a->ob_digit[i];
|
|
digit *pz = z->ob_digit + i;
|
|
digit *pb = b->ob_digit;
|
|
digit *pbend = b->ob_digit + size_b;
|
|
|
|
SIGCHECK({
|
|
Py_DECREF(z);
|
|
return NULL;
|
|
})
|
|
|
|
while (pb < pbend) {
|
|
carry += *pz + *pb++ * f;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
assert(carry <= MASK);
|
|
}
|
|
if (carry)
|
|
*pz += (digit)(carry & MASK);
|
|
assert((carry >> SHIFT) == 0);
|
|
}
|
|
}
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* A helper for Karatsuba multiplication (k_mul).
|
|
Takes a long "n" and an integer "size" representing the place to
|
|
split, and sets low and high such that abs(n) == (high << size) + low,
|
|
viewing the shift as being by digits. The sign bit is ignored, and
|
|
the return values are >= 0.
|
|
Returns 0 on success, -1 on failure.
|
|
*/
|
|
static int
|
|
kmul_split(PyLongObject *n, Py_ssize_t size, PyLongObject **high, PyLongObject **low)
|
|
{
|
|
PyLongObject *hi, *lo;
|
|
Py_ssize_t size_lo, size_hi;
|
|
const Py_ssize_t size_n = ABS(n->ob_size);
|
|
|
|
size_lo = MIN(size_n, size);
|
|
size_hi = size_n - size_lo;
|
|
|
|
if ((hi = _PyLong_New(size_hi)) == NULL)
|
|
return -1;
|
|
if ((lo = _PyLong_New(size_lo)) == NULL) {
|
|
Py_DECREF(hi);
|
|
return -1;
|
|
}
|
|
|
|
memcpy(lo->ob_digit, n->ob_digit, size_lo * sizeof(digit));
|
|
memcpy(hi->ob_digit, n->ob_digit + size_lo, size_hi * sizeof(digit));
|
|
|
|
*high = long_normalize(hi);
|
|
*low = long_normalize(lo);
|
|
return 0;
|
|
}
|
|
|
|
static PyLongObject *k_lopsided_mul(PyLongObject *a, PyLongObject *b);
|
|
|
|
/* Karatsuba multiplication. Ignores the input signs, and returns the
|
|
* absolute value of the product (or NULL if error).
|
|
* See Knuth Vol. 2 Chapter 4.3.3 (Pp. 294-295).
|
|
*/
|
|
static PyLongObject *
|
|
k_mul(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t asize = ABS(a->ob_size);
|
|
Py_ssize_t bsize = ABS(b->ob_size);
|
|
PyLongObject *ah = NULL;
|
|
PyLongObject *al = NULL;
|
|
PyLongObject *bh = NULL;
|
|
PyLongObject *bl = NULL;
|
|
PyLongObject *ret = NULL;
|
|
PyLongObject *t1, *t2, *t3;
|
|
Py_ssize_t shift; /* the number of digits we split off */
|
|
Py_ssize_t i;
|
|
|
|
/* (ah*X+al)(bh*X+bl) = ah*bh*X*X + (ah*bl + al*bh)*X + al*bl
|
|
* Let k = (ah+al)*(bh+bl) = ah*bl + al*bh + ah*bh + al*bl
|
|
* Then the original product is
|
|
* ah*bh*X*X + (k - ah*bh - al*bl)*X + al*bl
|
|
* By picking X to be a power of 2, "*X" is just shifting, and it's
|
|
* been reduced to 3 multiplies on numbers half the size.
|
|
*/
|
|
|
|
/* We want to split based on the larger number; fiddle so that b
|
|
* is largest.
|
|
*/
|
|
if (asize > bsize) {
|
|
t1 = a;
|
|
a = b;
|
|
b = t1;
|
|
|
|
i = asize;
|
|
asize = bsize;
|
|
bsize = i;
|
|
}
|
|
|
|
/* Use gradeschool math when either number is too small. */
|
|
i = a == b ? KARATSUBA_SQUARE_CUTOFF : KARATSUBA_CUTOFF;
|
|
if (asize <= i) {
|
|
if (asize == 0)
|
|
return _PyLong_New(0);
|
|
else
|
|
return x_mul(a, b);
|
|
}
|
|
|
|
/* If a is small compared to b, splitting on b gives a degenerate
|
|
* case with ah==0, and Karatsuba may be (even much) less efficient
|
|
* than "grade school" then. However, we can still win, by viewing
|
|
* b as a string of "big digits", each of width a->ob_size. That
|
|
* leads to a sequence of balanced calls to k_mul.
|
|
*/
|
|
if (2 * asize <= bsize)
|
|
return k_lopsided_mul(a, b);
|
|
|
|
/* Split a & b into hi & lo pieces. */
|
|
shift = bsize >> 1;
|
|
if (kmul_split(a, shift, &ah, &al) < 0) goto fail;
|
|
assert(ah->ob_size > 0); /* the split isn't degenerate */
|
|
|
|
if (a == b) {
|
|
bh = ah;
|
|
bl = al;
|
|
Py_INCREF(bh);
|
|
Py_INCREF(bl);
|
|
}
|
|
else if (kmul_split(b, shift, &bh, &bl) < 0) goto fail;
|
|
|
|
/* The plan:
|
|
* 1. Allocate result space (asize + bsize digits: that's always
|
|
* enough).
|
|
* 2. Compute ah*bh, and copy into result at 2*shift.
|
|
* 3. Compute al*bl, and copy into result at 0. Note that this
|
|
* can't overlap with #2.
|
|
* 4. Subtract al*bl from the result, starting at shift. This may
|
|
* underflow (borrow out of the high digit), but we don't care:
|
|
* we're effectively doing unsigned arithmetic mod
|
|
* BASE**(sizea + sizeb), and so long as the *final* result fits,
|
|
* borrows and carries out of the high digit can be ignored.
|
|
* 5. Subtract ah*bh from the result, starting at shift.
|
|
* 6. Compute (ah+al)*(bh+bl), and add it into the result starting
|
|
* at shift.
|
|
*/
|
|
|
|
/* 1. Allocate result space. */
|
|
ret = _PyLong_New(asize + bsize);
|
|
if (ret == NULL) goto fail;
|
|
#ifdef Py_DEBUG
|
|
/* Fill with trash, to catch reference to uninitialized digits. */
|
|
memset(ret->ob_digit, 0xDF, ret->ob_size * sizeof(digit));
|
|
#endif
|
|
|
|
/* 2. t1 <- ah*bh, and copy into high digits of result. */
|
|
if ((t1 = k_mul(ah, bh)) == NULL) goto fail;
|
|
assert(t1->ob_size >= 0);
|
|
assert(2*shift + t1->ob_size <= ret->ob_size);
|
|
memcpy(ret->ob_digit + 2*shift, t1->ob_digit,
|
|
t1->ob_size * sizeof(digit));
|
|
|
|
/* Zero-out the digits higher than the ah*bh copy. */
|
|
i = ret->ob_size - 2*shift - t1->ob_size;
|
|
if (i)
|
|
memset(ret->ob_digit + 2*shift + t1->ob_size, 0,
|
|
i * sizeof(digit));
|
|
|
|
/* 3. t2 <- al*bl, and copy into the low digits. */
|
|
if ((t2 = k_mul(al, bl)) == NULL) {
|
|
Py_DECREF(t1);
|
|
goto fail;
|
|
}
|
|
assert(t2->ob_size >= 0);
|
|
assert(t2->ob_size <= 2*shift); /* no overlap with high digits */
|
|
memcpy(ret->ob_digit, t2->ob_digit, t2->ob_size * sizeof(digit));
|
|
|
|
/* Zero out remaining digits. */
|
|
i = 2*shift - t2->ob_size; /* number of uninitialized digits */
|
|
if (i)
|
|
memset(ret->ob_digit + t2->ob_size, 0, i * sizeof(digit));
|
|
|
|
/* 4 & 5. Subtract ah*bh (t1) and al*bl (t2). We do al*bl first
|
|
* because it's fresher in cache.
|
|
*/
|
|
i = ret->ob_size - shift; /* # digits after shift */
|
|
(void)v_isub(ret->ob_digit + shift, i, t2->ob_digit, t2->ob_size);
|
|
Py_DECREF(t2);
|
|
|
|
(void)v_isub(ret->ob_digit + shift, i, t1->ob_digit, t1->ob_size);
|
|
Py_DECREF(t1);
|
|
|
|
/* 6. t3 <- (ah+al)(bh+bl), and add into result. */
|
|
if ((t1 = x_add(ah, al)) == NULL) goto fail;
|
|
Py_DECREF(ah);
|
|
Py_DECREF(al);
|
|
ah = al = NULL;
|
|
|
|
if (a == b) {
|
|
t2 = t1;
|
|
Py_INCREF(t2);
|
|
}
|
|
else if ((t2 = x_add(bh, bl)) == NULL) {
|
|
Py_DECREF(t1);
|
|
goto fail;
|
|
}
|
|
Py_DECREF(bh);
|
|
Py_DECREF(bl);
|
|
bh = bl = NULL;
|
|
|
|
t3 = k_mul(t1, t2);
|
|
Py_DECREF(t1);
|
|
Py_DECREF(t2);
|
|
if (t3 == NULL) goto fail;
|
|
assert(t3->ob_size >= 0);
|
|
|
|
/* Add t3. It's not obvious why we can't run out of room here.
|
|
* See the (*) comment after this function.
|
|
*/
|
|
(void)v_iadd(ret->ob_digit + shift, i, t3->ob_digit, t3->ob_size);
|
|
Py_DECREF(t3);
|
|
|
|
return long_normalize(ret);
|
|
|
|
fail:
|
|
Py_XDECREF(ret);
|
|
Py_XDECREF(ah);
|
|
Py_XDECREF(al);
|
|
Py_XDECREF(bh);
|
|
Py_XDECREF(bl);
|
|
return NULL;
|
|
}
|
|
|
|
/* (*) Why adding t3 can't "run out of room" above.
|
|
|
|
Let f(x) mean the floor of x and c(x) mean the ceiling of x. Some facts
|
|
to start with:
|
|
|
|
1. For any integer i, i = c(i/2) + f(i/2). In particular,
|
|
bsize = c(bsize/2) + f(bsize/2).
|
|
2. shift = f(bsize/2)
|
|
3. asize <= bsize
|
|
4. Since we call k_lopsided_mul if asize*2 <= bsize, asize*2 > bsize in this
|
|
routine, so asize > bsize/2 >= f(bsize/2) in this routine.
|
|
|
|
We allocated asize + bsize result digits, and add t3 into them at an offset
|
|
of shift. This leaves asize+bsize-shift allocated digit positions for t3
|
|
to fit into, = (by #1 and #2) asize + f(bsize/2) + c(bsize/2) - f(bsize/2) =
|
|
asize + c(bsize/2) available digit positions.
|
|
|
|
bh has c(bsize/2) digits, and bl at most f(size/2) digits. So bh+hl has
|
|
at most c(bsize/2) digits + 1 bit.
|
|
|
|
If asize == bsize, ah has c(bsize/2) digits, else ah has at most f(bsize/2)
|
|
digits, and al has at most f(bsize/2) digits in any case. So ah+al has at
|
|
most (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 1 bit.
|
|
|
|
The product (ah+al)*(bh+bl) therefore has at most
|
|
|
|
c(bsize/2) + (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits
|
|
|
|
and we have asize + c(bsize/2) available digit positions. We need to show
|
|
this is always enough. An instance of c(bsize/2) cancels out in both, so
|
|
the question reduces to whether asize digits is enough to hold
|
|
(asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits. If asize < bsize,
|
|
then we're asking whether asize digits >= f(bsize/2) digits + 2 bits. By #4,
|
|
asize is at least f(bsize/2)+1 digits, so this in turn reduces to whether 1
|
|
digit is enough to hold 2 bits. This is so since SHIFT=15 >= 2. If
|
|
asize == bsize, then we're asking whether bsize digits is enough to hold
|
|
c(bsize/2) digits + 2 bits, or equivalently (by #1) whether f(bsize/2) digits
|
|
is enough to hold 2 bits. This is so if bsize >= 2, which holds because
|
|
bsize >= KARATSUBA_CUTOFF >= 2.
|
|
|
|
Note that since there's always enough room for (ah+al)*(bh+bl), and that's
|
|
clearly >= each of ah*bh and al*bl, there's always enough room to subtract
|
|
ah*bh and al*bl too.
|
|
*/
|
|
|
|
/* b has at least twice the digits of a, and a is big enough that Karatsuba
|
|
* would pay off *if* the inputs had balanced sizes. View b as a sequence
|
|
* of slices, each with a->ob_size digits, and multiply the slices by a,
|
|
* one at a time. This gives k_mul balanced inputs to work with, and is
|
|
* also cache-friendly (we compute one double-width slice of the result
|
|
* at a time, then move on, never bactracking except for the helpful
|
|
* single-width slice overlap between successive partial sums).
|
|
*/
|
|
static PyLongObject *
|
|
k_lopsided_mul(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
const Py_ssize_t asize = ABS(a->ob_size);
|
|
Py_ssize_t bsize = ABS(b->ob_size);
|
|
Py_ssize_t nbdone; /* # of b digits already multiplied */
|
|
PyLongObject *ret;
|
|
PyLongObject *bslice = NULL;
|
|
|
|
assert(asize > KARATSUBA_CUTOFF);
|
|
assert(2 * asize <= bsize);
|
|
|
|
/* Allocate result space, and zero it out. */
|
|
ret = _PyLong_New(asize + bsize);
|
|
if (ret == NULL)
|
|
return NULL;
|
|
memset(ret->ob_digit, 0, ret->ob_size * sizeof(digit));
|
|
|
|
/* Successive slices of b are copied into bslice. */
|
|
bslice = _PyLong_New(asize);
|
|
if (bslice == NULL)
|
|
goto fail;
|
|
|
|
nbdone = 0;
|
|
while (bsize > 0) {
|
|
PyLongObject *product;
|
|
const Py_ssize_t nbtouse = MIN(bsize, asize);
|
|
|
|
/* Multiply the next slice of b by a. */
|
|
memcpy(bslice->ob_digit, b->ob_digit + nbdone,
|
|
nbtouse * sizeof(digit));
|
|
bslice->ob_size = nbtouse;
|
|
product = k_mul(a, bslice);
|
|
if (product == NULL)
|
|
goto fail;
|
|
|
|
/* Add into result. */
|
|
(void)v_iadd(ret->ob_digit + nbdone, ret->ob_size - nbdone,
|
|
product->ob_digit, product->ob_size);
|
|
Py_DECREF(product);
|
|
|
|
bsize -= nbtouse;
|
|
nbdone += nbtouse;
|
|
}
|
|
|
|
Py_DECREF(bslice);
|
|
return long_normalize(ret);
|
|
|
|
fail:
|
|
Py_DECREF(ret);
|
|
Py_XDECREF(bslice);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
long_mul(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b, *z;
|
|
|
|
if (!convert_binop((PyObject *)v, (PyObject *)w, &a, &b)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
z = k_mul(a, b);
|
|
/* Negate if exactly one of the inputs is negative. */
|
|
if (((a->ob_size ^ b->ob_size) < 0) && z)
|
|
z->ob_size = -(z->ob_size);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
/* The / and % operators are now defined in terms of divmod().
|
|
The expression a mod b has the value a - b*floor(a/b).
|
|
The long_divrem function gives the remainder after division of
|
|
|a| by |b|, with the sign of a. This is also expressed
|
|
as a - b*trunc(a/b), if trunc truncates towards zero.
|
|
Some examples:
|
|
a b a rem b a mod b
|
|
13 10 3 3
|
|
-13 10 -3 7
|
|
13 -10 3 -7
|
|
-13 -10 -3 -3
|
|
So, to get from rem to mod, we have to add b if a and b
|
|
have different signs. We then subtract one from the 'div'
|
|
part of the outcome to keep the invariant intact. */
|
|
|
|
/* Compute
|
|
* *pdiv, *pmod = divmod(v, w)
|
|
* NULL can be passed for pdiv or pmod, in which case that part of
|
|
* the result is simply thrown away. The caller owns a reference to
|
|
* each of these it requests (does not pass NULL for).
|
|
*/
|
|
static int
|
|
l_divmod(PyLongObject *v, PyLongObject *w,
|
|
PyLongObject **pdiv, PyLongObject **pmod)
|
|
{
|
|
PyLongObject *div, *mod;
|
|
|
|
if (long_divrem(v, w, &div, &mod) < 0)
|
|
return -1;
|
|
if ((mod->ob_size < 0 && w->ob_size > 0) ||
|
|
(mod->ob_size > 0 && w->ob_size < 0)) {
|
|
PyLongObject *temp;
|
|
PyLongObject *one;
|
|
temp = (PyLongObject *) long_add(mod, w);
|
|
Py_DECREF(mod);
|
|
mod = temp;
|
|
if (mod == NULL) {
|
|
Py_DECREF(div);
|
|
return -1;
|
|
}
|
|
one = (PyLongObject *) PyLong_FromLong(1L);
|
|
if (one == NULL ||
|
|
(temp = (PyLongObject *) long_sub(div, one)) == NULL) {
|
|
Py_DECREF(mod);
|
|
Py_DECREF(div);
|
|
Py_XDECREF(one);
|
|
return -1;
|
|
}
|
|
Py_DECREF(one);
|
|
Py_DECREF(div);
|
|
div = temp;
|
|
}
|
|
if (pdiv != NULL)
|
|
*pdiv = div;
|
|
else
|
|
Py_DECREF(div);
|
|
|
|
if (pmod != NULL)
|
|
*pmod = mod;
|
|
else
|
|
Py_DECREF(mod);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
long_div(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b, *div;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
if (l_divmod(a, b, &div, NULL) < 0)
|
|
div = NULL;
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)div;
|
|
}
|
|
|
|
static PyObject *
|
|
long_true_divide(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
double ad, bd;
|
|
int failed, aexp = -1, bexp = -1;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
ad = _PyLong_AsScaledDouble((PyObject *)a, &aexp);
|
|
bd = _PyLong_AsScaledDouble((PyObject *)b, &bexp);
|
|
failed = (ad == -1.0 || bd == -1.0) && PyErr_Occurred();
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
if (failed)
|
|
return NULL;
|
|
/* 'aexp' and 'bexp' were initialized to -1 to silence gcc-4.0.x,
|
|
but should really be set correctly after sucessful calls to
|
|
_PyLong_AsScaledDouble() */
|
|
assert(aexp >= 0 && bexp >= 0);
|
|
|
|
if (bd == 0.0) {
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
"long division or modulo by zero");
|
|
return NULL;
|
|
}
|
|
|
|
/* True value is very close to ad/bd * 2**(SHIFT*(aexp-bexp)) */
|
|
ad /= bd; /* overflow/underflow impossible here */
|
|
aexp -= bexp;
|
|
if (aexp > INT_MAX / SHIFT)
|
|
goto overflow;
|
|
else if (aexp < -(INT_MAX / SHIFT))
|
|
return PyFloat_FromDouble(0.0); /* underflow to 0 */
|
|
errno = 0;
|
|
ad = ldexp(ad, aexp * SHIFT);
|
|
if (Py_OVERFLOWED(ad)) /* ignore underflow to 0.0 */
|
|
goto overflow;
|
|
return PyFloat_FromDouble(ad);
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"long/long too large for a float");
|
|
return NULL;
|
|
|
|
}
|
|
|
|
static PyObject *
|
|
long_mod(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b, *mod;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
|
|
if (l_divmod(a, b, NULL, &mod) < 0)
|
|
mod = NULL;
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)mod;
|
|
}
|
|
|
|
static PyObject *
|
|
long_divmod(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b, *div, *mod;
|
|
PyObject *z;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
|
|
if (l_divmod(a, b, &div, &mod) < 0) {
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return NULL;
|
|
}
|
|
z = PyTuple_New(2);
|
|
if (z != NULL) {
|
|
PyTuple_SetItem(z, 0, (PyObject *) div);
|
|
PyTuple_SetItem(z, 1, (PyObject *) mod);
|
|
}
|
|
else {
|
|
Py_DECREF(div);
|
|
Py_DECREF(mod);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return z;
|
|
}
|
|
|
|
/* pow(v, w, x) */
|
|
static PyObject *
|
|
long_pow(PyObject *v, PyObject *w, PyObject *x)
|
|
{
|
|
PyLongObject *a, *b, *c; /* a,b,c = v,w,x */
|
|
int negativeOutput = 0; /* if x<0 return negative output */
|
|
|
|
PyLongObject *z = NULL; /* accumulated result */
|
|
Py_ssize_t i, j, k; /* counters */
|
|
PyLongObject *temp = NULL;
|
|
|
|
/* 5-ary values. If the exponent is large enough, table is
|
|
* precomputed so that table[i] == a**i % c for i in range(32).
|
|
*/
|
|
PyLongObject *table[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
|
|
|
|
/* a, b, c = v, w, x */
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
if (PyLong_Check(x)) {
|
|
c = (PyLongObject *)x;
|
|
Py_INCREF(x);
|
|
}
|
|
else if (PyInt_Check(x)) {
|
|
c = (PyLongObject *)PyLong_FromLong(PyInt_AS_LONG(x));
|
|
if (c == NULL)
|
|
goto Error;
|
|
}
|
|
else if (x == Py_None)
|
|
c = NULL;
|
|
else {
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
if (b->ob_size < 0) { /* if exponent is negative */
|
|
if (c) {
|
|
PyErr_SetString(PyExc_TypeError, "pow() 2nd argument "
|
|
"cannot be negative when 3rd argument specified");
|
|
goto Error;
|
|
}
|
|
else {
|
|
/* else return a float. This works because we know
|
|
that this calls float_pow() which converts its
|
|
arguments to double. */
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return PyFloat_Type.tp_as_number->nb_power(v, w, x);
|
|
}
|
|
}
|
|
|
|
if (c) {
|
|
/* if modulus == 0:
|
|
raise ValueError() */
|
|
if (c->ob_size == 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"pow() 3rd argument cannot be 0");
|
|
goto Error;
|
|
}
|
|
|
|
/* if modulus < 0:
|
|
negativeOutput = True
|
|
modulus = -modulus */
|
|
if (c->ob_size < 0) {
|
|
negativeOutput = 1;
|
|
temp = (PyLongObject *)_PyLong_Copy(c);
|
|
if (temp == NULL)
|
|
goto Error;
|
|
Py_DECREF(c);
|
|
c = temp;
|
|
temp = NULL;
|
|
c->ob_size = - c->ob_size;
|
|
}
|
|
|
|
/* if modulus == 1:
|
|
return 0 */
|
|
if ((c->ob_size == 1) && (c->ob_digit[0] == 1)) {
|
|
z = (PyLongObject *)PyLong_FromLong(0L);
|
|
goto Done;
|
|
}
|
|
|
|
/* if base < 0:
|
|
base = base % modulus
|
|
Having the base positive just makes things easier. */
|
|
if (a->ob_size < 0) {
|
|
if (l_divmod(a, c, NULL, &temp) < 0)
|
|
goto Error;
|
|
Py_DECREF(a);
|
|
a = temp;
|
|
temp = NULL;
|
|
}
|
|
}
|
|
|
|
/* At this point a, b, and c are guaranteed non-negative UNLESS
|
|
c is NULL, in which case a may be negative. */
|
|
|
|
z = (PyLongObject *)PyLong_FromLong(1L);
|
|
if (z == NULL)
|
|
goto Error;
|
|
|
|
/* Perform a modular reduction, X = X % c, but leave X alone if c
|
|
* is NULL.
|
|
*/
|
|
#define REDUCE(X) \
|
|
if (c != NULL) { \
|
|
if (l_divmod(X, c, NULL, &temp) < 0) \
|
|
goto Error; \
|
|
Py_XDECREF(X); \
|
|
X = temp; \
|
|
temp = NULL; \
|
|
}
|
|
|
|
/* Multiply two values, then reduce the result:
|
|
result = X*Y % c. If c is NULL, skip the mod. */
|
|
#define MULT(X, Y, result) \
|
|
{ \
|
|
temp = (PyLongObject *)long_mul(X, Y); \
|
|
if (temp == NULL) \
|
|
goto Error; \
|
|
Py_XDECREF(result); \
|
|
result = temp; \
|
|
temp = NULL; \
|
|
REDUCE(result) \
|
|
}
|
|
|
|
if (b->ob_size <= FIVEARY_CUTOFF) {
|
|
/* Left-to-right binary exponentiation (HAC Algorithm 14.79) */
|
|
/* http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf */
|
|
for (i = b->ob_size - 1; i >= 0; --i) {
|
|
digit bi = b->ob_digit[i];
|
|
|
|
for (j = 1 << (SHIFT-1); j != 0; j >>= 1) {
|
|
MULT(z, z, z)
|
|
if (bi & j)
|
|
MULT(z, a, z)
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
/* Left-to-right 5-ary exponentiation (HAC Algorithm 14.82) */
|
|
Py_INCREF(z); /* still holds 1L */
|
|
table[0] = z;
|
|
for (i = 1; i < 32; ++i)
|
|
MULT(table[i-1], a, table[i])
|
|
|
|
for (i = b->ob_size - 1; i >= 0; --i) {
|
|
const digit bi = b->ob_digit[i];
|
|
|
|
for (j = SHIFT - 5; j >= 0; j -= 5) {
|
|
const int index = (bi >> j) & 0x1f;
|
|
for (k = 0; k < 5; ++k)
|
|
MULT(z, z, z)
|
|
if (index)
|
|
MULT(z, table[index], z)
|
|
}
|
|
}
|
|
}
|
|
|
|
if (negativeOutput && (z->ob_size != 0)) {
|
|
temp = (PyLongObject *)long_sub(z, c);
|
|
if (temp == NULL)
|
|
goto Error;
|
|
Py_DECREF(z);
|
|
z = temp;
|
|
temp = NULL;
|
|
}
|
|
goto Done;
|
|
|
|
Error:
|
|
if (z != NULL) {
|
|
Py_DECREF(z);
|
|
z = NULL;
|
|
}
|
|
/* fall through */
|
|
Done:
|
|
if (b->ob_size > FIVEARY_CUTOFF) {
|
|
for (i = 0; i < 32; ++i)
|
|
Py_XDECREF(table[i]);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
Py_XDECREF(c);
|
|
Py_XDECREF(temp);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
static PyObject *
|
|
long_invert(PyLongObject *v)
|
|
{
|
|
/* Implement ~x as -(x+1) */
|
|
PyLongObject *x;
|
|
PyLongObject *w;
|
|
w = (PyLongObject *)PyLong_FromLong(1L);
|
|
if (w == NULL)
|
|
return NULL;
|
|
x = (PyLongObject *) long_add(v, w);
|
|
Py_DECREF(w);
|
|
if (x == NULL)
|
|
return NULL;
|
|
x->ob_size = -(x->ob_size);
|
|
return (PyObject *)x;
|
|
}
|
|
|
|
static PyObject *
|
|
long_pos(PyLongObject *v)
|
|
{
|
|
if (PyLong_CheckExact(v)) {
|
|
Py_INCREF(v);
|
|
return (PyObject *)v;
|
|
}
|
|
else
|
|
return _PyLong_Copy(v);
|
|
}
|
|
|
|
static PyObject *
|
|
long_neg(PyLongObject *v)
|
|
{
|
|
PyLongObject *z;
|
|
if (v->ob_size == 0 && PyLong_CheckExact(v)) {
|
|
/* -0 == 0 */
|
|
Py_INCREF(v);
|
|
return (PyObject *) v;
|
|
}
|
|
z = (PyLongObject *)_PyLong_Copy(v);
|
|
if (z != NULL)
|
|
z->ob_size = -(v->ob_size);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
static PyObject *
|
|
long_abs(PyLongObject *v)
|
|
{
|
|
if (v->ob_size < 0)
|
|
return long_neg(v);
|
|
else
|
|
return long_pos(v);
|
|
}
|
|
|
|
static int
|
|
long_bool(PyLongObject *v)
|
|
{
|
|
return ABS(v->ob_size) != 0;
|
|
}
|
|
|
|
static PyObject *
|
|
long_rshift(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyLongObject *z = NULL;
|
|
long shiftby;
|
|
Py_ssize_t newsize, wordshift, loshift, hishift, i, j;
|
|
digit lomask, himask;
|
|
|
|
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
|
|
|
|
if (a->ob_size < 0) {
|
|
/* Right shifting negative numbers is harder */
|
|
PyLongObject *a1, *a2;
|
|
a1 = (PyLongObject *) long_invert(a);
|
|
if (a1 == NULL)
|
|
goto rshift_error;
|
|
a2 = (PyLongObject *) long_rshift(a1, b);
|
|
Py_DECREF(a1);
|
|
if (a2 == NULL)
|
|
goto rshift_error;
|
|
z = (PyLongObject *) long_invert(a2);
|
|
Py_DECREF(a2);
|
|
}
|
|
else {
|
|
|
|
shiftby = PyLong_AsLong((PyObject *)b);
|
|
if (shiftby == -1L && PyErr_Occurred())
|
|
goto rshift_error;
|
|
if (shiftby < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative shift count");
|
|
goto rshift_error;
|
|
}
|
|
wordshift = shiftby / SHIFT;
|
|
newsize = ABS(a->ob_size) - wordshift;
|
|
if (newsize <= 0) {
|
|
z = _PyLong_New(0);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
loshift = shiftby % SHIFT;
|
|
hishift = SHIFT - loshift;
|
|
lomask = ((digit)1 << hishift) - 1;
|
|
himask = MASK ^ lomask;
|
|
z = _PyLong_New(newsize);
|
|
if (z == NULL)
|
|
goto rshift_error;
|
|
if (a->ob_size < 0)
|
|
z->ob_size = -(z->ob_size);
|
|
for (i = 0, j = wordshift; i < newsize; i++, j++) {
|
|
z->ob_digit[i] = (a->ob_digit[j] >> loshift) & lomask;
|
|
if (i+1 < newsize)
|
|
z->ob_digit[i] |=
|
|
(a->ob_digit[j+1] << hishift) & himask;
|
|
}
|
|
z = long_normalize(z);
|
|
}
|
|
rshift_error:
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *) z;
|
|
|
|
}
|
|
|
|
static PyObject *
|
|
long_lshift(PyObject *v, PyObject *w)
|
|
{
|
|
/* This version due to Tim Peters */
|
|
PyLongObject *a, *b;
|
|
PyLongObject *z = NULL;
|
|
long shiftby;
|
|
Py_ssize_t oldsize, newsize, wordshift, remshift, i, j;
|
|
twodigits accum;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
|
|
shiftby = PyLong_AsLong((PyObject *)b);
|
|
if (shiftby == -1L && PyErr_Occurred())
|
|
goto lshift_error;
|
|
if (shiftby < 0) {
|
|
PyErr_SetString(PyExc_ValueError, "negative shift count");
|
|
goto lshift_error;
|
|
}
|
|
if ((long)(int)shiftby != shiftby) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"outrageous left shift count");
|
|
goto lshift_error;
|
|
}
|
|
/* wordshift, remshift = divmod(shiftby, SHIFT) */
|
|
wordshift = (int)shiftby / SHIFT;
|
|
remshift = (int)shiftby - wordshift * SHIFT;
|
|
|
|
oldsize = ABS(a->ob_size);
|
|
newsize = oldsize + wordshift;
|
|
if (remshift)
|
|
++newsize;
|
|
z = _PyLong_New(newsize);
|
|
if (z == NULL)
|
|
goto lshift_error;
|
|
if (a->ob_size < 0)
|
|
z->ob_size = -(z->ob_size);
|
|
for (i = 0; i < wordshift; i++)
|
|
z->ob_digit[i] = 0;
|
|
accum = 0;
|
|
for (i = wordshift, j = 0; j < oldsize; i++, j++) {
|
|
accum |= (twodigits)a->ob_digit[j] << remshift;
|
|
z->ob_digit[i] = (digit)(accum & MASK);
|
|
accum >>= SHIFT;
|
|
}
|
|
if (remshift)
|
|
z->ob_digit[newsize-1] = (digit)accum;
|
|
else
|
|
assert(!accum);
|
|
z = long_normalize(z);
|
|
lshift_error:
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *) z;
|
|
}
|
|
|
|
|
|
/* Bitwise and/xor/or operations */
|
|
|
|
static PyObject *
|
|
long_bitwise(PyLongObject *a,
|
|
int op, /* '&', '|', '^' */
|
|
PyLongObject *b)
|
|
{
|
|
digit maska, maskb; /* 0 or MASK */
|
|
int negz;
|
|
Py_ssize_t size_a, size_b, size_z;
|
|
PyLongObject *z;
|
|
int i;
|
|
digit diga, digb;
|
|
PyObject *v;
|
|
|
|
if (a->ob_size < 0) {
|
|
a = (PyLongObject *) long_invert(a);
|
|
if (a == NULL)
|
|
return NULL;
|
|
maska = MASK;
|
|
}
|
|
else {
|
|
Py_INCREF(a);
|
|
maska = 0;
|
|
}
|
|
if (b->ob_size < 0) {
|
|
b = (PyLongObject *) long_invert(b);
|
|
if (b == NULL) {
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
maskb = MASK;
|
|
}
|
|
else {
|
|
Py_INCREF(b);
|
|
maskb = 0;
|
|
}
|
|
|
|
negz = 0;
|
|
switch (op) {
|
|
case '^':
|
|
if (maska != maskb) {
|
|
maska ^= MASK;
|
|
negz = -1;
|
|
}
|
|
break;
|
|
case '&':
|
|
if (maska && maskb) {
|
|
op = '|';
|
|
maska ^= MASK;
|
|
maskb ^= MASK;
|
|
negz = -1;
|
|
}
|
|
break;
|
|
case '|':
|
|
if (maska || maskb) {
|
|
op = '&';
|
|
maska ^= MASK;
|
|
maskb ^= MASK;
|
|
negz = -1;
|
|
}
|
|
break;
|
|
}
|
|
|
|
/* JRH: The original logic here was to allocate the result value (z)
|
|
as the longer of the two operands. However, there are some cases
|
|
where the result is guaranteed to be shorter than that: AND of two
|
|
positives, OR of two negatives: use the shorter number. AND with
|
|
mixed signs: use the positive number. OR with mixed signs: use the
|
|
negative number. After the transformations above, op will be '&'
|
|
iff one of these cases applies, and mask will be non-0 for operands
|
|
whose length should be ignored.
|
|
*/
|
|
|
|
size_a = a->ob_size;
|
|
size_b = b->ob_size;
|
|
size_z = op == '&'
|
|
? (maska
|
|
? size_b
|
|
: (maskb ? size_a : MIN(size_a, size_b)))
|
|
: MAX(size_a, size_b);
|
|
z = _PyLong_New(size_z);
|
|
if (z == NULL) {
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < size_z; ++i) {
|
|
diga = (i < size_a ? a->ob_digit[i] : 0) ^ maska;
|
|
digb = (i < size_b ? b->ob_digit[i] : 0) ^ maskb;
|
|
switch (op) {
|
|
case '&': z->ob_digit[i] = diga & digb; break;
|
|
case '|': z->ob_digit[i] = diga | digb; break;
|
|
case '^': z->ob_digit[i] = diga ^ digb; break;
|
|
}
|
|
}
|
|
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
z = long_normalize(z);
|
|
if (negz == 0)
|
|
return (PyObject *) z;
|
|
v = long_invert(z);
|
|
Py_DECREF(z);
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
long_and(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *c;
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
c = long_bitwise(a, '&', b);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return c;
|
|
}
|
|
|
|
static PyObject *
|
|
long_xor(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *c;
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
c = long_bitwise(a, '^', b);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return c;
|
|
}
|
|
|
|
static PyObject *
|
|
long_or(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *c;
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
c = long_bitwise(a, '|', b);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return c;
|
|
}
|
|
|
|
static PyObject *
|
|
long_long(PyObject *v)
|
|
{
|
|
if (PyLong_CheckExact(v))
|
|
Py_INCREF(v);
|
|
else
|
|
v = _PyLong_Copy((PyLongObject *)v);
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
long_int(PyObject *v)
|
|
{
|
|
long x;
|
|
x = PyLong_AsLong(v);
|
|
if (PyErr_Occurred()) {
|
|
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
|
|
PyErr_Clear();
|
|
if (PyLong_CheckExact(v)) {
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
else
|
|
return _PyLong_Copy((PyLongObject *)v);
|
|
}
|
|
else
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
long_float(PyObject *v)
|
|
{
|
|
double result;
|
|
result = PyLong_AsDouble(v);
|
|
if (result == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyFloat_FromDouble(result);
|
|
}
|
|
|
|
static PyObject *
|
|
long_oct(PyObject *v)
|
|
{
|
|
return long_format(v, 8);
|
|
}
|
|
|
|
static PyObject *
|
|
long_hex(PyObject *v)
|
|
{
|
|
return long_format(v, 16);
|
|
}
|
|
|
|
static PyObject *
|
|
long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
static PyObject *
|
|
long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *x = NULL;
|
|
int base = -909; /* unlikely! */
|
|
static char *kwlist[] = {"x", "base", 0};
|
|
|
|
if (type != &PyLong_Type)
|
|
return long_subtype_new(type, args, kwds); /* Wimp out */
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:long", kwlist,
|
|
&x, &base))
|
|
return NULL;
|
|
if (x == NULL)
|
|
return PyLong_FromLong(0L);
|
|
if (base == -909)
|
|
return PyNumber_Long(x);
|
|
else if (PyString_Check(x))
|
|
return PyLong_FromString(PyString_AS_STRING(x), NULL, base);
|
|
#ifdef Py_USING_UNICODE
|
|
else if (PyUnicode_Check(x))
|
|
return PyLong_FromUnicode(PyUnicode_AS_UNICODE(x),
|
|
PyUnicode_GET_SIZE(x),
|
|
base);
|
|
#endif
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"long() can't convert non-string with explicit base");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* Wimpy, slow approach to tp_new calls for subtypes of long:
|
|
first create a regular long from whatever arguments we got,
|
|
then allocate a subtype instance and initialize it from
|
|
the regular long. The regular long is then thrown away.
|
|
*/
|
|
static PyObject *
|
|
long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyLongObject *tmp, *newobj;
|
|
Py_ssize_t i, n;
|
|
|
|
assert(PyType_IsSubtype(type, &PyLong_Type));
|
|
tmp = (PyLongObject *)long_new(&PyLong_Type, args, kwds);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
assert(PyLong_CheckExact(tmp));
|
|
n = tmp->ob_size;
|
|
if (n < 0)
|
|
n = -n;
|
|
newobj = (PyLongObject *)type->tp_alloc(type, n);
|
|
if (newobj == NULL) {
|
|
Py_DECREF(tmp);
|
|
return NULL;
|
|
}
|
|
assert(PyLong_Check(newobj));
|
|
newobj->ob_size = tmp->ob_size;
|
|
for (i = 0; i < n; i++)
|
|
newobj->ob_digit[i] = tmp->ob_digit[i];
|
|
Py_DECREF(tmp);
|
|
return (PyObject *)newobj;
|
|
}
|
|
|
|
static PyObject *
|
|
long_getnewargs(PyLongObject *v)
|
|
{
|
|
return Py_BuildValue("(N)", _PyLong_Copy(v));
|
|
}
|
|
|
|
static PyMethodDef long_methods[] = {
|
|
{"__getnewargs__", (PyCFunction)long_getnewargs, METH_NOARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyDoc_STRVAR(long_doc,
|
|
"long(x[, base]) -> integer\n\
|
|
\n\
|
|
Convert a string or number to a long integer, if possible. A floating\n\
|
|
point argument will be truncated towards zero (this does not include a\n\
|
|
string representation of a floating point number!) When converting a\n\
|
|
string, use the optional base. It is an error to supply a base when\n\
|
|
converting a non-string.");
|
|
|
|
static PyNumberMethods long_as_number = {
|
|
(binaryfunc) long_add, /*nb_add*/
|
|
(binaryfunc) long_sub, /*nb_subtract*/
|
|
(binaryfunc) long_mul, /*nb_multiply*/
|
|
long_mod, /*nb_remainder*/
|
|
long_divmod, /*nb_divmod*/
|
|
long_pow, /*nb_power*/
|
|
(unaryfunc) long_neg, /*nb_negative*/
|
|
(unaryfunc) long_pos, /*tp_positive*/
|
|
(unaryfunc) long_abs, /*tp_absolute*/
|
|
(inquiry) long_bool, /*tp_bool*/
|
|
(unaryfunc) long_invert, /*nb_invert*/
|
|
long_lshift, /*nb_lshift*/
|
|
(binaryfunc) long_rshift, /*nb_rshift*/
|
|
long_and, /*nb_and*/
|
|
long_xor, /*nb_xor*/
|
|
long_or, /*nb_or*/
|
|
0, /*nb_coerce*/
|
|
long_int, /*nb_int*/
|
|
long_long, /*nb_long*/
|
|
long_float, /*nb_float*/
|
|
long_oct, /*nb_oct*/
|
|
long_hex, /*nb_hex*/
|
|
0, /* nb_inplace_add */
|
|
0, /* nb_inplace_subtract */
|
|
0, /* nb_inplace_multiply */
|
|
0, /* nb_inplace_remainder */
|
|
0, /* nb_inplace_power */
|
|
0, /* nb_inplace_lshift */
|
|
0, /* nb_inplace_rshift */
|
|
0, /* nb_inplace_and */
|
|
0, /* nb_inplace_xor */
|
|
0, /* nb_inplace_or */
|
|
long_div, /* nb_floor_divide */
|
|
long_true_divide, /* nb_true_divide */
|
|
0, /* nb_inplace_floor_divide */
|
|
0, /* nb_inplace_true_divide */
|
|
long_long, /* nb_index */
|
|
};
|
|
|
|
PyTypeObject PyLong_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0, /* ob_size */
|
|
"long", /* tp_name */
|
|
sizeof(PyLongObject) - sizeof(digit), /* tp_basicsize */
|
|
sizeof(digit), /* tp_itemsize */
|
|
long_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
long_repr, /* tp_repr */
|
|
&long_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)long_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
long_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
long_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
long_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
long_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|