cpython-lru_cache-weakref: Python/mystrtoul.c annotate

annotate Python/mystrtoul.c @ 87690:66c1c9f32567 default tip

Add use_weakref option to functools.lru_cache The use_weakref option makes lru_cache create weak references to the function arguments when creating the cache key, which prevents them from staying in the memory forever even after all other references to them are gone. This is a proof of concept for http://bugs.python.org/issue19859

author	Radomir Dopieralski <devel@sheep.art.pl>
date	Tue, 03 Dec 2013 16:02:48 +0100
parents	3055e61f1e66
children

rev	line source
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	1
9656 ad497cb5d2dc Chris H. writes: Guido van Rossum <guido@python.org> parents: 8634 diff changeset	2 #include "Python.h"
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1449 diff changeset	3
8634 1171381fa01c Sigh. The hack to enable special treatment for errno on SGI machines Guido van Rossum <guido@python.org> parents: 7979 diff changeset	4 #if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
1171381fa01c Sigh. The hack to enable special treatment for errno on SGI machines Guido van Rossum <guido@python.org> parents: 7979 diff changeset	5 #define _SGI_MP_SOURCE
1171381fa01c Sigh. The hack to enable special treatment for errno on SGI machines Guido van Rossum <guido@python.org> parents: 7979 diff changeset	6 #endif
1171381fa01c Sigh. The hack to enable special treatment for errno on SGI machines Guido van Rossum <guido@python.org> parents: 7979 diff changeset	7
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1449 diff changeset	8 /* strtol and strtoul, renamed to avoid conflicts */
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1449 diff changeset	9
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	10
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	11 #include <ctype.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	12 #ifdef HAVE_ERRNO_H
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	13 #include <errno.h>
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	14 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	15
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	16 /* Static overflow check values for bases 2 through 36.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	17 * smallmax[base] is the largest unsigned long i such that
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	18 * i * base doesn't overflow unsigned long.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	19 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	20 static unsigned long smallmax[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	21 0, /* bases 0 and 1 are invalid */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	22 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	23 ULONG_MAX / 2,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	24 ULONG_MAX / 3,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	25 ULONG_MAX / 4,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	26 ULONG_MAX / 5,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	27 ULONG_MAX / 6,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	28 ULONG_MAX / 7,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	29 ULONG_MAX / 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	30 ULONG_MAX / 9,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	31 ULONG_MAX / 10,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	32 ULONG_MAX / 11,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	33 ULONG_MAX / 12,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	34 ULONG_MAX / 13,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	35 ULONG_MAX / 14,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	36 ULONG_MAX / 15,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	37 ULONG_MAX / 16,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	38 ULONG_MAX / 17,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	39 ULONG_MAX / 18,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	40 ULONG_MAX / 19,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	41 ULONG_MAX / 20,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	42 ULONG_MAX / 21,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	43 ULONG_MAX / 22,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	44 ULONG_MAX / 23,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	45 ULONG_MAX / 24,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	46 ULONG_MAX / 25,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	47 ULONG_MAX / 26,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	48 ULONG_MAX / 27,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	49 ULONG_MAX / 28,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	50 ULONG_MAX / 29,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	51 ULONG_MAX / 30,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	52 ULONG_MAX / 31,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	53 ULONG_MAX / 32,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	54 ULONG_MAX / 33,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	55 ULONG_MAX / 34,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	56 ULONG_MAX / 35,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	57 ULONG_MAX / 36,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	58 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	59
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	60 /* maximum digits that can't ever overflow for bases 2 through 36,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	61 * calculated by [int(math.floor(math.log(2**32, i))) for i in range(2, 37)].
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	62 * Note that this is pessimistic if sizeof(long) > 4.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	63 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	64 #if SIZEOF_LONG == 4
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	65 static int digitlimit[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	66 0, 0, 32, 20, 16, 13, 12, 11, 10, 10, /* 0 - 9 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	67 9, 9, 8, 8, 8, 8, 8, 7, 7, 7, /* 10 - 19 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	68 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, /* 20 - 29 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	69 6, 6, 6, 6, 6, 6, 6}; /* 30 - 36 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	70 #elif SIZEOF_LONG == 8
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	71 /* [int(math.floor(math.log(2*64, i))) for i in range(2, 37)] /
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	72 static int digitlimit[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	73 0, 0, 64, 40, 32, 27, 24, 22, 21, 20, /* 0 - 9 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	74 19, 18, 17, 17, 16, 16, 16, 15, 15, 15, /* 10 - 19 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	75 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, /* 20 - 29 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	76 13, 12, 12, 12, 12, 12, 12}; /* 30 - 36 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	77 #else
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	78 #error "Need table for SIZEOF_LONG"
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	79 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	80
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	81 /*
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	82 ** strtoul
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	83 ** This is a general purpose routine for converting
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	84 ** an ascii string to an integer in an arbitrary base.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	85 ** Leading white space is ignored. If 'base' is zero
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	86 ** it looks for a leading 0b, 0o or 0x to tell which
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	87 ** base. If these are absent it defaults to 10.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	88 ** Base must be 0 or between 2 and 36 (inclusive).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	89 ** If 'ptr' is non-NULL it will contain a pointer to
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	90 ** the end of the scan.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	91 ** Errors due to bad pointers will probably result in
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	92 ** exceptions - we don't check for them.
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	93 */
ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	94 unsigned long
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	95 PyOS_strtoul(const char str, char *ptr, int base)
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	96 {
85157 e7f6cef7a4cc Issue #18722: Remove uses of the "register" keyword in C code. Antoine Pitrou <solipsis@pitrou.net> parents: 82110 diff changeset	97 unsigned long result = 0; /* return value of the function */
e7f6cef7a4cc Issue #18722: Remove uses of the "register" keyword in C code. Antoine Pitrou <solipsis@pitrou.net> parents: 82110 diff changeset	98 int c; /* current input character */
e7f6cef7a4cc Issue #18722: Remove uses of the "register" keyword in C code. Antoine Pitrou <solipsis@pitrou.net> parents: 82110 diff changeset	99 int ovlimit; /* required digits to overflow */
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	100
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	101 /* skip leading white space */
82110 38830281d43b Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	102 while (str && Py_ISSPACE(Py_CHARMASK(str)))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	103 ++str;
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	104
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	105 /* check for leading 0b, 0o or 0x for auto-base or base 16 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	106 switch (base) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	107 case 0: /* look for leading 0b, 0o or 0x */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	108 if (*str == '0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	109 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	110 if (str == 'x' \|\| str == 'X') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	111 /* there must be at least one digit after 0x */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	112 if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 16) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	113 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	114 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	115 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	116 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	117 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	118 base = 16;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	119 } else if (str == 'o' \|\| str == 'O') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	120 /* there must be at least one digit after 0o */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	121 if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	122 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	123 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	124 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	125 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	126 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	127 base = 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	128 } else if (str == 'b' \|\| str == 'B') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	129 /* there must be at least one digit after 0b */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	130 if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	131 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	132 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	133 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	134 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	135 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	136 base = 2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	137 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	138 /* skip all zeroes... */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	139 while (*str == '0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	140 ++str;
82110 38830281d43b Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	141 while (Py_ISSPACE(Py_CHARMASK(*str)))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	142 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	143 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	144 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	145 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	146 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	147 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	148 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	149 base = 10;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	150 break;
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	151
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	152 /* even with explicit base, skip leading 0? prefix */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	153 case 16:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	154 if (*str == '0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	155 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	156 if (str == 'x' \|\| str == 'X') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	157 /* there must be at least one digit after 0x */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	158 if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 16) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	159 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	160 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	161 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	162 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	163 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	164 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	165 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	166 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	167 case 8:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	168 if (*str == '0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	169 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	170 if (str == 'o' \|\| str == 'O') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	171 /* there must be at least one digit after 0o */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	172 if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	173 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	174 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	175 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	176 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	177 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	178 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	179 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	180 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	181 case 2:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	182 if(*str == '0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	183 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	184 if (str == 'b' \|\| str == 'B') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	185 /* there must be at least one digit after 0b */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	186 if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	187 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	188 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	189 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	190 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	191 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	192 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	193 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	194 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	195 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	196
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	197 /* catch silly bases */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	198 if (base < 2 \|\| base > 36) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	199 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	200 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	201 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	202 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	203
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	204 /* skip leading zeroes */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	205 while (*str == '0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	206 ++str;
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	207
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	208 /* base is guaranteed to be in [2, 36] at this point */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	209 ovlimit = digitlimit[base];
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	210
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	211 /* do the conversion until non-digit character encountered */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	212 while ((c = _PyLong_DigitValue[Py_CHARMASK(*str)]) < base) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	213 if (ovlimit > 0) /* no overflow check required */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	214 result = result * base + c;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	215 else { /* requires overflow check */
85157 e7f6cef7a4cc Issue #18722: Remove uses of the "register" keyword in C code. Antoine Pitrou <solipsis@pitrou.net> parents: 82110 diff changeset	216 unsigned long temp_result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	217
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	218 if (ovlimit < 0) /* guaranteed overflow */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	219 goto overflowed;
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	220
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	221 /* there could be an overflow */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	222 /* check overflow just from shifting */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	223 if (result > smallmax[base])
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	224 goto overflowed;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	225
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	226 result *= base;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	227
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	228 /* check overflow from the digit's value */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	229 temp_result = result + c;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	230 if (temp_result < result)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	231 goto overflowed;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	232
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	233 result = temp_result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	234 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	235
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	236 ++str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	237 --ovlimit;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	238 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	239
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	240 /* set pointer to point to the last character scanned */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	241 if (ptr)
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	242 ptr = (char )str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	243
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	244 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	245
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	246 overflowed:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	247 if (ptr) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	248 /* spool through remaining digit characters */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	249 while (_PyLong_DigitValue[Py_CHARMASK(*str)] < base)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	250 ++str;
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	251 ptr = (char )str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	252 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	253 errno = ERANGE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	254 return (unsigned long)-1;
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	255 }
ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	256
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	257 /* Checking for overflow in PyOS_strtol is a PITA; see comments
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	258 * about PY_ABS_LONG_MIN in longobject.c.
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	259 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	260 #define PY_ABS_LONG_MIN (0-(unsigned long)LONG_MIN)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	261
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	262 long
86484 3055e61f1e66 Issue #1772673: The type of `char` arguments now changed to `const char`. Serhiy Storchaka <storchaka@gmail.com> parents: 85157 diff changeset	263 PyOS_strtol(const char str, char *ptr, int base)
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	264 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	265 long result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	266 unsigned long uresult;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	267 char sign;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	268
82110 38830281d43b Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	269 while (str && Py_ISSPACE(Py_CHARMASK(str)))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	270 str++;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	271
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	272 sign = *str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	273 if (sign == '+' \|\| sign == '-')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	274 str++;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	275
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	276 uresult = PyOS_strtoul(str, ptr, base);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 30968 diff changeset	277
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	278 if (uresult <= (unsigned long)LONG_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	279 result = (long)uresult;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	280 if (sign == '-')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	281 result = -result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	282 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	283 else if (sign == '-' && uresult == PY_ABS_LONG_MIN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	284 result = LONG_MIN;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	285 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	286 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	287 errno = ERANGE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	288 result = LONG_MAX;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	289 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 46161 diff changeset	290 return result;
1449 ae93ec4dd556 New files. Guido van Rossum <guido@python.org> parents: diff changeset	291 }

Mercurial > cpython-lru_cache-weakref

annotate Python/mystrtoul.c @ 87690:66c1c9f32567 default tip