mirror of
https://github.com/python/cpython.git
synced 2025-07-23 19:25:40 +00:00

svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines PEP 3119 -- the abc module. ................ r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines Implement part of PEP 3119 -- One Trick Ponies. ................ r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines Different way to do one trick ponies, allowing registration (per PEP strawman). ................ r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines Make sure that the magic looking for __hash__ (etc.) doesn't apply to real subclasses of Hashable. ................ r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines Add some more examples, e.g. generators and dict views. ................ r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines keys() and items() *are* containers -- just values() isn't. ................ r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines PEP 3127: new octal literals, binary literals. ................ r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines Some octal literal fixes in Tools. ................ r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines Tokenizer changes for PEP 3127. ................ r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines Some docs for PEP 3127. ................ r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines Missed a place in intobject.c. Is that used anymore anyway? ................ r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines Merged revisions 55729-55868 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines SF 1668596/1720897: distutils now copies data files even if package_dir is empty. This needs to be backported. I'm too tired tonight. It would be great if someone backports this if the buildbots are ok with it. Otherwise, I will try to get to it tomorrow. ........ r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines Bug #1722484: remove docstrings again when running with -OO. ........ r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines Fix wrong issue number. ........ r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines Have configure raise an error when building on AtheOS. Code specific to AtheOS will be removed in Python 2.7. ........ r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line Update expected birthday of 2.6 ........ r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines Backout the original 'fix' to 1721309 which had no effect. Different versions of Berkeley DB handle this differently. The comments and bug report should have the details. Memory is allocated in 4.4 (and presumably earlier), but not in 4.5. Thus 4.5 has the free error, but not earlier versions. Mostly update comments, plus make the free conditional. This fix was already applied to the 2.5 branch. ........ r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead of ``\s*``. This prevents patterns from "stealing" bits from other patterns in order to make a match work. Closes bug #1730389. Will be backported. ........ r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different from Linux's. Just fix the build for now but the code doesn't support the complete capability of HCI on FreeBSD yet. ........ r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it reads a file that ends with incomplete sequence and sizehint argument for .read() is specified. ........ r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines Fix for Windows: close a temporary file before trying to delete it. ........ r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines Patch by Tim Delany (missing DECREF). SF #1731330. ........ r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O). ........ r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines FTP.ntransfercmd method now uses create_connection when passive, using the timeout received in connection time. ........ r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines Added an optional timeout parameter to function urllib2.urlopen, with tests in test_urllib2net.py (must have network resource enabled to execute them). Also modified test_urllib2.py because testing mock classes must take it into acount. Docs are also updated. ........ r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration. ........ r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines Disallow function calls like foo(None=1). Backport from py3k rev. 55708 by Guido. ........ r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines Make reindent.py executable. ........ r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines Patch #1667860: Fix UnboundLocalError in urllib2. ........ r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line Fixing changes to getbuildinfo.c that broke linux builds ........ r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line Make this test work with older Python releases where struct has no 't' format character. ........ r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines Bug #1733488: Fix compilation of bufferobject.c on AIX. Will backport to 2.5. ........ r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur with small modifications. ........ r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. ........ r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines Fix wrong documentation, and correct the punktuation. Closes [1700455]. ........ r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line Fix warnings by using proper function prototype. ........ r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines Prevent expandtabs() on string and unicode objects from causing a segfault when a large width is passed on 32-bit platforms. Found by Google. It would be good for people to review this especially carefully and verify I don't have an off by one error and there is no other way to cause overflow. ........ r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error. ........ r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines Patch #1733960: Allow T_LONGLONG to accept ints. Will backport to 2.5. ........ r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines Fix Windows build. ........ r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines Provide LLONG_MAX for S390. ........ r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines First version of build scripts for Windows/AMD64 (no external components are built yet, and 'kill_python' is disabled). ........ r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter modules in the ReleaseAMD64 configuration because they do not compile. ........ r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line Need to set the environment variables, otherwise devenv.com is not found. ........ r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line Revert commit 55855. ........ ................ r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines Fix the refleak counter on test_collections. The ABC metaclass creates a registry which must be cleared on each run. Otherwise, there *seem* to be refleaks when there really aren't any. (The class is held within the registry even though it's no longer needed.) ................ r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line These tests have been removed, so they are no longer needed here ................ r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines Optimize access to True and False in the compiler (if True) and the peepholer (LOAD_NAME True). ................ r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines Remove __oct__ and __hex__ and use __index__ for converting non-ints before formatting in a base. Add a bin() builtin. ................ r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines int(x, 0) does not "guess". ................ r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines Add a comment to explain that nb_oct and nb_hex are nonfunctional. ................ r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines Get rid of unused imports and comment. ................ r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines _Abstract.__new__ now requires either no arguments or __init__ overridden. ................ r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines Move the collections ABCs to a separate file, _abcoll.py, in order to avoid needing to import _collections.so during the bootstrap (this will become apparent in the next submit of os.py). Add (plain and mutable) ABCs for Set, Mapping, Sequence. ................ r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines Rewrite the _Environ class to use the new collections ABCs. ................ r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines Merged revisions 55869-55912 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line Add Atul Varma for patch # 1667860 ........ r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line Ignore valgrind problems on Ubuntu from ld ........ r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines Ignore config.status.lineno which seems new (new autoconf?) ........ r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line Prevent these tests from running on Win64 since they don\'t apply there either ........ r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines Fix a bug when there was a newline in the string expandtabs was called on. This also catches another condition that can overflow. Will backport. ........ r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line Prevent hang if the port cannot be opened. ........ r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines Add all of the distuils modules that don't seem to have explicit tests. :-( Move an import in mworkscompiler so that this module can be imported on any platform. Hopefully this works on all platforms. ........ r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines SF #1734732, lower case the module names per PEP 8. Will backport. ........ r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines Not sure why this only fails sometimes on Unix machines. Better to disable it and only import msvccompiler on Windows since that's the only place it can work anyways. ........ r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute. Will backport ........ r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line Reflow long line ........ r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k" or "K" codes. ........ r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines Added versionchanged flag to all the methods which received a new optional timeout parameter, and a versionadded flag to the socket.create_connection function. ........ ................ r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines New super() implementation, for PEP 3135 (though the PEP is not yet updated to this design, and small tweaks may still be made later). ................ r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines I'm guessing this module broke when Neal ripped out the types module -- it used 'list' both as a local variable and as the built-in list type. Renamed the local variable since that was easier. ................ r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines Change all occurrences of super(<thisclass>, <firstarg>) to super(). Seems to have worked, all the tests still pass. Exception: test_descr and test_descrtut, which have tons of these and are there to test the various usages. ................ r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line Patch #1735485: remove StandardError from the exception hierarchy. ................ r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines Merged revisions 55913-55950 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines Apply patch #1734945 to support TurboLinux as distribution. ........ r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines Add patch #1726668: Windows Vista support. ........ r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line Checkout, but do not yet try to build, exernal sources. ........ r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). Set the /XP64 /RETAIL build enviroment in the makefile when building ReleaseAMD64. ........ r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines Revert this change, since it breaks the win32 build: Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). ........ r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines Specify the bufferoverflowU.lib to the makefile on the command line (for ReleaseAMD64 builds). ........ r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj. Build sqlite3.dll and bsddb. ........ r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines Don't rebuild Berkeley DB if not needed (this was committed by accident). ........ r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines Provide PY_LLONG_MAX on all systems having long long. Will backport to 2.5. ........ ................ r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines Fix a compilation warning. ................
1227 lines
29 KiB
C
1227 lines
29 KiB
C
|
|
/* Integer object implementation */
|
|
|
|
#include "Python.h"
|
|
#include <ctype.h>
|
|
|
|
long
|
|
PyInt_GetMax(void)
|
|
{
|
|
return LONG_MAX; /* To initialize sys.maxint */
|
|
}
|
|
|
|
#if 0
|
|
/* Integers are quite normal objects, to make object handling uniform.
|
|
(Using odd pointers to represent integers would save much space
|
|
but require extra checks for this special case throughout the code.)
|
|
Since a typical Python program spends much of its time allocating
|
|
and deallocating integers, these operations should be very fast.
|
|
Therefore we use a dedicated allocation scheme with a much lower
|
|
overhead (in space and time) than straight malloc(): a simple
|
|
dedicated free list, filled when necessary with memory from malloc().
|
|
|
|
block_list is a singly-linked list of all PyIntBlocks ever allocated,
|
|
linked via their next members. PyIntBlocks are never returned to the
|
|
system before shutdown (PyInt_Fini).
|
|
|
|
free_list is a singly-linked list of available PyIntObjects, linked
|
|
via abuse of their ob_type members.
|
|
*/
|
|
|
|
#define BLOCK_SIZE 1000 /* 1K less typical malloc overhead */
|
|
#define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */
|
|
#define N_INTOBJECTS ((BLOCK_SIZE - BHEAD_SIZE) / sizeof(PyIntObject))
|
|
|
|
struct _intblock {
|
|
struct _intblock *next;
|
|
PyIntObject objects[N_INTOBJECTS];
|
|
};
|
|
|
|
typedef struct _intblock PyIntBlock;
|
|
|
|
static PyIntBlock *block_list = NULL;
|
|
static PyIntObject *free_list = NULL;
|
|
|
|
static PyIntObject *
|
|
fill_free_list(void)
|
|
{
|
|
PyIntObject *p, *q;
|
|
/* Python's object allocator isn't appropriate for large blocks. */
|
|
p = (PyIntObject *) PyMem_MALLOC(sizeof(PyIntBlock));
|
|
if (p == NULL)
|
|
return (PyIntObject *) PyErr_NoMemory();
|
|
((PyIntBlock *)p)->next = block_list;
|
|
block_list = (PyIntBlock *)p;
|
|
/* Link the int objects together, from rear to front, then return
|
|
the address of the last int object in the block. */
|
|
p = &((PyIntBlock *)p)->objects[0];
|
|
q = p + N_INTOBJECTS;
|
|
while (--q > p)
|
|
q->ob_type = (struct _typeobject *)(q-1);
|
|
q->ob_type = NULL;
|
|
return p + N_INTOBJECTS - 1;
|
|
}
|
|
|
|
#ifndef NSMALLPOSINTS
|
|
#define NSMALLPOSINTS 257
|
|
#endif
|
|
#ifndef NSMALLNEGINTS
|
|
#define NSMALLNEGINTS 5
|
|
#endif
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
/* References to small integers are saved in this array so that they
|
|
can be shared.
|
|
The integers that are saved are those in the range
|
|
-NSMALLNEGINTS (inclusive) to NSMALLPOSINTS (not inclusive).
|
|
*/
|
|
static PyIntObject *small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
|
|
#endif
|
|
#ifdef COUNT_ALLOCS
|
|
int quick_int_allocs, quick_neg_int_allocs;
|
|
#endif
|
|
|
|
PyObject *
|
|
PyInt_FromLong(long ival)
|
|
{
|
|
register PyIntObject *v;
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) {
|
|
v = small_ints[ival + NSMALLNEGINTS];
|
|
Py_INCREF(v);
|
|
#ifdef COUNT_ALLOCS
|
|
if (ival >= 0)
|
|
quick_int_allocs++;
|
|
else
|
|
quick_neg_int_allocs++;
|
|
#endif
|
|
return (PyObject *) v;
|
|
}
|
|
#endif
|
|
if (free_list == NULL) {
|
|
if ((free_list = fill_free_list()) == NULL)
|
|
return NULL;
|
|
}
|
|
/* Inline PyObject_New */
|
|
v = free_list;
|
|
free_list = (PyIntObject *)v->ob_type;
|
|
PyObject_INIT(v, &PyInt_Type);
|
|
v->ob_ival = ival;
|
|
return (PyObject *) v;
|
|
}
|
|
|
|
PyObject *
|
|
PyInt_FromSize_t(size_t ival)
|
|
{
|
|
if (ival <= LONG_MAX)
|
|
return PyInt_FromLong((long)ival);
|
|
return _PyLong_FromSize_t(ival);
|
|
}
|
|
|
|
PyObject *
|
|
PyInt_FromSsize_t(Py_ssize_t ival)
|
|
{
|
|
if (ival >= LONG_MIN && ival <= LONG_MAX)
|
|
return PyInt_FromLong((long)ival);
|
|
return _PyLong_FromSsize_t(ival);
|
|
}
|
|
|
|
static void
|
|
int_dealloc(PyIntObject *v)
|
|
{
|
|
if (PyInt_CheckExact(v)) {
|
|
v->ob_type = (struct _typeobject *)free_list;
|
|
free_list = v;
|
|
}
|
|
else
|
|
v->ob_type->tp_free((PyObject *)v);
|
|
}
|
|
|
|
static void
|
|
int_free(PyIntObject *v)
|
|
{
|
|
v->ob_type = (struct _typeobject *)free_list;
|
|
free_list = v;
|
|
}
|
|
|
|
long
|
|
PyInt_AsLong(register PyObject *op)
|
|
{
|
|
PyNumberMethods *nb;
|
|
PyIntObject *io;
|
|
long val;
|
|
|
|
if (op && PyInt_Check(op))
|
|
return PyInt_AS_LONG((PyIntObject*) op);
|
|
|
|
if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return -1;
|
|
}
|
|
|
|
io = (PyIntObject*) (*nb->nb_int) (op);
|
|
if (io == NULL)
|
|
return -1;
|
|
if (!PyInt_Check(io)) {
|
|
if (PyLong_Check(io)) {
|
|
/* got a long? => retry int conversion */
|
|
val = PyLong_AsLong((PyObject *)io);
|
|
Py_DECREF(io);
|
|
if ((val == -1) && PyErr_Occurred())
|
|
return -1;
|
|
return val;
|
|
}
|
|
else
|
|
{
|
|
Py_DECREF(io);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
val = PyInt_AS_LONG(io);
|
|
Py_DECREF(io);
|
|
|
|
return val;
|
|
}
|
|
|
|
Py_ssize_t
|
|
PyInt_AsSsize_t(register PyObject *op)
|
|
{
|
|
#if SIZEOF_SIZE_T != SIZEOF_LONG
|
|
PyNumberMethods *nb;
|
|
PyIntObject *io;
|
|
Py_ssize_t val;
|
|
#endif
|
|
|
|
if (op == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return -1;
|
|
}
|
|
|
|
if (PyInt_Check(op))
|
|
return PyInt_AS_LONG((PyIntObject*) op);
|
|
if (PyLong_Check(op))
|
|
return _PyLong_AsSsize_t(op);
|
|
#if SIZEOF_SIZE_T == SIZEOF_LONG
|
|
return PyInt_AsLong(op);
|
|
#else
|
|
|
|
if ((nb = op->ob_type->tp_as_number) == NULL ||
|
|
(nb->nb_int == NULL && nb->nb_long == 0)) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return -1;
|
|
}
|
|
|
|
if (nb->nb_long != 0)
|
|
io = (PyIntObject*) (*nb->nb_long) (op);
|
|
else
|
|
io = (PyIntObject*) (*nb->nb_int) (op);
|
|
if (io == NULL)
|
|
return -1;
|
|
if (!PyInt_Check(io)) {
|
|
if (PyLong_Check(io)) {
|
|
/* got a long? => retry int conversion */
|
|
val = _PyLong_AsSsize_t((PyObject *)io);
|
|
Py_DECREF(io);
|
|
if ((val == -1) && PyErr_Occurred())
|
|
return -1;
|
|
return val;
|
|
}
|
|
else
|
|
{
|
|
Py_DECREF(io);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
val = PyInt_AS_LONG(io);
|
|
Py_DECREF(io);
|
|
|
|
return val;
|
|
#endif
|
|
}
|
|
|
|
unsigned long
|
|
PyInt_AsUnsignedLongMask(register PyObject *op)
|
|
{
|
|
PyNumberMethods *nb;
|
|
PyIntObject *io;
|
|
unsigned long val;
|
|
|
|
if (op && PyInt_Check(op))
|
|
return PyInt_AS_LONG((PyIntObject*) op);
|
|
if (op && PyLong_Check(op))
|
|
return PyLong_AsUnsignedLongMask(op);
|
|
|
|
if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return (unsigned long)-1;
|
|
}
|
|
|
|
io = (PyIntObject*) (*nb->nb_int) (op);
|
|
if (io == NULL)
|
|
return (unsigned long)-1;
|
|
if (!PyInt_Check(io)) {
|
|
if (PyLong_Check(io)) {
|
|
val = PyLong_AsUnsignedLongMask((PyObject *)io);
|
|
Py_DECREF(io);
|
|
if (PyErr_Occurred())
|
|
return (unsigned long)-1;
|
|
return val;
|
|
}
|
|
else
|
|
{
|
|
Py_DECREF(io);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return (unsigned long)-1;
|
|
}
|
|
}
|
|
|
|
val = PyInt_AS_LONG(io);
|
|
Py_DECREF(io);
|
|
|
|
return val;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
unsigned PY_LONG_LONG
|
|
PyInt_AsUnsignedLongLongMask(register PyObject *op)
|
|
{
|
|
PyNumberMethods *nb;
|
|
PyIntObject *io;
|
|
unsigned PY_LONG_LONG val;
|
|
|
|
if (op && PyInt_Check(op))
|
|
return PyInt_AS_LONG((PyIntObject*) op);
|
|
if (op && PyLong_Check(op))
|
|
return PyLong_AsUnsignedLongLongMask(op);
|
|
|
|
if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
}
|
|
|
|
io = (PyIntObject*) (*nb->nb_int) (op);
|
|
if (io == NULL)
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
if (!PyInt_Check(io)) {
|
|
if (PyLong_Check(io)) {
|
|
val = PyLong_AsUnsignedLongLongMask((PyObject *)io);
|
|
Py_DECREF(io);
|
|
if (PyErr_Occurred())
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
return val;
|
|
}
|
|
else
|
|
{
|
|
Py_DECREF(io);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
}
|
|
}
|
|
|
|
val = PyInt_AS_LONG(io);
|
|
Py_DECREF(io);
|
|
|
|
return val;
|
|
}
|
|
#endif
|
|
|
|
PyObject *
|
|
PyInt_FromString(char *s, char **pend, int base)
|
|
{
|
|
char *end;
|
|
long x;
|
|
Py_ssize_t slen;
|
|
PyObject *sobj, *srepr;
|
|
|
|
if ((base != 0 && base < 2) || base > 36) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"int() base must be >= 2 and <= 36");
|
|
return NULL;
|
|
}
|
|
|
|
while (*s && isspace(Py_CHARMASK(*s)))
|
|
s++;
|
|
errno = 0;
|
|
if (base == 0 && s[0] == '0') {
|
|
x = (long) PyOS_strtoul(s, &end, base);
|
|
if (x < 0)
|
|
return PyLong_FromString(s, pend, base);
|
|
}
|
|
else
|
|
x = PyOS_strtol(s, &end, base);
|
|
if (end == s || !isalnum(Py_CHARMASK(end[-1])))
|
|
goto bad;
|
|
while (*end && isspace(Py_CHARMASK(*end)))
|
|
end++;
|
|
if (*end != '\0') {
|
|
bad:
|
|
slen = strlen(s) < 200 ? strlen(s) : 200;
|
|
sobj = PyString_FromStringAndSize(s, slen);
|
|
if (sobj == NULL)
|
|
return NULL;
|
|
srepr = PyObject_ReprStr8(sobj);
|
|
Py_DECREF(sobj);
|
|
if (srepr == NULL)
|
|
return NULL;
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid literal for int() with base %d: %s",
|
|
base, PyString_AS_STRING(srepr));
|
|
Py_DECREF(srepr);
|
|
return NULL;
|
|
}
|
|
else if (errno != 0)
|
|
return PyLong_FromString(s, pend, base);
|
|
if (pend)
|
|
*pend = end;
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
PyObject *
|
|
PyInt_FromUnicode(Py_UNICODE *s, Py_ssize_t length, int base)
|
|
{
|
|
PyObject *result;
|
|
char *buffer = (char *)PyMem_MALLOC(length+1);
|
|
|
|
if (buffer == NULL)
|
|
return PyErr_NoMemory();
|
|
|
|
if (PyUnicode_EncodeDecimal(s, length, buffer, NULL)) {
|
|
PyMem_FREE(buffer);
|
|
return NULL;
|
|
}
|
|
result = PyInt_FromString(buffer, NULL, base);
|
|
PyMem_FREE(buffer);
|
|
return result;
|
|
}
|
|
|
|
/* Methods */
|
|
|
|
/* Integers are seen as the "smallest" of all numeric types and thus
|
|
don't have any knowledge about conversion of other types to
|
|
integers. */
|
|
|
|
#define CONVERT_TO_LONG(obj, lng) \
|
|
if (PyInt_Check(obj)) { \
|
|
lng = PyInt_AS_LONG(obj); \
|
|
} \
|
|
else { \
|
|
Py_INCREF(Py_NotImplemented); \
|
|
return Py_NotImplemented; \
|
|
}
|
|
|
|
/* ARGSUSED */
|
|
static int
|
|
int_print(PyIntObject *v, FILE *fp, int flags)
|
|
/* flags -- not used but required by interface */
|
|
{
|
|
fprintf(fp, "%ld", v->ob_ival);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
int_repr(PyIntObject *v)
|
|
{
|
|
return PyUnicode_FromFormat("%ld", v->ob_ival);
|
|
}
|
|
|
|
static int
|
|
int_compare(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long i = v->ob_ival;
|
|
register long j = w->ob_ival;
|
|
return (i < j) ? -1 : (i > j) ? 1 : 0;
|
|
}
|
|
|
|
static PyObject *
|
|
int_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
if (!PyInt_Check(self) || !PyInt_Check(other)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
return Py_CmpToRich(op, int_compare((PyIntObject *)self,
|
|
(PyIntObject *)other));
|
|
}
|
|
|
|
static long
|
|
int_hash(PyIntObject *v)
|
|
{
|
|
/* XXX If this is changed, you also need to change the way
|
|
Python's long, float and complex types are hashed. */
|
|
long x = v -> ob_ival;
|
|
if (x == -1)
|
|
x = -2;
|
|
return x;
|
|
}
|
|
|
|
static PyObject *
|
|
int_add(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long a, b, x;
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
x = a + b;
|
|
if ((x^a) >= 0 || (x^b) >= 0)
|
|
return PyInt_FromLong(x);
|
|
return PyLong_Type.tp_as_number->nb_add((PyObject *)v, (PyObject *)w);
|
|
}
|
|
|
|
static PyObject *
|
|
int_sub(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long a, b, x;
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
x = a - b;
|
|
if ((x^a) >= 0 || (x^~b) >= 0)
|
|
return PyInt_FromLong(x);
|
|
return PyLong_Type.tp_as_number->nb_subtract((PyObject *)v,
|
|
(PyObject *)w);
|
|
}
|
|
|
|
/*
|
|
Integer overflow checking for * is painful: Python tried a couple ways, but
|
|
they didn't work on all platforms, or failed in endcases (a product of
|
|
-sys.maxint-1 has been a particular pain).
|
|
|
|
Here's another way:
|
|
|
|
The native long product x*y is either exactly right or *way* off, being
|
|
just the last n bits of the true product, where n is the number of bits
|
|
in a long (the delivered product is the true product plus i*2**n for
|
|
some integer i).
|
|
|
|
The native double product (double)x * (double)y is subject to three
|
|
rounding errors: on a sizeof(long)==8 box, each cast to double can lose
|
|
info, and even on a sizeof(long)==4 box, the multiplication can lose info.
|
|
But, unlike the native long product, it's not in *range* trouble: even
|
|
if sizeof(long)==32 (256-bit longs), the product easily fits in the
|
|
dynamic range of a double. So the leading 50 (or so) bits of the double
|
|
product are correct.
|
|
|
|
We check these two ways against each other, and declare victory if they're
|
|
approximately the same. Else, because the native long product is the only
|
|
one that can lose catastrophic amounts of information, it's the native long
|
|
product that must have overflowed.
|
|
*/
|
|
|
|
static PyObject *
|
|
int_mul(PyObject *v, PyObject *w)
|
|
{
|
|
long a, b;
|
|
long longprod; /* a*b in native long arithmetic */
|
|
double doubled_longprod; /* (double)longprod */
|
|
double doubleprod; /* (double)a * (double)b */
|
|
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
longprod = a * b;
|
|
doubleprod = (double)a * (double)b;
|
|
doubled_longprod = (double)longprod;
|
|
|
|
/* Fast path for normal case: small multiplicands, and no info
|
|
is lost in either method. */
|
|
if (doubled_longprod == doubleprod)
|
|
return PyInt_FromLong(longprod);
|
|
|
|
/* Somebody somewhere lost info. Close enough, or way off? Note
|
|
that a != 0 and b != 0 (else doubled_longprod == doubleprod == 0).
|
|
The difference either is or isn't significant compared to the
|
|
true value (of which doubleprod is a good approximation).
|
|
*/
|
|
{
|
|
const double diff = doubled_longprod - doubleprod;
|
|
const double absdiff = diff >= 0.0 ? diff : -diff;
|
|
const double absprod = doubleprod >= 0.0 ? doubleprod :
|
|
-doubleprod;
|
|
/* absdiff/absprod <= 1/32 iff
|
|
32 * absdiff <= absprod -- 5 good bits is "close enough" */
|
|
if (32.0 * absdiff <= absprod)
|
|
return PyInt_FromLong(longprod);
|
|
else
|
|
return PyLong_Type.tp_as_number->nb_multiply(v, w);
|
|
}
|
|
}
|
|
|
|
/* Integer overflow checking for unary negation: on a 2's-complement
|
|
* box, -x overflows iff x is the most negative long. In this case we
|
|
* get -x == x. However, -x is undefined (by C) if x /is/ the most
|
|
* negative long (it's a signed overflow case), and some compilers care.
|
|
* So we cast x to unsigned long first. However, then other compilers
|
|
* warn about applying unary minus to an unsigned operand. Hence the
|
|
* weird "0-".
|
|
*/
|
|
#define UNARY_NEG_WOULD_OVERFLOW(x) \
|
|
((x) < 0 && (unsigned long)(x) == 0-(unsigned long)(x))
|
|
|
|
/* Return type of i_divmod */
|
|
enum divmod_result {
|
|
DIVMOD_OK, /* Correct result */
|
|
DIVMOD_OVERFLOW, /* Overflow, try again using longs */
|
|
DIVMOD_ERROR /* Exception raised */
|
|
};
|
|
|
|
static enum divmod_result
|
|
i_divmod(register long x, register long y,
|
|
long *p_xdivy, long *p_xmody)
|
|
{
|
|
long xdivy, xmody;
|
|
|
|
if (y == 0) {
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
"integer division or modulo by zero");
|
|
return DIVMOD_ERROR;
|
|
}
|
|
/* (-sys.maxint-1)/-1 is the only overflow case. */
|
|
if (y == -1 && UNARY_NEG_WOULD_OVERFLOW(x))
|
|
return DIVMOD_OVERFLOW;
|
|
xdivy = x / y;
|
|
xmody = x - xdivy * y;
|
|
/* If the signs of x and y differ, and the remainder is non-0,
|
|
* C89 doesn't define whether xdivy is now the floor or the
|
|
* ceiling of the infinitely precise quotient. We want the floor,
|
|
* and we have it iff the remainder's sign matches y's.
|
|
*/
|
|
if (xmody && ((y ^ xmody) < 0) /* i.e. and signs differ */) {
|
|
xmody += y;
|
|
--xdivy;
|
|
assert(xmody && ((y ^ xmody) >= 0));
|
|
}
|
|
*p_xdivy = xdivy;
|
|
*p_xmody = xmody;
|
|
return DIVMOD_OK;
|
|
}
|
|
|
|
static PyObject *
|
|
int_floor_div(PyIntObject *x, PyIntObject *y)
|
|
{
|
|
long xi, yi;
|
|
long d, m;
|
|
CONVERT_TO_LONG(x, xi);
|
|
CONVERT_TO_LONG(y, yi);
|
|
switch (i_divmod(xi, yi, &d, &m)) {
|
|
case DIVMOD_OK:
|
|
return PyInt_FromLong(d);
|
|
case DIVMOD_OVERFLOW:
|
|
return PyLong_Type.tp_as_number->nb_floor_divide((PyObject *)x,
|
|
(PyObject *)y);
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
int_true_divide(PyObject *v, PyObject *w)
|
|
{
|
|
/* If they aren't both ints, give someone else a chance. In
|
|
particular, this lets int/long get handled by longs, which
|
|
underflows to 0 gracefully if the long is too big to convert
|
|
to float. */
|
|
if (PyInt_Check(v) && PyInt_Check(w))
|
|
return PyFloat_Type.tp_as_number->nb_true_divide(v, w);
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
static PyObject *
|
|
int_mod(PyIntObject *x, PyIntObject *y)
|
|
{
|
|
long xi, yi;
|
|
long d, m;
|
|
CONVERT_TO_LONG(x, xi);
|
|
CONVERT_TO_LONG(y, yi);
|
|
switch (i_divmod(xi, yi, &d, &m)) {
|
|
case DIVMOD_OK:
|
|
return PyInt_FromLong(m);
|
|
case DIVMOD_OVERFLOW:
|
|
return PyLong_Type.tp_as_number->nb_remainder((PyObject *)x,
|
|
(PyObject *)y);
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
int_divmod(PyIntObject *x, PyIntObject *y)
|
|
{
|
|
long xi, yi;
|
|
long d, m;
|
|
CONVERT_TO_LONG(x, xi);
|
|
CONVERT_TO_LONG(y, yi);
|
|
switch (i_divmod(xi, yi, &d, &m)) {
|
|
case DIVMOD_OK:
|
|
return Py_BuildValue("(ll)", d, m);
|
|
case DIVMOD_OVERFLOW:
|
|
return PyLong_Type.tp_as_number->nb_divmod((PyObject *)x,
|
|
(PyObject *)y);
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
int_pow(PyIntObject *v, PyIntObject *w, PyIntObject *z)
|
|
{
|
|
register long iv, iw, iz=0, ix, temp, prev;
|
|
CONVERT_TO_LONG(v, iv);
|
|
CONVERT_TO_LONG(w, iw);
|
|
if (iw < 0) {
|
|
if ((PyObject *)z != Py_None) {
|
|
PyErr_SetString(PyExc_TypeError, "pow() 2nd argument "
|
|
"cannot be negative when 3rd argument specified");
|
|
return NULL;
|
|
}
|
|
/* Return a float. This works because we know that
|
|
this calls float_pow() which converts its
|
|
arguments to double. */
|
|
return PyFloat_Type.tp_as_number->nb_power(
|
|
(PyObject *)v, (PyObject *)w, (PyObject *)z);
|
|
}
|
|
if ((PyObject *)z != Py_None) {
|
|
CONVERT_TO_LONG(z, iz);
|
|
if (iz == 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"pow() 3rd argument cannot be 0");
|
|
return NULL;
|
|
}
|
|
}
|
|
/*
|
|
* XXX: The original exponentiation code stopped looping
|
|
* when temp hit zero; this code will continue onwards
|
|
* unnecessarily, but at least it won't cause any errors.
|
|
* Hopefully the speed improvement from the fast exponentiation
|
|
* will compensate for the slight inefficiency.
|
|
* XXX: Better handling of overflows is desperately needed.
|
|
*/
|
|
temp = iv;
|
|
ix = 1;
|
|
while (iw > 0) {
|
|
prev = ix; /* Save value for overflow check */
|
|
if (iw & 1) {
|
|
ix = ix*temp;
|
|
if (temp == 0)
|
|
break; /* Avoid ix / 0 */
|
|
if (ix / temp != prev) {
|
|
return PyLong_Type.tp_as_number->nb_power(
|
|
(PyObject *)v,
|
|
(PyObject *)w,
|
|
(PyObject *)z);
|
|
}
|
|
}
|
|
iw >>= 1; /* Shift exponent down by 1 bit */
|
|
if (iw==0) break;
|
|
prev = temp;
|
|
temp *= temp; /* Square the value of temp */
|
|
if (prev != 0 && temp / prev != prev) {
|
|
return PyLong_Type.tp_as_number->nb_power(
|
|
(PyObject *)v, (PyObject *)w, (PyObject *)z);
|
|
}
|
|
if (iz) {
|
|
/* If we did a multiplication, perform a modulo */
|
|
ix = ix % iz;
|
|
temp = temp % iz;
|
|
}
|
|
}
|
|
if (iz) {
|
|
long div, mod;
|
|
switch (i_divmod(ix, iz, &div, &mod)) {
|
|
case DIVMOD_OK:
|
|
ix = mod;
|
|
break;
|
|
case DIVMOD_OVERFLOW:
|
|
return PyLong_Type.tp_as_number->nb_power(
|
|
(PyObject *)v, (PyObject *)w, (PyObject *)z);
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
return PyInt_FromLong(ix);
|
|
}
|
|
|
|
static PyObject *
|
|
int_neg(PyIntObject *v)
|
|
{
|
|
register long a;
|
|
a = v->ob_ival;
|
|
/* check for overflow */
|
|
if (UNARY_NEG_WOULD_OVERFLOW(a)) {
|
|
PyObject *o = PyLong_FromLong(a);
|
|
if (o != NULL) {
|
|
PyObject *result = PyNumber_Negative(o);
|
|
Py_DECREF(o);
|
|
return result;
|
|
}
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong(-a);
|
|
}
|
|
|
|
static PyObject *
|
|
int_pos(PyIntObject *v)
|
|
{
|
|
if (PyInt_CheckExact(v)) {
|
|
Py_INCREF(v);
|
|
return (PyObject *)v;
|
|
}
|
|
else
|
|
return PyInt_FromLong(v->ob_ival);
|
|
}
|
|
|
|
static PyObject *
|
|
int_abs(PyIntObject *v)
|
|
{
|
|
if (v->ob_ival >= 0)
|
|
return int_pos(v);
|
|
else
|
|
return int_neg(v);
|
|
}
|
|
|
|
static int
|
|
int_bool(PyIntObject *v)
|
|
{
|
|
return v->ob_ival != 0;
|
|
}
|
|
|
|
static PyObject *
|
|
int_invert(PyIntObject *v)
|
|
{
|
|
return PyInt_FromLong(~v->ob_ival);
|
|
}
|
|
|
|
static PyObject *
|
|
int_lshift(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
long a, b, c;
|
|
PyObject *vv, *ww, *result;
|
|
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
if (b < 0) {
|
|
PyErr_SetString(PyExc_ValueError, "negative shift count");
|
|
return NULL;
|
|
}
|
|
if (a == 0 || b == 0)
|
|
return int_pos(v);
|
|
if (b >= LONG_BIT) {
|
|
vv = PyLong_FromLong(PyInt_AS_LONG(v));
|
|
if (vv == NULL)
|
|
return NULL;
|
|
ww = PyLong_FromLong(PyInt_AS_LONG(w));
|
|
if (ww == NULL) {
|
|
Py_DECREF(vv);
|
|
return NULL;
|
|
}
|
|
result = PyNumber_Lshift(vv, ww);
|
|
Py_DECREF(vv);
|
|
Py_DECREF(ww);
|
|
return result;
|
|
}
|
|
c = a << b;
|
|
if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) {
|
|
vv = PyLong_FromLong(PyInt_AS_LONG(v));
|
|
if (vv == NULL)
|
|
return NULL;
|
|
ww = PyLong_FromLong(PyInt_AS_LONG(w));
|
|
if (ww == NULL) {
|
|
Py_DECREF(vv);
|
|
return NULL;
|
|
}
|
|
result = PyNumber_Lshift(vv, ww);
|
|
Py_DECREF(vv);
|
|
Py_DECREF(ww);
|
|
return result;
|
|
}
|
|
return PyInt_FromLong(c);
|
|
}
|
|
|
|
static PyObject *
|
|
int_rshift(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long a, b;
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
if (b < 0) {
|
|
PyErr_SetString(PyExc_ValueError, "negative shift count");
|
|
return NULL;
|
|
}
|
|
if (a == 0 || b == 0)
|
|
return int_pos(v);
|
|
if (b >= LONG_BIT) {
|
|
if (a < 0)
|
|
a = -1;
|
|
else
|
|
a = 0;
|
|
}
|
|
else {
|
|
a = Py_ARITHMETIC_RIGHT_SHIFT(long, a, b);
|
|
}
|
|
return PyInt_FromLong(a);
|
|
}
|
|
|
|
static PyObject *
|
|
int_and(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long a, b;
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
return PyInt_FromLong(a & b);
|
|
}
|
|
|
|
static PyObject *
|
|
int_xor(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long a, b;
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
return PyInt_FromLong(a ^ b);
|
|
}
|
|
|
|
static PyObject *
|
|
int_or(PyIntObject *v, PyIntObject *w)
|
|
{
|
|
register long a, b;
|
|
CONVERT_TO_LONG(v, a);
|
|
CONVERT_TO_LONG(w, b);
|
|
return PyInt_FromLong(a | b);
|
|
}
|
|
|
|
static PyObject *
|
|
int_int(PyIntObject *v)
|
|
{
|
|
if (PyInt_CheckExact(v))
|
|
Py_INCREF(v);
|
|
else
|
|
v = (PyIntObject *)PyInt_FromLong(v->ob_ival);
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
static PyObject *
|
|
int_long(PyIntObject *v)
|
|
{
|
|
return PyLong_FromLong((v -> ob_ival));
|
|
}
|
|
|
|
static PyObject *
|
|
int_float(PyIntObject *v)
|
|
{
|
|
return PyFloat_FromDouble((double)(v -> ob_ival));
|
|
}
|
|
|
|
static PyObject *
|
|
int_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
static PyObject *
|
|
int_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *x = NULL;
|
|
int base = -909;
|
|
static char *kwlist[] = {"x", "base", 0};
|
|
|
|
if (type != &PyInt_Type)
|
|
return int_subtype_new(type, args, kwds); /* Wimp out */
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:int", kwlist,
|
|
&x, &base))
|
|
return NULL;
|
|
if (x == NULL)
|
|
return PyInt_FromLong(0L);
|
|
if (base == -909)
|
|
return PyNumber_Int(x);
|
|
if (PyString_Check(x)) {
|
|
/* Since PyInt_FromString doesn't have a length parameter,
|
|
* check here for possible NULs in the string. */
|
|
char *string = PyString_AS_STRING(x);
|
|
if (strlen(string) != PyString_Size(x)) {
|
|
/* create a repr() of the input string,
|
|
* just like PyInt_FromString does */
|
|
PyObject *srepr;
|
|
srepr = PyObject_ReprStr8(x);
|
|
if (srepr == NULL)
|
|
return NULL;
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid literal for int() with base %d: %s",
|
|
base, PyString_AS_STRING(srepr));
|
|
Py_DECREF(srepr);
|
|
return NULL;
|
|
}
|
|
return PyInt_FromString(string, NULL, base);
|
|
}
|
|
if (PyUnicode_Check(x))
|
|
return PyInt_FromUnicode(PyUnicode_AS_UNICODE(x),
|
|
PyUnicode_GET_SIZE(x),
|
|
base);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"int() can't convert non-string with explicit base");
|
|
return NULL;
|
|
}
|
|
|
|
/* Wimpy, slow approach to tp_new calls for subtypes of int:
|
|
first create a regular int from whatever arguments we got,
|
|
then allocate a subtype instance and initialize its ob_ival
|
|
from the regular int. The regular int is then thrown away.
|
|
*/
|
|
static PyObject *
|
|
int_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *tmp, *newobj;
|
|
long ival;
|
|
|
|
assert(PyType_IsSubtype(type, &PyInt_Type));
|
|
tmp = int_new(&PyInt_Type, args, kwds);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
if (!PyInt_Check(tmp)) {
|
|
ival = PyLong_AsLong(tmp);
|
|
if (ival == -1 && PyErr_Occurred()) {
|
|
Py_DECREF(tmp);
|
|
return NULL;
|
|
}
|
|
} else {
|
|
ival = ((PyIntObject *)tmp)->ob_ival;
|
|
}
|
|
|
|
newobj = type->tp_alloc(type, 0);
|
|
if (newobj == NULL) {
|
|
Py_DECREF(tmp);
|
|
return NULL;
|
|
}
|
|
((PyIntObject *)newobj)->ob_ival = ival;
|
|
Py_DECREF(tmp);
|
|
return newobj;
|
|
}
|
|
|
|
static PyObject *
|
|
int_getnewargs(PyIntObject *v)
|
|
{
|
|
return Py_BuildValue("(l)", v->ob_ival);
|
|
}
|
|
|
|
static PyMethodDef int_methods[] = {
|
|
{"__getnewargs__", (PyCFunction)int_getnewargs, METH_NOARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyDoc_STRVAR(int_doc,
|
|
"int(x[, base]) -> integer\n\
|
|
\n\
|
|
Convert a string or number to an integer, if possible. A floating point\n\
|
|
argument will be truncated towards zero (this does not include a string\n\
|
|
representation of a floating point number!) When converting a string, use\n\
|
|
the optional base. It is an error to supply a base when converting a\n\
|
|
non-string. If base is zero, the proper base is guessed based on the\n\
|
|
string content. If the argument is outside the integer range a\n\
|
|
long object will be returned instead.");
|
|
|
|
static PyNumberMethods int_as_number = {
|
|
(binaryfunc)int_add, /*nb_add*/
|
|
(binaryfunc)int_sub, /*nb_subtract*/
|
|
(binaryfunc)int_mul, /*nb_multiply*/
|
|
(binaryfunc)int_mod, /*nb_remainder*/
|
|
(binaryfunc)int_divmod, /*nb_divmod*/
|
|
(ternaryfunc)int_pow, /*nb_power*/
|
|
(unaryfunc)int_neg, /*nb_negative*/
|
|
(unaryfunc)int_pos, /*nb_positive*/
|
|
(unaryfunc)int_abs, /*nb_absolute*/
|
|
(inquiry)int_bool, /*nb_bool*/
|
|
(unaryfunc)int_invert, /*nb_invert*/
|
|
(binaryfunc)int_lshift, /*nb_lshift*/
|
|
(binaryfunc)int_rshift, /*nb_rshift*/
|
|
(binaryfunc)int_and, /*nb_and*/
|
|
(binaryfunc)int_xor, /*nb_xor*/
|
|
(binaryfunc)int_or, /*nb_or*/
|
|
0, /*nb_coerce*/
|
|
(unaryfunc)int_int, /*nb_int*/
|
|
(unaryfunc)int_long, /*nb_long*/
|
|
(unaryfunc)int_float, /*nb_float*/
|
|
0, /*nb_oct*/ /* not in use */
|
|
0, /*nb_hex*/ /* not in use */
|
|
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*/
|
|
(binaryfunc)int_floor_div, /* nb_floor_divide */
|
|
int_true_divide, /* nb_true_divide */
|
|
0, /* nb_inplace_floor_divide */
|
|
0, /* nb_inplace_true_divide */
|
|
(unaryfunc)int_int, /* nb_index */
|
|
};
|
|
|
|
PyTypeObject PyInt_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"int",
|
|
sizeof(PyIntObject),
|
|
0,
|
|
(destructor)int_dealloc, /* tp_dealloc */
|
|
(printfunc)int_print, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)int_repr, /* tp_repr */
|
|
&int_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)int_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
(reprfunc)int_repr, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
|
|
Py_TPFLAGS_INT_SUBCLASS, /* tp_flags */
|
|
int_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
int_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
int_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 */
|
|
int_new, /* tp_new */
|
|
(freefunc)int_free, /* tp_free */
|
|
};
|
|
|
|
int
|
|
_PyInt_Init(void)
|
|
{
|
|
PyIntObject *v;
|
|
int ival;
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) {
|
|
if (!free_list && (free_list = fill_free_list()) == NULL)
|
|
return 0;
|
|
/* PyObject_New is inlined */
|
|
v = free_list;
|
|
free_list = (PyIntObject *)v->ob_type;
|
|
PyObject_INIT(v, &PyInt_Type);
|
|
v->ob_ival = ival;
|
|
small_ints[ival + NSMALLNEGINTS] = v;
|
|
}
|
|
#endif
|
|
return 1;
|
|
}
|
|
|
|
void
|
|
PyInt_Fini(void)
|
|
{
|
|
PyIntObject *p;
|
|
PyIntBlock *list, *next;
|
|
int i;
|
|
unsigned int ctr;
|
|
int bc, bf; /* block count, number of freed blocks */
|
|
int irem, isum; /* remaining unfreed ints per block, total */
|
|
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
PyIntObject **q;
|
|
|
|
i = NSMALLNEGINTS + NSMALLPOSINTS;
|
|
q = small_ints;
|
|
while (--i >= 0) {
|
|
Py_XDECREF(*q);
|
|
*q++ = NULL;
|
|
}
|
|
#endif
|
|
bc = 0;
|
|
bf = 0;
|
|
isum = 0;
|
|
list = block_list;
|
|
block_list = NULL;
|
|
free_list = NULL;
|
|
while (list != NULL) {
|
|
bc++;
|
|
irem = 0;
|
|
for (ctr = 0, p = &list->objects[0];
|
|
ctr < N_INTOBJECTS;
|
|
ctr++, p++) {
|
|
if (PyInt_CheckExact(p) && p->ob_refcnt != 0)
|
|
irem++;
|
|
}
|
|
next = list->next;
|
|
if (irem) {
|
|
list->next = block_list;
|
|
block_list = list;
|
|
for (ctr = 0, p = &list->objects[0];
|
|
ctr < N_INTOBJECTS;
|
|
ctr++, p++) {
|
|
if (!PyInt_CheckExact(p) ||
|
|
p->ob_refcnt == 0) {
|
|
p->ob_type = (struct _typeobject *)
|
|
free_list;
|
|
free_list = p;
|
|
}
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
else if (-NSMALLNEGINTS <= p->ob_ival &&
|
|
p->ob_ival < NSMALLPOSINTS &&
|
|
small_ints[p->ob_ival +
|
|
NSMALLNEGINTS] == NULL) {
|
|
Py_INCREF(p);
|
|
small_ints[p->ob_ival +
|
|
NSMALLNEGINTS] = p;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
else {
|
|
PyMem_FREE(list);
|
|
bf++;
|
|
}
|
|
isum += irem;
|
|
list = next;
|
|
}
|
|
if (!Py_VerboseFlag)
|
|
return;
|
|
fprintf(stderr, "# cleanup ints");
|
|
if (!isum) {
|
|
fprintf(stderr, "\n");
|
|
}
|
|
else {
|
|
fprintf(stderr,
|
|
": %d unfreed int%s in %d out of %d block%s\n",
|
|
isum, isum == 1 ? "" : "s",
|
|
bc - bf, bc, bc == 1 ? "" : "s");
|
|
}
|
|
if (Py_VerboseFlag > 1) {
|
|
list = block_list;
|
|
while (list != NULL) {
|
|
for (ctr = 0, p = &list->objects[0];
|
|
ctr < N_INTOBJECTS;
|
|
ctr++, p++) {
|
|
if (PyInt_CheckExact(p) && p->ob_refcnt != 0)
|
|
/* XXX(twouters) cast refcount to
|
|
long until %zd is universally
|
|
available
|
|
*/
|
|
fprintf(stderr,
|
|
"# <int at %p, refcnt=%ld, val=%ld>\n",
|
|
p, (long)p->ob_refcnt,
|
|
p->ob_ival);
|
|
}
|
|
list = list->next;
|
|
}
|
|
}
|
|
}
|
|
#endif /* if 0 */
|