Mercurial > cpython-lru_cache-weakref
annotate Objects/longobject.c @ 70817:dd775b1561ba
Fix markup.
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Tue, 14 Jun 2011 21:09:55 +0200 |
| parents | dc245d681901 |
| children | d14f717b5e3d d0b0fcbb40db |
| rev | line source |
|---|---|
| 230 | 1 /* Long (arbitrary precision) integer object implementation */ |
| 2 | |
| 242 | 3 /* XXX The functional organization of this file is terrible */ |
| 4 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
5 #include "Python.h" |
| 230 | 6 #include "longintrepr.h" |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
7 |
|
53290
41293fa6f0dd
Merged revisions 71772 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52741
diff
changeset
|
8 #include <float.h> |
|
1837
87364d9e3444
New patches by Andrew to fix various problems
Guido van Rossum <guido@python.org>
parents:
1391
diff
changeset
|
9 #include <ctype.h> |
|
51642
b8c4664a6539
Merged revisions 69634 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
51518
diff
changeset
|
10 #include <stddef.h> |
| 230 | 11 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
12 #ifndef NSMALLPOSINTS |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
13 #define NSMALLPOSINTS 257 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
14 #endif |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
15 #ifndef NSMALLNEGINTS |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
16 #define NSMALLNEGINTS 5 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
17 #endif |
|
48567
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
18 |
|
51643
79c2311f33cc
A few more type fixes for py3k that were missed in r69635
Mark Dickinson <dickinsm@gmail.com>
parents:
51642
diff
changeset
|
19 /* convert a PyLong of size 1, 0 or -1 to an sdigit */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
20 #define MEDIUM_VALUE(x) (Py_SIZE(x) < 0 ? -(sdigit)(x)->ob_digit[0] : \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
21 (Py_SIZE(x) == 0 ? (sdigit)0 : \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
22 (sdigit)(x)->ob_digit[0])) |
|
48567
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
23 #define ABS(x) ((x) < 0 ? -(x) : (x)) |
|
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
24 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
25 #if NSMALLNEGINTS + NSMALLPOSINTS > 0 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
26 /* Small integers are preallocated in this array so that they |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
27 can be shared. |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
28 The integers that are preallocated are those in the range |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
29 -NSMALLNEGINTS (inclusive) to NSMALLPOSINTS (not inclusive). |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
30 */ |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
31 static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS]; |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
32 #ifdef COUNT_ALLOCS |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
33 int quick_int_allocs, quick_neg_int_allocs; |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
34 #endif |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
35 |
|
42110
e4f649c4f457
Merged revisions 55962-56019 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
42084
diff
changeset
|
36 static PyObject * |
|
51643
79c2311f33cc
A few more type fixes for py3k that were missed in r69635
Mark Dickinson <dickinsm@gmail.com>
parents:
51642
diff
changeset
|
37 get_small_int(sdigit ival) |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
38 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
39 PyObject *v = (PyObject*)(small_ints + ival + NSMALLNEGINTS); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
40 Py_INCREF(v); |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
41 #ifdef COUNT_ALLOCS |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
42 if (ival >= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
43 quick_int_allocs++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
44 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
45 quick_neg_int_allocs++; |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
46 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
47 return v; |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
48 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
49 #define CHECK_SMALL_INT(ival) \ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
50 do if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
51 return get_small_int((sdigit)ival); \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
52 } while(0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
53 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
54 static PyLongObject * |
|
48567
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
55 maybe_small_long(PyLongObject *v) |
|
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
56 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
57 if (v && ABS(Py_SIZE(v)) <= 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
58 sdigit ival = MEDIUM_VALUE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
59 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
60 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
61 return (PyLongObject *)get_small_int(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
62 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
63 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
64 return v; |
|
48567
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
65 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
66 #else |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
67 #define CHECK_SMALL_INT(ival) |
|
48567
1ce7e5c5a761
Optimization to stop creating new small longs and use the
Facundo Batista <facundobatista@gmail.com>
parents:
48467
diff
changeset
|
68 #define maybe_small_long(val) (val) |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
69 #endif |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
70 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
71 /* If a freshly-allocated long is already shared, it must |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
72 be a small integer, so negating it must go to PyLong_FromLong */ |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
73 #define NEGATE(x) \ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
74 do if (Py_REFCNT(x) == 1) Py_SIZE(x) = -Py_SIZE(x); \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
75 else { PyObject* tmp=PyLong_FromLong(-MEDIUM_VALUE(x)); \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
76 Py_DECREF(x); (x) = (PyLongObject*)tmp; } \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
77 while(0) |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
78 /* For long multiplication, use the O(N**2) school algorithm unless |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
79 * both operands contain more than KARATSUBA_CUTOFF digits (this |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
80 * being an internal Python long digit, in base BASE). |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
81 */ |
|
33325
1768aff92864
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
29641
diff
changeset
|
82 #define KARATSUBA_CUTOFF 70 |
|
1768aff92864
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
29641
diff
changeset
|
83 #define KARATSUBA_SQUARE_CUTOFF (2 * KARATSUBA_CUTOFF) |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
84 |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
85 /* For exponentiation, use the binary left-to-right algorithm |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
86 * unless the exponent contains more than FIVEARY_CUTOFF digits. |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
87 * In that case, do 5 bits at a time. The potential drawback is that |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
88 * a table of 2**5 intermediate results is computed. |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
89 */ |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
90 #define FIVEARY_CUTOFF 8 |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
91 |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
92 #undef MIN |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
93 #undef MAX |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
94 #define MAX(x, y) ((x) < (y) ? (y) : (x)) |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
95 #define MIN(x, y) ((x) > (y) ? (y) : (x)) |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
96 |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
97 #define SIGCHECK(PyTryBlock) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
98 do { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
99 if (PyErr_CheckSignals()) PyTryBlock \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
100 } while(0) |
|
53290
41293fa6f0dd
Merged revisions 71772 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52741
diff
changeset
|
101 |
| 230 | 102 /* Normalize (remove leading zeros from) a long int object. |
| 103 Doesn't attempt to free the storage--in most cases, due to the nature | |
| 104 of the algorithms used, this could save at most be one word anyway. */ | |
| 105 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
106 static PyLongObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
107 long_normalize(register PyLongObject *v) |
| 230 | 108 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
109 Py_ssize_t j = ABS(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
110 Py_ssize_t i = j; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
111 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
112 while (i > 0 && v->ob_digit[i-1] == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
113 --i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
114 if (i != j) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
115 Py_SIZE(v) = (Py_SIZE(v) < 0) ? -(i) : i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
116 return v; |
| 230 | 117 } |
| 118 | |
| 119 /* Allocate a new long int object with size digits. | |
| 120 Return NULL and set exception if we run out of memory. */ | |
| 121 | |
|
51642
b8c4664a6539
Merged revisions 69634 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
51518
diff
changeset
|
122 #define MAX_LONG_DIGITS \ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
123 ((PY_SSIZE_T_MAX - offsetof(PyLongObject, ob_digit))/sizeof(digit)) |
|
51642
b8c4664a6539
Merged revisions 69634 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
51518
diff
changeset
|
124 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
125 PyLongObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
126 _PyLong_New(Py_ssize_t size) |
| 230 | 127 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
128 PyLongObject *result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
129 /* Number of bytes needed is: offsetof(PyLongObject, ob_digit) + |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
130 sizeof(digit)*size. Previous incarnations of this code used |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
131 sizeof(PyVarObject) instead of the offsetof, but this risks being |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
132 incorrect in the presence of padding between the PyVarObject header |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
133 and the digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
134 if (size > (Py_ssize_t)MAX_LONG_DIGITS) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
135 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
136 "too many digits in integer"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
137 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
138 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
139 result = PyObject_MALLOC(offsetof(PyLongObject, ob_digit) + |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
140 size*sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
141 if (!result) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
142 PyErr_NoMemory(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
143 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
144 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
145 return (PyLongObject*)PyObject_INIT_VAR(result, &PyLong_Type, size); |
| 230 | 146 } |
| 147 | |
|
19837
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
148 PyObject * |
|
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
149 _PyLong_Copy(PyLongObject *src) |
|
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
150 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
151 PyLongObject *result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
152 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
153 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
154 assert(src != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
155 i = Py_SIZE(src); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
156 if (i < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
157 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
158 if (i < 2) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
159 sdigit ival = src->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
160 if (Py_SIZE(src) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
161 ival = -ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
162 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
163 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
164 result = _PyLong_New(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
165 if (result != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
166 Py_SIZE(result) = Py_SIZE(src); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
167 while (--i >= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
168 result->ob_digit[i] = src->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
169 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
170 return (PyObject *)result; |
|
19837
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
171 } |
|
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
172 |
| 230 | 173 /* Create a new long int object from a C long int */ |
| 174 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
175 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
176 PyLong_FromLong(long ival) |
| 230 | 177 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
178 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
179 unsigned long abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
180 unsigned long t; /* unsigned so >> doesn't propagate sign bit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
181 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
182 int sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
183 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
184 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
185 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
186 if (ival < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
187 /* negate: can't write this as abs_ival = -ival since that |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
188 invokes undefined behaviour when ival is LONG_MIN */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
189 abs_ival = 0U-(unsigned long)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
190 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
191 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
192 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
193 abs_ival = (unsigned long)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
194 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
195 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
196 /* Fast path for single-digit ints */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
197 if (!(abs_ival >> PyLong_SHIFT)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
198 v = _PyLong_New(1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
199 if (v) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
200 Py_SIZE(v) = sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
201 v->ob_digit[0] = Py_SAFE_DOWNCAST( |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
202 abs_ival, unsigned long, digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
203 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
204 return (PyObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
205 } |
|
18114
31cd0db0f09f
PyLong_From{Unsigned,}Long: count the # of digits first, so no more space
Tim Peters <tim.peters@gmail.com>
parents:
18110
diff
changeset
|
206 |
|
53541
1a451ff6583c
Typo fix. Thanks Damien Diederen.
Mark Dickinson <dickinsm@gmail.com>
parents:
53290
diff
changeset
|
207 #if PyLong_SHIFT==15 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
208 /* 2 digits */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
209 if (!(abs_ival >> 2*PyLong_SHIFT)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
210 v = _PyLong_New(2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
211 if (v) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
212 Py_SIZE(v) = 2*sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
213 v->ob_digit[0] = Py_SAFE_DOWNCAST( |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
214 abs_ival & PyLong_MASK, unsigned long, digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
215 v->ob_digit[1] = Py_SAFE_DOWNCAST( |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
216 abs_ival >> PyLong_SHIFT, unsigned long, digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
217 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
218 return (PyObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
219 } |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
220 #endif |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
221 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
222 /* Larger numbers: loop to determine number of digits */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
223 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
224 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
225 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
226 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
227 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
228 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
229 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
230 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
231 Py_SIZE(v) = ndigits*sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
232 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
233 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
234 *p++ = Py_SAFE_DOWNCAST( |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
235 t & PyLong_MASK, unsigned long, digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
236 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
237 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
238 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
239 return (PyObject *)v; |
| 230 | 240 } |
| 241 | |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
242 /* Create a new long int object from a C unsigned long int */ |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
243 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
244 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
245 PyLong_FromUnsignedLong(unsigned long ival) |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
246 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
247 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
248 unsigned long t; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
249 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
250 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
251 if (ival < PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
252 return PyLong_FromLong(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
253 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
254 t = (unsigned long)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
255 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
256 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
257 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
258 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
259 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
260 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
261 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
262 Py_SIZE(v) = ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
263 while (ival) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
264 *p++ = (digit)(ival & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
265 ival >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
266 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
267 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
268 return (PyObject *)v; |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
269 } |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
270 |
|
254
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
271 /* Create a new long int object from a C double */ |
|
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
272 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
273 PyObject * |
|
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
274 PyLong_FromDouble(double dval) |
|
254
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
275 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
276 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
277 double frac; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
278 int i, ndig, expo, neg; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
279 neg = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
280 if (Py_IS_INFINITY(dval)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
281 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
282 "cannot convert float infinity to integer"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
283 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
284 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
285 if (Py_IS_NAN(dval)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
286 PyErr_SetString(PyExc_ValueError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
287 "cannot convert float NaN to integer"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
288 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
289 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
290 if (dval < 0.0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
291 neg = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
292 dval = -dval; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
293 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
294 frac = frexp(dval, &expo); /* dval = frac*2**expo; 0.0 <= frac < 1.0 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
295 if (expo <= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
296 return PyLong_FromLong(0L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
297 ndig = (expo-1) / PyLong_SHIFT + 1; /* Number of 'digits' in result */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
298 v = _PyLong_New(ndig); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
299 if (v == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
300 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
301 frac = ldexp(frac, (expo-1) % PyLong_SHIFT + 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
302 for (i = ndig; --i >= 0; ) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
303 digit bits = (digit)frac; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
304 v->ob_digit[i] = bits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
305 frac = frac - (double)bits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
306 frac = ldexp(frac, PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
307 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
308 if (neg) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
309 Py_SIZE(v) = -(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
310 return (PyObject *)v; |
|
254
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
311 } |
|
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
312 |
|
40450
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
313 /* Checking for overflow in PyLong_AsLong is a PITA since C doesn't define |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
314 * anything about what happens when a signed integer operation overflows, |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
315 * and some compilers think they're doing you a favor by being "clever" |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
316 * then. The bit pattern for the largest postive signed long is |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
317 * (unsigned long)LONG_MAX, and for the smallest negative signed long |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
318 * it is abs(LONG_MIN), which we could write -(unsigned long)LONG_MIN. |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
319 * However, some other compilers warn about applying unary minus to an |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
320 * unsigned operand. Hence the weird "0-". |
|
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
321 */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
322 #define PY_ABS_LONG_MIN (0-(unsigned long)LONG_MIN) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
323 #define PY_ABS_SSIZE_T_MIN (0-(size_t)PY_SSIZE_T_MIN) |
|
40450
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
324 |
| 230 | 325 /* Get a C long int from a long int object. |
| 326 Returns -1 and sets an error condition if overflow occurs. */ | |
| 327 | |
| 328 long | |
|
44158
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
329 PyLong_AsLongAndOverflow(PyObject *vv, int *overflow) |
| 230 | 330 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
331 /* This version by Tim Peters */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
332 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
333 unsigned long x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
334 long res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
335 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
336 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
337 int do_decref = 0; /* if nb_int was called */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
338 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
339 *overflow = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
340 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
341 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
342 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
343 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
344 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
345 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
346 PyNumberMethods *nb; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
347 nb = vv->ob_type->tp_as_number; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
348 if (nb == NULL || nb->nb_int == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
349 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
350 "an integer is required"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
351 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
352 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
353 vv = (*nb->nb_int) (vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
354 if (vv == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
355 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
356 do_decref = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
357 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
358 Py_DECREF(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
359 PyErr_SetString(PyExc_TypeError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
360 "nb_int should return int object"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
361 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
362 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
363 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
364 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
365 res = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
366 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
367 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
368 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
369 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
370 case -1: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
371 res = -(sdigit)v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
372 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
373 case 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
374 res = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
375 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
376 case 1: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
377 res = v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
378 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
379 default: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
380 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
381 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
382 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
383 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
384 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
385 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
386 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
387 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
388 x = (x << PyLong_SHIFT) | v->ob_digit[i]; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
389 if ((x >> PyLong_SHIFT) != prev) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
390 *overflow = sign; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
391 goto exit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
392 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
393 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
394 /* Haven't lost any bits, but casting to long requires extra |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
395 * care (see comment above). |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
396 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
397 if (x <= (unsigned long)LONG_MAX) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
398 res = (long)x * sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
399 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
400 else if (sign < 0 && x == PY_ABS_LONG_MIN) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
401 res = LONG_MIN; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
402 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
403 else { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
404 *overflow = sign; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
405 /* res is already set to -1 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
406 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
407 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
408 exit: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
409 if (do_decref) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
410 Py_DECREF(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
411 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
412 return res; |
| 230 | 413 } |
| 414 | |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
415 long |
|
44158
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
416 PyLong_AsLong(PyObject *obj) |
|
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
417 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
418 int overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
419 long result = PyLong_AsLongAndOverflow(obj, &overflow); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
420 if (overflow) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
421 /* XXX: could be cute and give a different |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
422 message for overflow == -1 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
423 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
424 "Python int too large to convert to C long"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
425 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
426 return result; |
|
44158
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
427 } |
|
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
428 |
|
39610
3674f20ac781
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
Thomas Wouters <thomas@python.org>
parents:
39574
diff
changeset
|
429 /* Get a Py_ssize_t from a long int object. |
|
3674f20ac781
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
Thomas Wouters <thomas@python.org>
parents:
39574
diff
changeset
|
430 Returns -1 and sets an error condition if overflow occurs. */ |
|
3674f20ac781
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
Thomas Wouters <thomas@python.org>
parents:
39574
diff
changeset
|
431 |
|
3674f20ac781
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
Thomas Wouters <thomas@python.org>
parents:
39574
diff
changeset
|
432 Py_ssize_t |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
433 PyLong_AsSsize_t(PyObject *vv) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
434 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
435 size_t x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
436 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
437 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
438 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
439 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
440 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
441 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
442 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
443 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
444 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
445 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
446 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
447 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
448 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
449 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
450 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
451 case -1: return -(sdigit)v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
452 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
453 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
454 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
455 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
456 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
457 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
458 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
459 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
460 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
461 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
462 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
463 x = (x << PyLong_SHIFT) | v->ob_digit[i]; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
464 if ((x >> PyLong_SHIFT) != prev) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
465 goto overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
466 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
467 /* Haven't lost any bits, but casting to a signed type requires |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
468 * extra care (see comment above). |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
469 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
470 if (x <= (size_t)PY_SSIZE_T_MAX) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
471 return (Py_ssize_t)x * sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
472 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
473 else if (sign < 0 && x == PY_ABS_SSIZE_T_MIN) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
474 return PY_SSIZE_T_MIN; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
475 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
476 /* else overflow */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
477 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
478 overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
479 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
480 "Python int too large to convert to C ssize_t"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
481 return -1; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
482 } |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
483 |
|
24777
696a284569e6
Fix comment for PyLong_AsUnsignedLong() to say that the return value
Guido van Rossum <guido@python.org>
parents:
24775
diff
changeset
|
484 /* Get a C unsigned long int from a long int object. |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
485 Returns -1 and sets an error condition if overflow occurs. */ |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
486 |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
487 unsigned long |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
488 PyLong_AsUnsignedLong(PyObject *vv) |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
489 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
490 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
491 unsigned long x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
492 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
493 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
494 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
495 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
496 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
497 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
498 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
499 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
500 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
501 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
502 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
503 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
504 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
505 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
506 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
507 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
508 "can't convert negative value to unsigned int"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
509 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
510 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
511 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
512 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
513 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
514 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
515 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
516 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
517 x = (x << PyLong_SHIFT) | v->ob_digit[i]; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
518 if ((x >> PyLong_SHIFT) != prev) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
519 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
520 "python int too large to convert " |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
521 "to C unsigned long"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
522 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
523 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
524 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
525 return x; |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
526 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
527 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
528 /* Get a C unsigned long int from a long int object. |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
529 Returns -1 and sets an error condition if overflow occurs. */ |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
530 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
531 size_t |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
532 PyLong_AsSize_t(PyObject *vv) |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
533 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
534 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
535 size_t x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
536 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
537 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
538 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
539 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
540 return (size_t) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
541 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
542 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
543 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
544 return (size_t)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
545 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
546 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
547 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
548 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
549 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
550 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
551 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
552 "can't convert negative value to size_t"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
553 return (size_t) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
554 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
555 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
556 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
557 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
558 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
559 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
560 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
561 x = (x << PyLong_SHIFT) | v->ob_digit[i]; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
562 if ((x >> PyLong_SHIFT) != prev) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
563 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
564 "Python int too large to convert to C size_t"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
565 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
566 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
567 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
568 return x; |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
569 } |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
570 |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
571 /* Get a C unsigned long int from a long int object, ignoring the high bits. |
|
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
572 Returns -1 and sets an error condition if an error occurs. */ |
|
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
573 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
574 static unsigned long |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
575 _PyLong_AsUnsignedLongMask(PyObject *vv) |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
576 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
577 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
578 unsigned long x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
579 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
580 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
581 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
582 if (vv == NULL || !PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
583 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
584 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
585 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
586 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
587 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
588 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
589 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
590 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
591 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
592 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
593 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
594 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
595 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
596 i = -i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
597 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
598 while (--i >= 0) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
599 x = (x << PyLong_SHIFT) | v->ob_digit[i]; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
600 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
601 return x * sign; |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
602 } |
|
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
603 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
604 unsigned long |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
605 PyLong_AsUnsignedLongMask(register PyObject *op) |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
606 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
607 PyNumberMethods *nb; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
608 PyLongObject *lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
609 unsigned long val; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
610 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
611 if (op && PyLong_Check(op)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
612 return _PyLong_AsUnsignedLongMask(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
613 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
614 if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
615 nb->nb_int == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
616 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
617 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
618 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
619 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
620 lo = (PyLongObject*) (*nb->nb_int) (op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
621 if (lo == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
622 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
623 if (PyLong_Check(lo)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
624 val = _PyLong_AsUnsignedLongMask((PyObject *)lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
625 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
626 if (PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
627 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
628 return val; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
629 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
630 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
631 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
632 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
633 PyErr_SetString(PyExc_TypeError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
634 "nb_int should return int object"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
635 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
636 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
637 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
638 |
|
27549
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
639 int |
|
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
640 _PyLong_Sign(PyObject *vv) |
|
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
641 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
642 PyLongObject *v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
643 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
644 assert(v != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
645 assert(PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
646 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
647 return Py_SIZE(v) == 0 ? 0 : (Py_SIZE(v) < 0 ? -1 : 1); |
|
27549
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
648 } |
|
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
649 |
|
27487
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
650 size_t |
|
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
651 _PyLong_NumBits(PyObject *vv) |
|
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
652 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
653 PyLongObject *v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
654 size_t result = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
655 Py_ssize_t ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
656 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
657 assert(v != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
658 assert(PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
659 ndigits = ABS(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
660 assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
661 if (ndigits > 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
662 digit msd = v->ob_digit[ndigits - 1]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
663 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
664 result = (ndigits - 1) * PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
665 if (result / PyLong_SHIFT != (size_t)(ndigits - 1)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
666 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
667 do { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
668 ++result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
669 if (result == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
670 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
671 msd >>= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
672 } while (msd); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
673 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
674 return result; |
|
27487
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
675 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
676 Overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
677 PyErr_SetString(PyExc_OverflowError, "int has too many bits " |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
678 "to express in a platform size_t"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
679 return (size_t)-1; |
|
27487
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
680 } |
|
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
681 |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
682 PyObject * |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
683 _PyLong_FromByteArray(const unsigned char* bytes, size_t n, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
684 int little_endian, int is_signed) |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
685 { |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
686 const unsigned char* pstartbyte; /* LSB of bytes */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
687 int incr; /* direction to move pstartbyte */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
688 const unsigned char* pendbyte; /* MSB of bytes */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
689 size_t numsignificantbytes; /* number of bytes that matter */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
690 Py_ssize_t ndigits; /* number of Python long digits */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
691 PyLongObject* v; /* result */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
692 Py_ssize_t idigit = 0; /* next free index in v->ob_digit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
693 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
694 if (n == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
695 return PyLong_FromLong(0L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
696 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
697 if (little_endian) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
698 pstartbyte = bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
699 pendbyte = bytes + n - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
700 incr = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
701 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
702 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
703 pstartbyte = bytes + n - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
704 pendbyte = bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
705 incr = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
706 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
707 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
708 if (is_signed) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
709 is_signed = *pendbyte >= 0x80; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
710 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
711 /* Compute numsignificantbytes. This consists of finding the most |
|
68585
bf94b6a73fc8
#11565: Fix several typos. Patch by Piotr Kasprzyk.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
68488
diff
changeset
|
712 significant byte. Leading 0 bytes are insignificant if the number |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
713 is positive, and leading 0xff bytes if negative. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
714 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
715 size_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
716 const unsigned char* p = pendbyte; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
717 const int pincr = -incr; /* search MSB to LSB */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
718 const unsigned char insignficant = is_signed ? 0xff : 0x00; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
719 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
720 for (i = 0; i < n; ++i, p += pincr) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
721 if (*p != insignficant) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
722 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
723 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
724 numsignificantbytes = n - i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
725 /* 2's-comp is a bit tricky here, e.g. 0xff00 == -0x0100, so |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
726 actually has 2 significant bytes. OTOH, 0xff0001 == |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
727 -0x00ffff, so we wouldn't *need* to bump it there; but we |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
728 do for 0xffff = -0x0001. To be safe without bothering to |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
729 check every case, bump it regardless. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
730 if (is_signed && numsignificantbytes < n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
731 ++numsignificantbytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
732 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
733 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
734 /* How many Python long digits do we need? We have |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
735 8*numsignificantbytes bits, and each Python long digit has |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
736 PyLong_SHIFT bits, so it's the ceiling of the quotient. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
737 /* catch overflow before it happens */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
738 if (numsignificantbytes > (PY_SSIZE_T_MAX - PyLong_SHIFT) / 8) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
739 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
740 "byte array too long to convert to int"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
741 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
742 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
743 ndigits = (numsignificantbytes * 8 + PyLong_SHIFT - 1) / PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
744 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
745 if (v == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
746 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
747 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
748 /* Copy the bits over. The tricky parts are computing 2's-comp on |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
749 the fly for signed numbers, and dealing with the mismatch between |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
750 8-bit bytes and (probably) 15-bit Python digits.*/ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
751 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
752 size_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
753 twodigits carry = 1; /* for 2's-comp calculation */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
754 twodigits accum = 0; /* sliding register */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
755 unsigned int accumbits = 0; /* number of bits in accum */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
756 const unsigned char* p = pstartbyte; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
757 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
758 for (i = 0; i < numsignificantbytes; ++i, p += incr) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
759 twodigits thisbyte = *p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
760 /* Compute correction for 2's comp, if needed. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
761 if (is_signed) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
762 thisbyte = (0xff ^ thisbyte) + carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
763 carry = thisbyte >> 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
764 thisbyte &= 0xff; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
765 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
766 /* Because we're going LSB to MSB, thisbyte is |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
767 more significant than what's already in accum, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
768 so needs to be prepended to accum. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
769 accum |= (twodigits)thisbyte << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
770 accumbits += 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
771 if (accumbits >= PyLong_SHIFT) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
772 /* There's enough to fill a Python digit. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
773 assert(idigit < ndigits); |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
774 v->ob_digit[idigit] = (digit)(accum & PyLong_MASK); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
775 ++idigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
776 accum >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
777 accumbits -= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
778 assert(accumbits < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
779 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
780 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
781 assert(accumbits < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
782 if (accumbits) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
783 assert(idigit < ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
784 v->ob_digit[idigit] = (digit)accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
785 ++idigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
786 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
787 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
788 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
789 Py_SIZE(v) = is_signed ? -idigit : idigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
790 return (PyObject *)long_normalize(v); |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
791 } |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
792 |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
793 int |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
794 _PyLong_AsByteArray(PyLongObject* v, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
795 unsigned char* bytes, size_t n, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
796 int little_endian, int is_signed) |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
797 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
798 Py_ssize_t i; /* index into v->ob_digit */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
799 Py_ssize_t ndigits; /* |v->ob_size| */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
800 twodigits accum; /* sliding register */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
801 unsigned int accumbits; /* # bits in accum */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
802 int do_twos_comp; /* store 2's-comp? is_signed and v < 0 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
803 digit carry; /* for computing 2's-comp */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
804 size_t j; /* # bytes filled */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
805 unsigned char* p; /* pointer to next byte in bytes */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
806 int pincr; /* direction to move p */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
807 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
808 assert(v != NULL && PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
809 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
810 if (Py_SIZE(v) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
811 ndigits = -(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
812 if (!is_signed) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
813 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
814 "can't convert negative int to unsigned"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
815 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
816 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
817 do_twos_comp = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
818 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
819 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
820 ndigits = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
821 do_twos_comp = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
822 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
823 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
824 if (little_endian) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
825 p = bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
826 pincr = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
827 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
828 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
829 p = bytes + n - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
830 pincr = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
831 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
832 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
833 /* Copy over all the Python digits. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
834 It's crucial that every Python digit except for the MSD contribute |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
835 exactly PyLong_SHIFT bits to the total, so first assert that the long is |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
836 normalized. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
837 assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
838 j = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
839 accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
840 accumbits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
841 carry = do_twos_comp ? 1 : 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
842 for (i = 0; i < ndigits; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
843 digit thisdigit = v->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
844 if (do_twos_comp) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
845 thisdigit = (thisdigit ^ PyLong_MASK) + carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
846 carry = thisdigit >> PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
847 thisdigit &= PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
848 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
849 /* Because we're going LSB to MSB, thisdigit is more |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
850 significant than what's already in accum, so needs to be |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
851 prepended to accum. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
852 accum |= (twodigits)thisdigit << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
853 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
854 /* The most-significant digit may be (probably is) at least |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
855 partly empty. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
856 if (i == ndigits - 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
857 /* Count # of sign bits -- they needn't be stored, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
858 * although for signed conversion we need later to |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
859 * make sure at least one sign bit gets stored. */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
860 digit s = do_twos_comp ? thisdigit ^ PyLong_MASK : thisdigit; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
861 while (s != 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
862 s >>= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
863 accumbits++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
864 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
865 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
866 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
867 accumbits += PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
868 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
869 /* Store as many bytes as possible. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
870 while (accumbits >= 8) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
871 if (j >= n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
872 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
873 ++j; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
874 *p = (unsigned char)(accum & 0xff); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
875 p += pincr; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
876 accumbits -= 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
877 accum >>= 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
878 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
879 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
880 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
881 /* Store the straggler (if any). */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
882 assert(accumbits < 8); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
883 assert(carry == 0); /* else do_twos_comp and *every* digit was 0 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
884 if (accumbits > 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
885 if (j >= n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
886 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
887 ++j; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
888 if (do_twos_comp) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
889 /* Fill leading bits of the byte with sign bits |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
890 (appropriately pretending that the long had an |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
891 infinite supply of sign bits). */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
892 accum |= (~(twodigits)0) << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
893 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
894 *p = (unsigned char)(accum & 0xff); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
895 p += pincr; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
896 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
897 else if (j == n && n > 0 && is_signed) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
898 /* The main loop filled the byte array exactly, so the code |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
899 just above didn't get to ensure there's a sign bit, and the |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
900 loop below wouldn't add one either. Make sure a sign bit |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
901 exists. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
902 unsigned char msb = *(p - pincr); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
903 int sign_bit_set = msb >= 0x80; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
904 assert(accumbits == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
905 if (sign_bit_set == do_twos_comp) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
906 return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
907 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
908 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
909 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
910 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
911 /* Fill remaining bytes with copies of the sign bit. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
912 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
913 unsigned char signbyte = do_twos_comp ? 0xffU : 0U; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
914 for ( ; j < n; ++j, p += pincr) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
915 *p = signbyte; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
916 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
917 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
918 return 0; |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
919 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
920 Overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
921 PyErr_SetString(PyExc_OverflowError, "int too big to convert"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
922 return -1; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
923 |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
924 } |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
925 |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
926 /* Create a new long (or int) object from a C pointer */ |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
927 |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
928 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
929 PyLong_FromVoidPtr(void *p) |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
930 { |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
931 #ifndef HAVE_LONG_LONG |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
932 # error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long" |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
933 #endif |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
934 #if SIZEOF_LONG_LONG < SIZEOF_VOID_P |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
935 # error "PyLong_FromVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)" |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
936 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
937 /* special-case null pointer */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
938 if (!p) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
939 return PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
940 return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p); |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
941 |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
942 } |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
943 |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
944 /* Get a C pointer from a long object (or an int object in some cases) */ |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
945 |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
946 void * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
947 PyLong_AsVoidPtr(PyObject *vv) |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
948 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
949 /* This function will allow int or long objects. If vv is neither, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
950 then the PyLong_AsLong*() functions will raise the exception: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
951 PyExc_SystemError, "bad argument to internal function" |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
952 */ |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
953 #if SIZEOF_VOID_P <= SIZEOF_LONG |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
954 long x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
955 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
956 if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
957 x = PyLong_AsLong(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
958 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
959 x = PyLong_AsUnsignedLong(vv); |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
960 #else |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
961 |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
962 #ifndef HAVE_LONG_LONG |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
963 # error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long" |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
964 #endif |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
965 #if SIZEOF_LONG_LONG < SIZEOF_VOID_P |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
966 # error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)" |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
967 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
968 PY_LONG_LONG x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
969 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
970 if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
971 x = PyLong_AsLongLong(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
972 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
973 x = PyLong_AsUnsignedLongLong(vv); |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
974 |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
975 #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
976 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
977 if (x == -1 && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
978 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
979 return (void *)x; |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
980 } |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
981 |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
982 #ifdef HAVE_LONG_LONG |
| 18093 | 983 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
984 /* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later |
| 18093 | 985 * rewritten to use the newer PyLong_{As,From}ByteArray API. |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
986 */ |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
987 |
|
18121
166b7b365851
Change IS_LITTLE_ENDIAN macro -- a little faster now.
Tim Peters <tim.peters@gmail.com>
parents:
18115
diff
changeset
|
988 #define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
989 #define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) |
| 18093 | 990 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
991 /* Create a new long int object from a C PY_LONG_LONG int. */ |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
992 |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
993 PyObject * |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
994 PyLong_FromLongLong(PY_LONG_LONG ival) |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
995 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
996 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
997 unsigned PY_LONG_LONG abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
998 unsigned PY_LONG_LONG t; /* unsigned so >> doesn't propagate sign bit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
999 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1000 int negative = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1001 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1002 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1003 if (ival < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1004 /* avoid signed overflow on negation; see comments |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1005 in PyLong_FromLong above. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1006 abs_ival = (unsigned PY_LONG_LONG)(-1-ival) + 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1007 negative = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1008 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1009 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1010 abs_ival = (unsigned PY_LONG_LONG)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1011 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1012 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1013 /* Count the number of Python digits. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1014 We used to pick 5 ("big enough for anything"), but that's a |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1015 waste of time and space given that 5*15 = 75 bits are rarely |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1016 needed. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1017 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1018 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1019 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1020 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1021 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1022 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1023 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1024 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1025 Py_SIZE(v) = negative ? -ndigits : ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1026 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1027 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1028 *p++ = (digit)(t & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1029 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1030 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1031 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1032 return (PyObject *)v; |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1033 } |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1034 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1035 /* Create a new long int object from a C unsigned PY_LONG_LONG int. */ |
| 18093 | 1036 |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1037 PyObject * |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1038 PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG ival) |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1039 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1040 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1041 unsigned PY_LONG_LONG t; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1042 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1043 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1044 if (ival < PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1045 return PyLong_FromLong((long)ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1046 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1047 t = (unsigned PY_LONG_LONG)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1048 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1049 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1050 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1051 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1052 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1053 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1054 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1055 Py_SIZE(v) = ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1056 while (ival) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1057 *p++ = (digit)(ival & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1058 ival >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1059 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1060 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1061 return (PyObject *)v; |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1062 } |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1063 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1064 /* Create a new long int object from a C Py_ssize_t. */ |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1065 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1066 PyObject * |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1067 PyLong_FromSsize_t(Py_ssize_t ival) |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1068 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1069 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1070 size_t abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1071 size_t t; /* unsigned so >> doesn't propagate sign bit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1072 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1073 int negative = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1074 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1075 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1076 if (ival < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1077 /* avoid signed overflow when ival = SIZE_T_MIN */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1078 abs_ival = (size_t)(-1-ival)+1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1079 negative = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1080 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1081 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1082 abs_ival = (size_t)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1083 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1084 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1085 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1086 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1087 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1088 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1089 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1090 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1091 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1092 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1093 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1094 Py_SIZE(v) = negative ? -ndigits : ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1095 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1096 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1097 *p++ = (digit)(t & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1098 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1099 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1100 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1101 return (PyObject *)v; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1102 } |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1103 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1104 /* Create a new long int object from a C size_t. */ |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1105 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1106 PyObject * |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1107 PyLong_FromSize_t(size_t ival) |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1108 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1109 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1110 size_t t; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1111 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1112 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1113 if (ival < PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1114 return PyLong_FromLong((long)ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1115 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1116 t = ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1117 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1118 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1119 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1120 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1121 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1122 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1123 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1124 Py_SIZE(v) = ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1125 while (ival) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1126 *p++ = (digit)(ival & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1127 ival >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1128 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1129 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1130 return (PyObject *)v; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1131 } |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1132 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1133 /* Get a C PY_LONG_LONG int from a long int object. |
| 18093 | 1134 Return -1 and set an error if overflow occurs. */ |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1135 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1136 PY_LONG_LONG |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
1137 PyLong_AsLongLong(PyObject *vv) |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1138 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1139 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1140 PY_LONG_LONG bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1141 int one = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1142 int res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1143 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1144 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1145 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1146 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1147 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1148 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1149 PyNumberMethods *nb; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1150 PyObject *io; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1151 if ((nb = vv->ob_type->tp_as_number) == NULL || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1152 nb->nb_int == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1153 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1154 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1155 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1156 io = (*nb->nb_int) (vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1157 if (io == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1158 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1159 if (PyLong_Check(io)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1160 bytes = PyLong_AsLongLong(io); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1161 Py_DECREF(io); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1162 return bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1163 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1164 Py_DECREF(io); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1165 PyErr_SetString(PyExc_TypeError, "integer conversion failed"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1166 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1167 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1168 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1169 v = (PyLongObject*)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1170 switch(Py_SIZE(v)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1171 case -1: return -(sdigit)v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1172 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1173 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1174 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1175 res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1176 SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1177 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1178 /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1179 if (res < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1180 return (PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1181 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1182 return bytes; |
| 18093 | 1183 } |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1184 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1185 /* Get a C unsigned PY_LONG_LONG int from a long int object. |
| 18093 | 1186 Return -1 and set an error if overflow occurs. */ |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1187 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1188 unsigned PY_LONG_LONG |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
1189 PyLong_AsUnsignedLongLong(PyObject *vv) |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1190 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1191 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1192 unsigned PY_LONG_LONG bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1193 int one = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1194 int res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1195 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1196 if (vv == NULL || !PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1197 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1198 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1199 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1200 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1201 v = (PyLongObject*)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1202 switch(Py_SIZE(v)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1203 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1204 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1205 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1206 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1207 res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1208 SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1209 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1210 /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1211 if (res < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1212 return (unsigned PY_LONG_LONG)res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1213 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1214 return bytes; |
| 18093 | 1215 } |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1216 |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1217 /* Get a C unsigned long int from a long int object, ignoring the high bits. |
|
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1218 Returns -1 and sets an error condition if an error occurs. */ |
|
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1219 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1220 static unsigned PY_LONG_LONG |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1221 _PyLong_AsUnsignedLongLongMask(PyObject *vv) |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1222 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1223 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1224 unsigned PY_LONG_LONG x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1225 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1226 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1227 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1228 if (vv == NULL || !PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1229 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1230 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1231 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1232 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1233 switch(Py_SIZE(v)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1234 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1235 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1236 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1237 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1238 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1239 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1240 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1241 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1242 i = -i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1243 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1244 while (--i >= 0) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1245 x = (x << PyLong_SHIFT) | v->ob_digit[i]; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1246 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1247 return x * sign; |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1248 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1249 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1250 unsigned PY_LONG_LONG |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1251 PyLong_AsUnsignedLongLongMask(register PyObject *op) |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1252 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1253 PyNumberMethods *nb; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1254 PyLongObject *lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1255 unsigned PY_LONG_LONG val; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1256 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1257 if (op && PyLong_Check(op)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1258 return _PyLong_AsUnsignedLongLongMask(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1259 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1260 if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1261 nb->nb_int == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1262 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1263 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1264 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1265 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1266 lo = (PyLongObject*) (*nb->nb_int) (op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1267 if (lo == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1268 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1269 if (PyLong_Check(lo)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1270 val = _PyLong_AsUnsignedLongLongMask((PyObject *)lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1271 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1272 if (PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1273 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1274 return val; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1275 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1276 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1277 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1278 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1279 PyErr_SetString(PyExc_TypeError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1280 "nb_int should return int object"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1281 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1282 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1283 } |
| 18093 | 1284 #undef IS_LITTLE_ENDIAN |
| 1285 | |
|
58582
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1286 /* Get a C long long int from a Python long or Python int object. |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1287 On overflow, returns -1 and sets *overflow to 1 or -1 depending |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1288 on the sign of the result. Otherwise *overflow is 0. |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1289 |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1290 For other errors (e.g., type error), returns -1 and sets an error |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1291 condition. |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1292 */ |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1293 |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1294 PY_LONG_LONG |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1295 PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow) |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1296 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1297 /* This version by Tim Peters */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1298 register PyLongObject *v; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1299 unsigned PY_LONG_LONG x, prev; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1300 PY_LONG_LONG res; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1301 Py_ssize_t i; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1302 int sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1303 int do_decref = 0; /* if nb_int was called */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1304 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1305 *overflow = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1306 if (vv == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1307 PyErr_BadInternalCall(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1308 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1309 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1310 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1311 if (!PyLong_Check(vv)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1312 PyNumberMethods *nb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1313 nb = vv->ob_type->tp_as_number; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1314 if (nb == NULL || nb->nb_int == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1315 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1316 "an integer is required"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1317 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1318 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1319 vv = (*nb->nb_int) (vv); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1320 if (vv == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1321 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1322 do_decref = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1323 if (!PyLong_Check(vv)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1324 Py_DECREF(vv); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1325 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1326 "nb_int should return int object"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1327 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1328 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1329 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1330 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1331 res = -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1332 v = (PyLongObject *)vv; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1333 i = Py_SIZE(v); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1334 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1335 switch (i) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1336 case -1: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1337 res = -(sdigit)v->ob_digit[0]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1338 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1339 case 0: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1340 res = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1341 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1342 case 1: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1343 res = v->ob_digit[0]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1344 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1345 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1346 sign = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1347 x = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1348 if (i < 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1349 sign = -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1350 i = -(i); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1351 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1352 while (--i >= 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1353 prev = x; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1354 x = (x << PyLong_SHIFT) + v->ob_digit[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1355 if ((x >> PyLong_SHIFT) != prev) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1356 *overflow = sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1357 goto exit; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1358 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1359 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1360 /* Haven't lost any bits, but casting to long requires extra |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1361 * care (see comment above). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1362 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1363 if (x <= (unsigned PY_LONG_LONG)PY_LLONG_MAX) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1364 res = (PY_LONG_LONG)x * sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1365 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1366 else if (sign < 0 && x == PY_ABS_LLONG_MIN) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1367 res = PY_LLONG_MIN; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1368 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1369 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1370 *overflow = sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1371 /* res is already set to -1 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1372 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1373 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1374 exit: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1375 if (do_decref) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1376 Py_DECREF(vv); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1377 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1378 return res; |
|
58582
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1379 } |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1380 |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1381 #endif /* HAVE_LONG_LONG */ |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1382 |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1383 #define CHECK_BINOP(v,w) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1384 do { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1385 if (!PyLong_Check(v) || !PyLong_Check(w)) { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1386 Py_INCREF(Py_NotImplemented); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1387 return Py_NotImplemented; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1388 } \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1389 } while(0) |
|
15725
8e402aeca0a3
Make long a new style number type. Sequence repeat is now done here
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
15318
diff
changeset
|
1390 |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1391 /* bits_in_digit(d) returns the unique integer k such that 2**(k-1) <= d < |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1392 2**k if d is nonzero, else 0. */ |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1393 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1394 static const unsigned char BitLengthTable[32] = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1395 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1396 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1397 }; |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1398 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1399 static int |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1400 bits_in_digit(digit d) |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1401 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1402 int d_bits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1403 while (d >= 32) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1404 d_bits += 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1405 d >>= 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1406 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1407 d_bits += (int)BitLengthTable[d]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1408 return d_bits; |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1409 } |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1410 |
|
24750
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1411 /* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n] |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1412 * is modified in place, by adding y to it. Carries are propagated as far as |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1413 * x[m-1], and the remaining carry (0 or 1) is returned. |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1414 */ |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1415 static digit |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1416 v_iadd(digit *x, Py_ssize_t m, digit *y, Py_ssize_t n) |
|
24750
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1417 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1418 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1419 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1420 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1421 assert(m >= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1422 for (i = 0; i < n; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1423 carry += x[i] + y[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1424 x[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1425 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1426 assert((carry & 1) == carry); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1427 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1428 for (; carry && i < m; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1429 carry += x[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1430 x[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1431 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1432 assert((carry & 1) == carry); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1433 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1434 return carry; |
|
24750
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1435 } |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1436 |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1437 /* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n] |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1438 * is modified in place, by subtracting y from it. Borrows are propagated as |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1439 * far as x[m-1], and the remaining borrow (0 or 1) is returned. |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1440 */ |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1441 static digit |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1442 v_isub(digit *x, Py_ssize_t m, digit *y, Py_ssize_t n) |
|
24750
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1443 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1444 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1445 digit borrow = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1446 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1447 assert(m >= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1448 for (i = 0; i < n; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1449 borrow = x[i] - y[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1450 x[i] = borrow & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1451 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1452 borrow &= 1; /* keep only 1 sign bit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1453 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1454 for (; borrow && i < m; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1455 borrow = x[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1456 x[i] = borrow & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1457 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1458 borrow &= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1459 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1460 return borrow; |
|
24750
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1461 } |
|
15725
8e402aeca0a3
Make long a new style number type. Sequence repeat is now done here
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
15318
diff
changeset
|
1462 |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1463 /* Shift digit vector a[0:m] d bits left, with 0 <= d < PyLong_SHIFT. Put |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1464 * result in z[0:m], and return the d bits shifted out of the top. |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1465 */ |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1466 static digit |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1467 v_lshift(digit *z, digit *a, Py_ssize_t m, int d) |
| 230 | 1468 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1469 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1470 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1471 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1472 assert(0 <= d && d < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1473 for (i=0; i < m; i++) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1474 twodigits acc = (twodigits)a[i] << d | carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1475 z[i] = (digit)acc & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1476 carry = (digit)(acc >> PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1477 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1478 return carry; |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1479 } |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1480 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1481 /* Shift digit vector a[0:m] d bits right, with 0 <= d < PyLong_SHIFT. Put |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1482 * result in z[0:m], and return the d bits shifted out of the bottom. |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1483 */ |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1484 static digit |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1485 v_rshift(digit *z, digit *a, Py_ssize_t m, int d) |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1486 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1487 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1488 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1489 digit mask = ((digit)1 << d) - 1U; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1490 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1491 assert(0 <= d && d < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1492 for (i=m; i-- > 0;) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1493 twodigits acc = (twodigits)carry << PyLong_SHIFT | a[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1494 carry = (digit)acc & mask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1495 z[i] = (digit)(acc >> d); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1496 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1497 return carry; |
| 230 | 1498 } |
| 1499 | |
|
18594
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1500 /* Divide long pin, w/ size digits, by non-zero digit n, storing quotient |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1501 in pout, and returning the remainder. pin and pout point at the LSD. |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1502 It's OK for pin == pout on entry, which saves oodles of mallocs/frees in |
|
42084
229c28cb9afb
Merged revisions 55817-55961 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41827
diff
changeset
|
1503 _PyLong_Format, but that should be done with great care since longs are |
|
18594
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1504 immutable. */ |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1505 |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1506 static digit |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1507 inplace_divrem1(digit *pout, digit *pin, Py_ssize_t size, digit n) |
|
18594
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1508 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1509 twodigits rem = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1510 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1511 assert(n > 0 && n <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1512 pin += size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1513 pout += size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1514 while (--size >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1515 digit hi; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1516 rem = (rem << PyLong_SHIFT) | *--pin; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1517 *--pout = hi = (digit)(rem / n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1518 rem -= (twodigits)hi * n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1519 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1520 return (digit)rem; |
|
18594
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1521 } |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1522 |
| 230 | 1523 /* Divide a long integer by a digit, returning both the quotient |
| 1524 (as function result) and the remainder (through *prem). | |
| 1525 The sign of a is ignored; n should not be zero. */ | |
| 1526 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
1527 static PyLongObject * |
|
18594
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1528 divrem1(PyLongObject *a, digit n, digit *prem) |
| 230 | 1529 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1530 const Py_ssize_t size = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1531 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1532 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1533 assert(n > 0 && n <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1534 z = _PyLong_New(size); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1535 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1536 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1537 *prem = inplace_divrem1(z->ob_digit, a->ob_digit, size, n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1538 return long_normalize(z); |
| 230 | 1539 } |
| 1540 | |
|
56017
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1541 /* Convert a long integer to a base 10 string. Returns a new non-shared |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1542 string. (Return value is non-shared so that callers can modify the |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1543 returned value if necessary.) */ |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1544 |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1545 static PyObject * |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1546 long_to_decimal_string(PyObject *aa) |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1547 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1548 PyLongObject *scratch, *a; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1549 PyObject *str; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1550 Py_ssize_t size, strlen, size_a, i, j; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1551 digit *pout, *pin, rem, tenpow; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1552 Py_UNICODE *p; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1553 int negative; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1554 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1555 a = (PyLongObject *)aa; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1556 if (a == NULL || !PyLong_Check(a)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1557 PyErr_BadInternalCall(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1558 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1559 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1560 size_a = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1561 negative = Py_SIZE(a) < 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1562 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1563 /* quick and dirty upper bound for the number of digits |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1564 required to express a in base _PyLong_DECIMAL_BASE: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1565 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1566 #digits = 1 + floor(log2(a) / log2(_PyLong_DECIMAL_BASE)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1567 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1568 But log2(a) < size_a * PyLong_SHIFT, and |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1569 log2(_PyLong_DECIMAL_BASE) = log2(10) * _PyLong_DECIMAL_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1570 > 3 * _PyLong_DECIMAL_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1571 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1572 if (size_a > PY_SSIZE_T_MAX / PyLong_SHIFT) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1573 PyErr_SetString(PyExc_OverflowError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1574 "long is too large to format"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1575 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1576 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1577 /* the expression size_a * PyLong_SHIFT is now safe from overflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1578 size = 1 + size_a * PyLong_SHIFT / (3 * _PyLong_DECIMAL_SHIFT); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1579 scratch = _PyLong_New(size); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1580 if (scratch == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1581 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1582 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1583 /* convert array of base _PyLong_BASE digits in pin to an array of |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1584 base _PyLong_DECIMAL_BASE digits in pout, following Knuth (TAOCP, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1585 Volume 2 (3rd edn), section 4.4, Method 1b). */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1586 pin = a->ob_digit; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1587 pout = scratch->ob_digit; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1588 size = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1589 for (i = size_a; --i >= 0; ) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1590 digit hi = pin[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1591 for (j = 0; j < size; j++) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1592 twodigits z = (twodigits)pout[j] << PyLong_SHIFT | hi; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1593 hi = (digit)(z / _PyLong_DECIMAL_BASE); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1594 pout[j] = (digit)(z - (twodigits)hi * |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1595 _PyLong_DECIMAL_BASE); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1596 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1597 while (hi) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1598 pout[size++] = hi % _PyLong_DECIMAL_BASE; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1599 hi /= _PyLong_DECIMAL_BASE; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1600 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1601 /* check for keyboard interrupt */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1602 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1603 Py_DECREF(scratch); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1604 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1605 }); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1606 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1607 /* pout should have at least one digit, so that the case when a = 0 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1608 works correctly */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1609 if (size == 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1610 pout[size++] = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1611 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1612 /* calculate exact length of output string, and allocate */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1613 strlen = negative + 1 + (size - 1) * _PyLong_DECIMAL_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1614 tenpow = 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1615 rem = pout[size-1]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1616 while (rem >= tenpow) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1617 tenpow *= 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1618 strlen++; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1619 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1620 str = PyUnicode_FromUnicode(NULL, strlen); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1621 if (str == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1622 Py_DECREF(scratch); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1623 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1624 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1625 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1626 /* fill the string right-to-left */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1627 p = PyUnicode_AS_UNICODE(str) + strlen; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1628 *p = '\0'; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1629 /* pout[0] through pout[size-2] contribute exactly |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1630 _PyLong_DECIMAL_SHIFT digits each */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1631 for (i=0; i < size - 1; i++) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1632 rem = pout[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1633 for (j = 0; j < _PyLong_DECIMAL_SHIFT; j++) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1634 *--p = '0' + rem % 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1635 rem /= 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1636 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1637 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1638 /* pout[size-1]: always produce at least one decimal digit */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1639 rem = pout[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1640 do { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1641 *--p = '0' + rem % 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1642 rem /= 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1643 } while (rem != 0); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1644 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1645 /* and sign */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1646 if (negative) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1647 *--p = '-'; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1648 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1649 /* check we've counted correctly */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1650 assert(p == PyUnicode_AS_UNICODE(str)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1651 Py_DECREF(scratch); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1652 return (PyObject *)str; |
|
56017
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1653 } |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1654 |
|
56074
37e96246bda1
Issue #6713 (continued): remove unused arbitrary-base conversion code
Mark Dickinson <dickinsm@gmail.com>
parents:
56048
diff
changeset
|
1655 /* Convert a long int object to a string, using a given conversion base, |
|
37e96246bda1
Issue #6713 (continued): remove unused arbitrary-base conversion code
Mark Dickinson <dickinsm@gmail.com>
parents:
56048
diff
changeset
|
1656 which should be one of 2, 8, 10 or 16. Return a string object. |
|
42084
229c28cb9afb
Merged revisions 55817-55961 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41827
diff
changeset
|
1657 If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'. */ |
|
229c28cb9afb
Merged revisions 55817-55961 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41827
diff
changeset
|
1658 |
|
229c28cb9afb
Merged revisions 55817-55961 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41827
diff
changeset
|
1659 PyObject * |
|
229c28cb9afb
Merged revisions 55817-55961 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41827
diff
changeset
|
1660 _PyLong_Format(PyObject *aa, int base) |
| 230 | 1661 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1662 register PyLongObject *a = (PyLongObject *)aa; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1663 PyObject *str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1664 Py_ssize_t i, sz; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1665 Py_ssize_t size_a; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1666 Py_UNICODE *p, sign = '\0'; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1667 int bits; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1668 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1669 assert(base == 2 || base == 8 || base == 10 || base == 16); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1670 if (base == 10) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1671 return long_to_decimal_string((PyObject *)a); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1672 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1673 if (a == NULL || !PyLong_Check(a)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1674 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1675 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1676 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1677 size_a = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1678 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1679 /* Compute a rough upper bound for the length of the string */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1680 switch (base) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1681 case 16: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1682 bits = 4; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1683 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1684 case 8: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1685 bits = 3; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1686 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1687 case 2: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1688 bits = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1689 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1690 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1691 assert(0); /* shouldn't ever get here */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1692 bits = 0; /* to silence gcc warning */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1693 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1694 /* compute length of output string: allow 2 characters for prefix and |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1695 1 for possible '-' sign. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1696 if (size_a > (PY_SSIZE_T_MAX - 3) / PyLong_SHIFT) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1697 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1698 "int is too large to format"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1699 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1700 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1701 /* now size_a * PyLong_SHIFT + 3 <= PY_SSIZE_T_MAX, so the RHS below |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1702 is safe from overflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1703 sz = 3 + (size_a * PyLong_SHIFT + (bits - 1)) / bits; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1704 assert(sz >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1705 str = PyUnicode_FromUnicode(NULL, sz); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1706 if (str == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1707 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1708 p = PyUnicode_AS_UNICODE(str) + sz; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1709 *p = '\0'; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1710 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1711 sign = '-'; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1712 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1713 if (Py_SIZE(a) == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1714 *--p = '0'; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1715 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1716 else { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1717 /* JRH: special case for power-of-2 bases */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1718 twodigits accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1719 int accumbits = 0; /* # of bits in accum */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1720 for (i = 0; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1721 accum |= (twodigits)a->ob_digit[i] << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1722 accumbits += PyLong_SHIFT; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1723 assert(accumbits >= bits); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1724 do { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1725 Py_UNICODE cdigit; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1726 cdigit = (Py_UNICODE)(accum & (base - 1)); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1727 cdigit += (cdigit < 10) ? '0' : 'a'-10; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1728 assert(p > PyUnicode_AS_UNICODE(str)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1729 *--p = cdigit; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1730 accumbits -= bits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1731 accum >>= bits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1732 } while (i < size_a-1 ? accumbits >= bits : accum > 0); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1733 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1734 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1735 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1736 if (base == 16) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1737 *--p = 'x'; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1738 else if (base == 8) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1739 *--p = 'o'; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1740 else /* (base == 2) */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1741 *--p = 'b'; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1742 *--p = '0'; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1743 if (sign) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1744 *--p = sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1745 if (p != PyUnicode_AS_UNICODE(str)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1746 Py_UNICODE *q = PyUnicode_AS_UNICODE(str); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1747 assert(p > q); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1748 do { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1749 } while ((*q++ = *p++) != '\0'); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1750 q--; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1751 if (PyUnicode_Resize(&str,(Py_ssize_t) (q - |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1752 PyUnicode_AS_UNICODE(str)))) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1753 Py_DECREF(str); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1754 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1755 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1756 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1757 return (PyObject *)str; |
| 230 | 1758 } |
| 1759 | |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1760 /* Table of digit values for 8-bit string -> integer conversion. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1761 * '0' maps to 0, ..., '9' maps to 9. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1762 * 'a' and 'A' map to 10, ..., 'z' and 'Z' map to 35. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1763 * All other indices map to 37. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1764 * Note that when converting a base B string, a char c is a legitimate |
|
42334
e70cdce0e8b2
Merged revisions 56467-56482 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
42110
diff
changeset
|
1765 * base B digit iff _PyLong_DigitValue[Py_CHARPyLong_MASK(c)] < B. |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1766 */ |
|
50656
c7c344b63ecc
Reduce the size of the _PyLong_DigitValue table.
Raymond Hettinger <python@rcn.com>
parents:
50241
diff
changeset
|
1767 unsigned char _PyLong_DigitValue[256] = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1768 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1769 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1770 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1771 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1772 37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1773 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1774 37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1775 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1776 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1777 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1778 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1779 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1780 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1781 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1782 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1783 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1784 }; |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1785 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1786 /* *str points to the first digit in a string of base `base` digits. base |
|
27587
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1787 * is a power of 2 (2, 4, 8, 16, or 32). *str is set to point to the first |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1788 * non-digit (which may be *str!). A normalized long is returned. |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1789 * The point to this routine is that it takes time linear in the number of |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1790 * string characters. |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1791 */ |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1792 static PyLongObject * |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1793 long_from_binary_base(char **str, int base) |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1794 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1795 char *p = *str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1796 char *start = p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1797 int bits_per_char; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1798 Py_ssize_t n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1799 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1800 twodigits accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1801 int bits_in_accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1802 digit *pdigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1803 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1804 assert(base >= 2 && base <= 32 && (base & (base - 1)) == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1805 n = base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1806 for (bits_per_char = -1; n; ++bits_per_char) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1807 n >>= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1808 /* n <- total # of bits needed, while setting p to end-of-string */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1809 while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1810 ++p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1811 *str = p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1812 /* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1813 n = (p - start) * bits_per_char + PyLong_SHIFT - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1814 if (n / bits_per_char < p - start) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1815 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1816 "int string too large to convert"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1817 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1818 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1819 n = n / PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1820 z = _PyLong_New(n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1821 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1822 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1823 /* Read string from right, and fill in long from left; i.e., |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1824 * from least to most significant in both. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1825 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1826 accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1827 bits_in_accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1828 pdigit = z->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1829 while (--p >= start) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1830 int k = (int)_PyLong_DigitValue[Py_CHARMASK(*p)]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1831 assert(k >= 0 && k < base); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1832 accum |= (twodigits)k << bits_in_accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1833 bits_in_accum += bits_per_char; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1834 if (bits_in_accum >= PyLong_SHIFT) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1835 *pdigit++ = (digit)(accum & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1836 assert(pdigit - z->ob_digit <= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1837 accum >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1838 bits_in_accum -= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1839 assert(bits_in_accum < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1840 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1841 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1842 if (bits_in_accum) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1843 assert(bits_in_accum <= PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1844 *pdigit++ = (digit)accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1845 assert(pdigit - z->ob_digit <= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1846 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1847 while (pdigit - z->ob_digit < n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1848 *pdigit++ = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1849 return long_normalize(z); |
|
27587
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1850 } |
|
7283140d4319
long(string, base) now takes time linear in len(string) when base is a
Tim Peters <tim.peters@gmail.com>
parents:
27585
diff
changeset
|
1851 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
1852 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
1853 PyLong_FromString(char *str, char **pend, int base) |
|
1837
87364d9e3444
New patches by Andrew to fix various problems
Guido van Rossum <guido@python.org>
parents:
1391
diff
changeset
|
1854 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1855 int sign = 1, error_if_nonzero = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1856 char *start, *orig_str = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1857 PyLongObject *z = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1858 PyObject *strobj; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1859 Py_ssize_t slen; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1860 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1861 if ((base != 0 && base < 2) || base > 36) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1862 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1863 "int() arg 2 must be >= 2 and <= 36"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1864 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1865 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1866 while (*str != '\0' && isspace(Py_CHARMASK(*str))) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1867 str++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1868 if (*str == '+') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1869 ++str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1870 else if (*str == '-') { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1871 ++str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1872 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1873 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1874 if (base == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1875 if (str[0] != '0') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1876 base = 10; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1877 else if (str[1] == 'x' || str[1] == 'X') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1878 base = 16; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1879 else if (str[1] == 'o' || str[1] == 'O') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1880 base = 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1881 else if (str[1] == 'b' || str[1] == 'B') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1882 base = 2; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1883 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1884 /* "old" (C-style) octal literal, now invalid. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1885 it might still be zero though */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1886 error_if_nonzero = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1887 base = 10; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1888 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1889 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1890 if (str[0] == '0' && |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1891 ((base == 16 && (str[1] == 'x' || str[1] == 'X')) || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1892 (base == 8 && (str[1] == 'o' || str[1] == 'O')) || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1893 (base == 2 && (str[1] == 'b' || str[1] == 'B')))) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1894 str += 2; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1895 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1896 start = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1897 if ((base & (base - 1)) == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1898 z = long_from_binary_base(&str, base); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1899 else { |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1900 /*** |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1901 Binary bases can be converted in time linear in the number of digits, because |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1902 Python's representation base is binary. Other bases (including decimal!) use |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1903 the simple quadratic-time algorithm below, complicated by some speed tricks. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1904 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1905 First some math: the largest integer that can be expressed in N base-B digits |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1906 is B**N-1. Consequently, if we have an N-digit input in base B, the worst- |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1907 case number of Python digits needed to hold it is the smallest integer n s.t. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1908 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1909 BASE**n-1 >= B**N-1 [or, adding 1 to both sides] |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1910 BASE**n >= B**N [taking logs to base BASE] |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1911 n >= log(B**N)/log(BASE) = N * log(B)/log(BASE) |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1912 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1913 The static array log_base_BASE[base] == log(base)/log(BASE) so we can compute |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1914 this quickly. A Python long with that much space is reserved near the start, |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1915 and the result is computed into it. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1916 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1917 The input string is actually treated as being in base base**i (i.e., i digits |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1918 are processed at a time), where two more static arrays hold: |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1919 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1920 convwidth_base[base] = the largest integer i such that base**i <= BASE |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1921 convmultmax_base[base] = base ** convwidth_base[base] |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1922 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1923 The first of these is the largest i such that i consecutive input digits |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1924 must fit in a single Python digit. The second is effectively the input |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1925 base we're really using. |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1926 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1927 Viewing the input as a sequence <c0, c1, ..., c_n-1> of digits in base |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1928 convmultmax_base[base], the result is "simply" |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1929 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1930 (((c0*B + c1)*B + c2)*B + c3)*B + ... ))) + c_n-1 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1931 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1932 where B = convmultmax_base[base]. |
|
38669
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1933 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1934 Error analysis: as above, the number of Python digits `n` needed is worst- |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1935 case |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1936 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1937 n >= N * log(B)/log(BASE) |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1938 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1939 where `N` is the number of input digits in base `B`. This is computed via |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1940 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1941 size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1; |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1942 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1943 below. Two numeric concerns are how much space this can waste, and whether |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1944 the computed result can be too small. To be concrete, assume BASE = 2**15, |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1945 which is the default (and it's unlikely anyone changes that). |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1946 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1947 Waste isn't a problem: provided the first input digit isn't 0, the difference |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1948 between the worst-case input with N digits and the smallest input with N |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1949 digits is about a factor of B, but B is small compared to BASE so at most |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1950 one allocated Python digit can remain unused on that count. If |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1951 N*log(B)/log(BASE) is mathematically an exact integer, then truncating that |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1952 and adding 1 returns a result 1 larger than necessary. However, that can't |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1953 happen: whenever B is a power of 2, long_from_binary_base() is called |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1954 instead, and it's impossible for B**i to be an integer power of 2**15 when |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1955 B is not a power of 2 (i.e., it's impossible for N*log(B)/log(BASE) to be |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1956 an exact integer when B is not a power of 2, since B**i has a prime factor |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1957 other than 2 in that case, but (2**15)**j's only prime factor is 2). |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1958 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1959 The computed result can be too small if the true value of N*log(B)/log(BASE) |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1960 is a little bit larger than an exact integer, but due to roundoff errors (in |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1961 computing log(B), log(BASE), their quotient, and/or multiplying that by N) |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1962 yields a numeric result a little less than that integer. Unfortunately, "how |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1963 close can a transcendental function get to an integer over some range?" |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1964 questions are generally theoretically intractable. Computer analysis via |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1965 continued fractions is practical: expand log(B)/log(BASE) via continued |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1966 fractions, giving a sequence i/j of "the best" rational approximations. Then |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1967 j*log(B)/log(BASE) is approximately equal to (the integer) i. This shows that |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1968 we can get very close to being in trouble, but very rarely. For example, |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1969 76573 is a denominator in one of the continued-fraction approximations to |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1970 log(10)/log(2**15), and indeed: |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1971 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1972 >>> log(10)/log(2**15)*76573 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1973 16958.000000654003 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1974 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1975 is very close to an integer. If we were working with IEEE single-precision, |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1976 rounding errors could kill us. Finding worst cases in IEEE double-precision |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1977 requires better-than-double-precision log() functions, and Tim didn't bother. |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1978 Instead the code checks to see whether the allocated space is enough as each |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1979 new Python digit is added, and copies the whole thing to a larger long if not. |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1980 This should happen extremely rarely, and in fact I don't have a test case |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1981 that triggers it(!). Instead the code was tested by artificially allocating |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1982 just 1 digit at the start, so that the copying code was exercised for every |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
1983 digit beyond the first. |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1984 ***/ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1985 register twodigits c; /* current input character */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1986 Py_ssize_t size_z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1987 int i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1988 int convwidth; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1989 twodigits convmultmax, convmult; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1990 digit *pz, *pzstop; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1991 char* scan; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1992 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1993 static double log_base_BASE[37] = {0.0e0,}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1994 static int convwidth_base[37] = {0,}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1995 static twodigits convmultmax_base[37] = {0,}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1996 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1997 if (log_base_BASE[base] == 0.0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1998 twodigits convmax = base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1999 int i = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2000 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2001 log_base_BASE[base] = (log((double)base) / |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2002 log((double)PyLong_BASE)); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2003 for (;;) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2004 twodigits next = convmax * base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2005 if (next > PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2006 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2007 convmax = next; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2008 ++i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2009 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2010 convmultmax_base[base] = convmax; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2011 assert(i > 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2012 convwidth_base[base] = i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2013 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2014 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2015 /* Find length of the string of numeric characters. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2016 scan = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2017 while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2018 ++scan; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2019 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2020 /* Create a long object that can contain the largest possible |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2021 * integer with this base and length. Note that there's no |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2022 * need to initialize z->ob_digit -- no slot is read up before |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2023 * being stored into. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2024 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2025 size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2026 /* Uncomment next line to test exceedingly rare copy code */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2027 /* size_z = 1; */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2028 assert(size_z > 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2029 z = _PyLong_New(size_z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2030 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2031 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2032 Py_SIZE(z) = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2033 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2034 /* `convwidth` consecutive input digits are treated as a single |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2035 * digit in base `convmultmax`. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2036 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2037 convwidth = convwidth_base[base]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2038 convmultmax = convmultmax_base[base]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2039 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2040 /* Work ;-) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2041 while (str < scan) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2042 /* grab up to convwidth digits from the input string */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2043 c = (digit)_PyLong_DigitValue[Py_CHARMASK(*str++)]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2044 for (i = 1; i < convwidth && str != scan; ++i, ++str) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2045 c = (twodigits)(c * base + |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2046 (int)_PyLong_DigitValue[Py_CHARMASK(*str)]); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2047 assert(c < PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2048 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2049 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2050 convmult = convmultmax; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2051 /* Calculate the shift only if we couldn't get |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2052 * convwidth digits. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2053 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2054 if (i != convwidth) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2055 convmult = base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2056 for ( ; i > 1; --i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2057 convmult *= base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2058 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2059 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2060 /* Multiply z by convmult, and add c. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2061 pz = z->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2062 pzstop = pz + Py_SIZE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2063 for (; pz < pzstop; ++pz) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2064 c += (twodigits)*pz * convmult; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2065 *pz = (digit)(c & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2066 c >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2067 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2068 /* carry off the current end? */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2069 if (c) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2070 assert(c < PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2071 if (Py_SIZE(z) < size_z) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2072 *pz = (digit)c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2073 ++Py_SIZE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2074 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2075 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2076 PyLongObject *tmp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2077 /* Extremely rare. Get more space. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2078 assert(Py_SIZE(z) == size_z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2079 tmp = _PyLong_New(size_z + 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2080 if (tmp == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2081 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2082 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2083 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2084 memcpy(tmp->ob_digit, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2085 z->ob_digit, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2086 sizeof(digit) * size_z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2087 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2088 z = tmp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2089 z->ob_digit[size_z] = (digit)c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2090 ++size_z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2091 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2092 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2093 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2094 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2095 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2096 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2097 if (error_if_nonzero) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2098 /* reset the base to 0, else the exception message |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2099 doesn't make too much sense */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2100 base = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2101 if (Py_SIZE(z) != 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2102 goto onError; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2103 /* there might still be other problems, therefore base |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2104 remains zero here for the same reason */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2105 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2106 if (str == start) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2107 goto onError; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2108 if (sign < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2109 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2110 while (*str && isspace(Py_CHARMASK(*str))) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2111 str++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2112 if (*str != '\0') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2113 goto onError; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2114 if (pend) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2115 *pend = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2116 long_normalize(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2117 return (PyObject *) maybe_small_long(z); |
|
12248
70154e2e9c89
Marc-Andre's third try at this bulk patch seems to work (except that
Guido van Rossum <guido@python.org>
parents:
11628
diff
changeset
|
2118 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2119 onError: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2120 Py_XDECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2121 slen = strlen(orig_str) < 200 ? strlen(orig_str) : 200; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2122 strobj = PyUnicode_FromStringAndSize(orig_str, slen); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2123 if (strobj == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2124 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2125 PyErr_Format(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2126 "invalid literal for int() with base %d: %R", |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2127 base, strobj); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2128 Py_DECREF(strobj); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2129 return NULL; |
|
12248
70154e2e9c89
Marc-Andre's third try at this bulk patch seems to work (except that
Guido van Rossum <guido@python.org>
parents:
11628
diff
changeset
|
2130 } |
|
70154e2e9c89
Marc-Andre's third try at this bulk patch seems to work (except that
Guido van Rossum <guido@python.org>
parents:
11628
diff
changeset
|
2131 |
|
70154e2e9c89
Marc-Andre's third try at this bulk patch seems to work (except that
Guido van Rossum <guido@python.org>
parents:
11628
diff
changeset
|
2132 PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
2133 PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base) |
|
12248
70154e2e9c89
Marc-Andre's third try at this bulk patch seems to work (except that
Guido van Rossum <guido@python.org>
parents:
11628
diff
changeset
|
2134 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2135 PyObject *result; |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2136 PyObject *asciidig; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2137 char *buffer, *end; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2138 Py_ssize_t i, buflen; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2139 Py_UNICODE *ptr; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2140 |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2141 asciidig = PyUnicode_TransformDecimalToASCII(u, length); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2142 if (asciidig == NULL) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2143 return NULL; |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2144 /* Replace non-ASCII whitespace with ' ' */ |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2145 ptr = PyUnicode_AS_UNICODE(asciidig); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2146 for (i = 0; i < length; i++) { |
|
66689
f82eea4781f1
Fix indentation in Objects/longobject.c
Mark Dickinson <dickinsm@gmail.com>
parents:
66673
diff
changeset
|
2147 Py_UNICODE ch = ptr[i]; |
|
f82eea4781f1
Fix indentation in Objects/longobject.c
Mark Dickinson <dickinsm@gmail.com>
parents:
66673
diff
changeset
|
2148 if (ch > 127 && Py_UNICODE_ISSPACE(ch)) |
|
f82eea4781f1
Fix indentation in Objects/longobject.c
Mark Dickinson <dickinsm@gmail.com>
parents:
66673
diff
changeset
|
2149 ptr[i] = ' '; |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2150 } |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2151 buffer = _PyUnicode_AsStringAndSize(asciidig, &buflen); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2152 if (buffer == NULL) { |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2153 Py_DECREF(asciidig); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2154 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2155 } |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2156 result = PyLong_FromString(buffer, &end, base); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2157 if (result != NULL && end != buffer + buflen) { |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2158 PyErr_SetString(PyExc_ValueError, |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2159 "null byte in argument for int()"); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2160 Py_DECREF(result); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2161 result = NULL; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2162 } |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2163 Py_DECREF(asciidig); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2164 return result; |
| 230 | 2165 } |
| 2166 | |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2167 /* forward */ |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2168 static PyLongObject *x_divrem |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2169 (PyLongObject *, PyLongObject *, PyLongObject **); |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
2170 static PyObject *long_long(PyObject *v); |
| 230 | 2171 |
| 2172 /* Long division with remainder, top-level routine */ | |
| 2173 | |
| 613 | 2174 static int |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2175 long_divrem(PyLongObject *a, PyLongObject *b, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2176 PyLongObject **pdiv, PyLongObject **prem) |
| 230 | 2177 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2178 Py_ssize_t size_a = ABS(Py_SIZE(a)), size_b = ABS(Py_SIZE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2179 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2180 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2181 if (size_b == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2182 PyErr_SetString(PyExc_ZeroDivisionError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2183 "integer division or modulo by zero"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2184 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2185 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2186 if (size_a < size_b || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2187 (size_a == size_b && |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2188 a->ob_digit[size_a-1] < b->ob_digit[size_b-1])) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2189 /* |a| < |b|. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2190 *pdiv = (PyLongObject*)PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2191 if (*pdiv == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2192 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2193 Py_INCREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2194 *prem = (PyLongObject *) a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2195 return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2196 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2197 if (size_b == 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2198 digit rem = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2199 z = divrem1(a, b->ob_digit[0], &rem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2200 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2201 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2202 *prem = (PyLongObject *) PyLong_FromLong((long)rem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2203 if (*prem == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2204 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2205 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2206 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2207 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2208 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2209 z = x_divrem(a, b, prem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2210 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2211 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2212 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2213 /* Set the signs. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2214 The quotient z has the sign of a*b; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2215 the remainder r has the sign of a, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2216 so a = b*z + r. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2217 if ((Py_SIZE(a) < 0) != (Py_SIZE(b) < 0)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2218 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2219 if (Py_SIZE(a) < 0 && Py_SIZE(*prem) != 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2220 NEGATE(*prem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2221 *pdiv = maybe_small_long(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2222 return 0; |
| 230 | 2223 } |
| 2224 | |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
2225 /* Unsigned long division with remainder -- the algorithm. The arguments v1 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
2226 and w1 should satisfy 2 <= ABS(Py_SIZE(w1)) <= ABS(Py_SIZE(v1)). */ |
| 230 | 2227 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2228 static PyLongObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2229 x_divrem(PyLongObject *v1, PyLongObject *w1, PyLongObject **prem) |
| 230 | 2230 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2231 PyLongObject *v, *w, *a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2232 Py_ssize_t i, k, size_v, size_w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2233 int d; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2234 digit wm1, wm2, carry, q, r, vtop, *v0, *vk, *w0, *ak; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2235 twodigits vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2236 sdigit zhi; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2237 stwodigits z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2238 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2239 /* We follow Knuth [The Art of Computer Programming, Vol. 2 (3rd |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2240 edn.), section 4.3.1, Algorithm D], except that we don't explicitly |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2241 handle the special case when the initial estimate q for a quotient |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2242 digit is >= PyLong_BASE: the max value for q is PyLong_BASE+1, and |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2243 that won't overflow a digit. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2244 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2245 /* allocate space; w will also be used to hold the final remainder */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2246 size_v = ABS(Py_SIZE(v1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2247 size_w = ABS(Py_SIZE(w1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2248 assert(size_v >= size_w && size_w >= 2); /* Assert checks by div() */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2249 v = _PyLong_New(size_v+1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2250 if (v == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2251 *prem = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2252 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2253 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2254 w = _PyLong_New(size_w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2255 if (w == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2256 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2257 *prem = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2258 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2259 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2260 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2261 /* normalize: shift w1 left so that its top digit is >= PyLong_BASE/2. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2262 shift v1 left by the same amount. Results go into w and v. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2263 d = PyLong_SHIFT - bits_in_digit(w1->ob_digit[size_w-1]); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2264 carry = v_lshift(w->ob_digit, w1->ob_digit, size_w, d); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2265 assert(carry == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2266 carry = v_lshift(v->ob_digit, v1->ob_digit, size_v, d); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2267 if (carry != 0 || v->ob_digit[size_v-1] >= w->ob_digit[size_w-1]) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2268 v->ob_digit[size_v] = carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2269 size_v++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2270 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2271 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2272 /* Now v->ob_digit[size_v-1] < w->ob_digit[size_w-1], so quotient has |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2273 at most (and usually exactly) k = size_v - size_w digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2274 k = size_v - size_w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2275 assert(k >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2276 a = _PyLong_New(k); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2277 if (a == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2278 Py_DECREF(w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2279 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2280 *prem = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2281 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2282 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2283 v0 = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2284 w0 = w->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2285 wm1 = w0[size_w-1]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2286 wm2 = w0[size_w-2]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2287 for (vk = v0+k, ak = a->ob_digit + k; vk-- > v0;) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2288 /* inner loop: divide vk[0:size_w+1] by w0[0:size_w], giving |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2289 single-digit quotient q, remainder in vk[0:size_w]. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2290 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2291 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2292 Py_DECREF(a); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2293 Py_DECREF(w); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2294 Py_DECREF(v); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2295 *prem = NULL; |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2296 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
2297 }); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2298 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2299 /* estimate quotient digit q; may overestimate by 1 (rare) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2300 vtop = vk[size_w]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2301 assert(vtop <= wm1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2302 vv = ((twodigits)vtop << PyLong_SHIFT) | vk[size_w-1]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2303 q = (digit)(vv / wm1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2304 r = (digit)(vv - (twodigits)wm1 * q); /* r = vv % wm1 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2305 while ((twodigits)wm2 * q > (((twodigits)r << PyLong_SHIFT) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2306 | vk[size_w-2])) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2307 --q; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2308 r += wm1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2309 if (r >= PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2310 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2311 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2312 assert(q <= PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2313 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2314 /* subtract q*w0[0:size_w] from vk[0:size_w+1] */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2315 zhi = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2316 for (i = 0; i < size_w; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2317 /* invariants: -PyLong_BASE <= -q <= zhi <= 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2318 -PyLong_BASE * q <= z < PyLong_BASE */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2319 z = (sdigit)vk[i] + zhi - |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2320 (stwodigits)q * (stwodigits)w0[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2321 vk[i] = (digit)z & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2322 zhi = (sdigit)Py_ARITHMETIC_RIGHT_SHIFT(stwodigits, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2323 z, PyLong_SHIFT); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2324 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2325 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2326 /* add w back if q was too large (this branch taken rarely) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2327 assert((sdigit)vtop + zhi == -1 || (sdigit)vtop + zhi == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2328 if ((sdigit)vtop + zhi < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2329 carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2330 for (i = 0; i < size_w; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2331 carry += vk[i] + w0[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2332 vk[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2333 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2334 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2335 --q; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2336 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2337 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2338 /* store quotient digit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2339 assert(q < PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2340 *--ak = q; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2341 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2342 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2343 /* unshift remainder; we reuse w to store the result */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2344 carry = v_rshift(w0, v0, size_w, d); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2345 assert(carry==0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2346 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2347 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2348 *prem = long_normalize(w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2349 return long_normalize(a); |
| 230 | 2350 } |
| 2351 | |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2352 /* For a nonzero PyLong a, express a in the form x * 2**e, with 0.5 <= |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2353 abs(x) < 1.0 and e >= 0; return x and put e in *e. Here x is |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2354 rounded to DBL_MANT_DIG significant bits using round-half-to-even. |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2355 If a == 0, return 0.0 and set *e = 0. If the resulting exponent |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2356 e is larger than PY_SSIZE_T_MAX, raise OverflowError and return |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2357 -1.0. */ |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2358 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2359 /* attempt to define 2.0**DBL_MANT_DIG as a compile-time constant */ |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2360 #if DBL_MANT_DIG == 53 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2361 #define EXP2_DBL_MANT_DIG 9007199254740992.0 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2362 #else |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2363 #define EXP2_DBL_MANT_DIG (ldexp(1.0, DBL_MANT_DIG)) |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2364 #endif |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2365 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2366 double |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2367 _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e) |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2368 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2369 Py_ssize_t a_size, a_bits, shift_digits, shift_bits, x_size; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2370 /* See below for why x_digits is always large enough. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2371 digit rem, x_digits[2 + (DBL_MANT_DIG + 1) / PyLong_SHIFT]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2372 double dx; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2373 /* Correction term for round-half-to-even rounding. For a digit x, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2374 "x + half_even_correction[x & 7]" gives x rounded to the nearest |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2375 multiple of 4, rounding ties to a multiple of 8. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2376 static const int half_even_correction[8] = {0, -1, -2, 1, 0, -1, 2, 1}; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2377 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2378 a_size = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2379 if (a_size == 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2380 /* Special case for 0: significand 0.0, exponent 0. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2381 *e = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2382 return 0.0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2383 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2384 a_bits = bits_in_digit(a->ob_digit[a_size-1]); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2385 /* The following is an overflow-free version of the check |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2386 "if ((a_size - 1) * PyLong_SHIFT + a_bits > PY_SSIZE_T_MAX) ..." */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2387 if (a_size >= (PY_SSIZE_T_MAX - 1) / PyLong_SHIFT + 1 && |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2388 (a_size > (PY_SSIZE_T_MAX - 1) / PyLong_SHIFT + 1 || |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2389 a_bits > (PY_SSIZE_T_MAX - 1) % PyLong_SHIFT + 1)) |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2390 goto overflow; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2391 a_bits = (a_size - 1) * PyLong_SHIFT + a_bits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2392 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2393 /* Shift the first DBL_MANT_DIG + 2 bits of a into x_digits[0:x_size] |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2394 (shifting left if a_bits <= DBL_MANT_DIG + 2). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2395 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2396 Number of digits needed for result: write // for floor division. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2397 Then if shifting left, we end up using |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2398 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2399 1 + a_size + (DBL_MANT_DIG + 2 - a_bits) // PyLong_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2400 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2401 digits. If shifting right, we use |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2402 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2403 a_size - (a_bits - DBL_MANT_DIG - 2) // PyLong_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2404 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2405 digits. Using a_size = 1 + (a_bits - 1) // PyLong_SHIFT along with |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2406 the inequalities |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2407 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2408 m // PyLong_SHIFT + n // PyLong_SHIFT <= (m + n) // PyLong_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2409 m // PyLong_SHIFT - n // PyLong_SHIFT <= |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2410 1 + (m - n - 1) // PyLong_SHIFT, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2411 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2412 valid for any integers m and n, we find that x_size satisfies |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2413 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2414 x_size <= 2 + (DBL_MANT_DIG + 1) // PyLong_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2415 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2416 in both cases. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2417 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2418 if (a_bits <= DBL_MANT_DIG + 2) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2419 shift_digits = (DBL_MANT_DIG + 2 - a_bits) / PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2420 shift_bits = (DBL_MANT_DIG + 2 - a_bits) % PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2421 x_size = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2422 while (x_size < shift_digits) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2423 x_digits[x_size++] = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2424 rem = v_lshift(x_digits + x_size, a->ob_digit, a_size, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2425 (int)shift_bits); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2426 x_size += a_size; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2427 x_digits[x_size++] = rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2428 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2429 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2430 shift_digits = (a_bits - DBL_MANT_DIG - 2) / PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2431 shift_bits = (a_bits - DBL_MANT_DIG - 2) % PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2432 rem = v_rshift(x_digits, a->ob_digit + shift_digits, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2433 a_size - shift_digits, (int)shift_bits); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2434 x_size = a_size - shift_digits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2435 /* For correct rounding below, we need the least significant |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2436 bit of x to be 'sticky' for this shift: if any of the bits |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2437 shifted out was nonzero, we set the least significant bit |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2438 of x. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2439 if (rem) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2440 x_digits[0] |= 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2441 else |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2442 while (shift_digits > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2443 if (a->ob_digit[--shift_digits]) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2444 x_digits[0] |= 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2445 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2446 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2447 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2448 assert(1 <= x_size && |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2449 x_size <= (Py_ssize_t)(sizeof(x_digits)/sizeof(digit))); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2450 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2451 /* Round, and convert to double. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2452 x_digits[0] += half_even_correction[x_digits[0] & 7]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2453 dx = x_digits[--x_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2454 while (x_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2455 dx = dx * PyLong_BASE + x_digits[--x_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2456 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2457 /* Rescale; make correction if result is 1.0. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2458 dx /= 4.0 * EXP2_DBL_MANT_DIG; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2459 if (dx == 1.0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2460 if (a_bits == PY_SSIZE_T_MAX) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2461 goto overflow; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2462 dx = 0.5; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2463 a_bits += 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2464 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2465 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2466 *e = a_bits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2467 return Py_SIZE(a) < 0 ? -dx : dx; |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2468 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2469 overflow: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2470 /* exponent > PY_SSIZE_T_MAX */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2471 PyErr_SetString(PyExc_OverflowError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2472 "huge integer: number of bits overflows a Py_ssize_t"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2473 *e = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2474 return -1.0; |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2475 } |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2476 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2477 /* Get a C double from a long int object. Rounds to the nearest double, |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2478 using the round-half-to-even rule in the case of a tie. */ |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2479 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2480 double |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2481 PyLong_AsDouble(PyObject *v) |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2482 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2483 Py_ssize_t exponent; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2484 double x; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2485 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2486 if (v == NULL || !PyLong_Check(v)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2487 PyErr_BadInternalCall(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2488 return -1.0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2489 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2490 x = _PyLong_Frexp((PyLongObject *)v, &exponent); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2491 if ((x == -1.0 && PyErr_Occurred()) || exponent > DBL_MAX_EXP) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2492 PyErr_SetString(PyExc_OverflowError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2493 "long int too large to convert to float"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2494 return -1.0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2495 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2496 return ldexp(x, (int)exponent); |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2497 } |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2498 |
| 230 | 2499 /* Methods */ |
| 2500 | |
| 2501 static void | |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2502 long_dealloc(PyObject *v) |
| 230 | 2503 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2504 Py_TYPE(v)->tp_free(v); |
| 230 | 2505 } |
| 2506 | |
| 2507 static int | |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2508 long_compare(PyLongObject *a, PyLongObject *b) |
| 230 | 2509 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2510 Py_ssize_t sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2511 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2512 if (Py_SIZE(a) != Py_SIZE(b)) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2513 sign = Py_SIZE(a) - Py_SIZE(b); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2514 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2515 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2516 Py_ssize_t i = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2517 while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i]) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2518 ; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2519 if (i < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2520 sign = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2521 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2522 sign = (sdigit)a->ob_digit[i] - (sdigit)b->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2523 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2524 sign = -sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2525 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2526 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2527 return sign < 0 ? -1 : sign > 0 ? 1 : 0; |
| 230 | 2528 } |
| 2529 | |
|
50241
45bea584694e
Issue #3106: Speedup some comparisons. This also removes the last call
Antoine Pitrou <solipsis@pitrou.net>
parents:
50207
diff
changeset
|
2530 #define TEST_COND(cond) \ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2531 ((cond) ? Py_True : Py_False) |
|
50241
45bea584694e
Issue #3106: Speedup some comparisons. This also removes the last call
Antoine Pitrou <solipsis@pitrou.net>
parents:
50207
diff
changeset
|
2532 |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2533 static PyObject * |
|
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2534 long_richcompare(PyObject *self, PyObject *other, int op) |
|
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2535 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2536 int result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2537 PyObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2538 CHECK_BINOP(self, other); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2539 if (self == other) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2540 result = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2541 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2542 result = long_compare((PyLongObject*)self, (PyLongObject*)other); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2543 /* Convert the return value to a Boolean */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2544 switch (op) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2545 case Py_EQ: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2546 v = TEST_COND(result == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2547 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2548 case Py_NE: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2549 v = TEST_COND(result != 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2550 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2551 case Py_LE: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2552 v = TEST_COND(result <= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2553 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2554 case Py_GE: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2555 v = TEST_COND(result >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2556 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2557 case Py_LT: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2558 v = TEST_COND(result == -1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2559 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2560 case Py_GT: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2561 v = TEST_COND(result == 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2562 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2563 default: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2564 PyErr_BadArgument(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2565 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2566 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2567 Py_INCREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2568 return v; |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2569 } |
|
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2570 |
|
65494
e8969fb822fc
make hashes always the size of pointers; introduce Py_hash_t #9778
Benjamin Peterson <benjamin@python.org>
parents:
62154
diff
changeset
|
2571 static Py_hash_t |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2572 long_hash(PyLongObject *v) |
|
1257
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2573 { |
|
65603
be8ae6b17539
follow up to #9778: define and use an unsigned hash type
Benjamin Peterson <benjamin@python.org>
parents:
65494
diff
changeset
|
2574 Py_uhash_t x; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2575 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2576 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2577 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2578 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2579 switch(i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2580 case -1: return v->ob_digit[0]==1 ? -2 : -(sdigit)v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2581 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2582 case 1: return v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2583 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2584 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2585 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2586 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2587 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2588 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2589 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2590 while (--i >= 0) { |
|
61873
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2591 /* Here x is a quantity in the range [0, _PyHASH_MODULUS); we |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2592 want to compute x * 2**PyLong_SHIFT + v->ob_digit[i] modulo |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2593 _PyHASH_MODULUS. |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2594 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2595 The computation of x * 2**PyLong_SHIFT % _PyHASH_MODULUS |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2596 amounts to a rotation of the bits of x. To see this, write |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2597 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2598 x * 2**PyLong_SHIFT = y * 2**_PyHASH_BITS + z |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2599 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2600 where y = x >> (_PyHASH_BITS - PyLong_SHIFT) gives the top |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2601 PyLong_SHIFT bits of x (those that are shifted out of the |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2602 original _PyHASH_BITS bits, and z = (x << PyLong_SHIFT) & |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2603 _PyHASH_MODULUS gives the bottom _PyHASH_BITS - PyLong_SHIFT |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2604 bits of x, shifted up. Then since 2**_PyHASH_BITS is |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2605 congruent to 1 modulo _PyHASH_MODULUS, y*2**_PyHASH_BITS is |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2606 congruent to y modulo _PyHASH_MODULUS. So |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2607 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2608 x * 2**PyLong_SHIFT = y + z (mod _PyHASH_MODULUS). |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2609 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2610 The right-hand side is just the result of rotating the |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2611 _PyHASH_BITS bits of x left by PyLong_SHIFT places; since |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2612 not all _PyHASH_BITS bits of x are 1s, the same is true |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2613 after rotation, so 0 <= y+z < _PyHASH_MODULUS and y + z is |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2614 the reduction of x*2**PyLong_SHIFT modulo |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2615 _PyHASH_MODULUS. */ |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2616 x = ((x << PyLong_SHIFT) & _PyHASH_MODULUS) | |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2617 (x >> (_PyHASH_BITS - PyLong_SHIFT)); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2618 x += v->ob_digit[i]; |
|
61873
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2619 if (x >= _PyHASH_MODULUS) |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2620 x -= _PyHASH_MODULUS; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2621 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2622 x = x * sign; |
|
65603
be8ae6b17539
follow up to #9778: define and use an unsigned hash type
Benjamin Peterson <benjamin@python.org>
parents:
65494
diff
changeset
|
2623 if (x == (Py_uhash_t)-1) |
|
be8ae6b17539
follow up to #9778: define and use an unsigned hash type
Benjamin Peterson <benjamin@python.org>
parents:
65494
diff
changeset
|
2624 x = (Py_uhash_t)-2; |
|
65494
e8969fb822fc
make hashes always the size of pointers; introduce Py_hash_t #9778
Benjamin Peterson <benjamin@python.org>
parents:
62154
diff
changeset
|
2625 return (Py_hash_t)x; |
|
1257
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2626 } |
|
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2627 |
|
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2628 |
| 230 | 2629 /* Add the absolute values of two long integers. */ |
| 2630 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2631 static PyLongObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2632 x_add(PyLongObject *a, PyLongObject *b) |
| 230 | 2633 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2634 Py_ssize_t size_a = ABS(Py_SIZE(a)), size_b = ABS(Py_SIZE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2635 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2636 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2637 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2638 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2639 /* Ensure a is the larger of the two: */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2640 if (size_a < size_b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2641 { PyLongObject *temp = a; a = b; b = temp; } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2642 { Py_ssize_t size_temp = size_a; |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2643 size_a = size_b; |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2644 size_b = size_temp; } |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2645 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2646 z = _PyLong_New(size_a+1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2647 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2648 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2649 for (i = 0; i < size_b; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2650 carry += a->ob_digit[i] + b->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2651 z->ob_digit[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2652 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2653 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2654 for (; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2655 carry += a->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2656 z->ob_digit[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2657 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2658 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2659 z->ob_digit[i] = carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2660 return long_normalize(z); |
| 230 | 2661 } |
| 2662 | |
| 2663 /* Subtract the absolute values of two integers. */ | |
| 2664 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2665 static PyLongObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2666 x_sub(PyLongObject *a, PyLongObject *b) |
| 230 | 2667 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2668 Py_ssize_t size_a = ABS(Py_SIZE(a)), size_b = ABS(Py_SIZE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2669 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2670 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2671 int sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2672 digit borrow = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2673 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2674 /* Ensure a is the larger of the two: */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2675 if (size_a < size_b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2676 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2677 { PyLongObject *temp = a; a = b; b = temp; } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2678 { Py_ssize_t size_temp = size_a; |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2679 size_a = size_b; |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2680 size_b = size_temp; } |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2681 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2682 else if (size_a == size_b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2683 /* Find highest digit where a and b differ: */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2684 i = size_a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2685 while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i]) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2686 ; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2687 if (i < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2688 return (PyLongObject *)PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2689 if (a->ob_digit[i] < b->ob_digit[i]) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2690 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2691 { PyLongObject *temp = a; a = b; b = temp; } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2692 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2693 size_a = size_b = i+1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2694 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2695 z = _PyLong_New(size_a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2696 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2697 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2698 for (i = 0; i < size_b; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2699 /* The following assumes unsigned arithmetic |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2700 works module 2**N for some N>PyLong_SHIFT. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2701 borrow = a->ob_digit[i] - b->ob_digit[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2702 z->ob_digit[i] = borrow & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2703 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2704 borrow &= 1; /* Keep only one sign bit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2705 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2706 for (; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2707 borrow = a->ob_digit[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2708 z->ob_digit[i] = borrow & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2709 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2710 borrow &= 1; /* Keep only one sign bit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2711 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2712 assert(borrow == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2713 if (sign < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2714 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2715 return long_normalize(z); |
| 230 | 2716 } |
| 2717 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2718 static PyObject * |
| 43313 | 2719 long_add(PyLongObject *a, PyLongObject *b) |
| 230 | 2720 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2721 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2722 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2723 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2724 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2725 if (ABS(Py_SIZE(a)) <= 1 && ABS(Py_SIZE(b)) <= 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2726 PyObject *result = PyLong_FromLong(MEDIUM_VALUE(a) + |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2727 MEDIUM_VALUE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2728 return result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2729 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2730 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2731 if (Py_SIZE(b) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2732 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2733 if (z != NULL && Py_SIZE(z) != 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2734 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2735 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2736 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2737 z = x_sub(b, a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2738 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2739 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2740 if (Py_SIZE(b) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2741 z = x_sub(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2742 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2743 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2744 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2745 return (PyObject *)z; |
| 230 | 2746 } |
| 2747 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2748 static PyObject * |
| 43313 | 2749 long_sub(PyLongObject *a, PyLongObject *b) |
| 230 | 2750 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2751 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2752 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2753 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2754 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2755 if (ABS(Py_SIZE(a)) <= 1 && ABS(Py_SIZE(b)) <= 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2756 PyObject* r; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2757 r = PyLong_FromLong(MEDIUM_VALUE(a)-MEDIUM_VALUE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2758 return r; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2759 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2760 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2761 if (Py_SIZE(b) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2762 z = x_sub(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2763 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2764 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2765 if (z != NULL && Py_SIZE(z) != 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2766 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2767 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2768 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2769 if (Py_SIZE(b) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2770 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2771 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2772 z = x_sub(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2773 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2774 return (PyObject *)z; |
| 230 | 2775 } |
| 2776 | |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2777 /* Grade school multiplication, ignoring the signs. |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2778 * Returns the absolute value of the product, or NULL if error. |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2779 */ |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2780 static PyLongObject * |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2781 x_mul(PyLongObject *a, PyLongObject *b) |
|
15725
8e402aeca0a3
Make long a new style number type. Sequence repeat is now done here
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
15318
diff
changeset
|
2782 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2783 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2784 Py_ssize_t size_a = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2785 Py_ssize_t size_b = ABS(Py_SIZE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2786 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2787 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2788 z = _PyLong_New(size_a + size_b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2789 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2790 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2791 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2792 memset(z->ob_digit, 0, Py_SIZE(z) * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2793 if (a == b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2794 /* Efficient squaring per HAC, Algorithm 14.16: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2795 * http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2796 * Gives slightly less than a 2x speedup when a == b, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2797 * via exploiting that each entry in the multiplication |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2798 * pyramid appears twice (except for the size_a squares). |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2799 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2800 for (i = 0; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2801 twodigits carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2802 twodigits f = a->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2803 digit *pz = z->ob_digit + (i << 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2804 digit *pa = a->ob_digit + i + 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2805 digit *paend = a->ob_digit + size_a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2806 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2807 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2808 Py_DECREF(z); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2809 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
2810 }); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2811 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2812 carry = *pz + f * f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2813 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2814 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2815 assert(carry <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2816 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2817 /* Now f is added in twice in each column of the |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2818 * pyramid it appears. Same as adding f<<1 once. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2819 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2820 f <<= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2821 while (pa < paend) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2822 carry += *pz + *pa++ * f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2823 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2824 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2825 assert(carry <= (PyLong_MASK << 1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2826 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2827 if (carry) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2828 carry += *pz; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2829 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2830 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2831 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2832 if (carry) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2833 *pz += (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2834 assert((carry >> PyLong_SHIFT) == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2835 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2836 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2837 else { /* a is not the same as b -- gradeschool long mult */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2838 for (i = 0; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2839 twodigits carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2840 twodigits f = a->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2841 digit *pz = z->ob_digit + i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2842 digit *pb = b->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2843 digit *pbend = b->ob_digit + size_b; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2844 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2845 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2846 Py_DECREF(z); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2847 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
2848 }); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2849 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2850 while (pb < pbend) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2851 carry += *pz + *pb++ * f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2852 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2853 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2854 assert(carry <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2855 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2856 if (carry) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2857 *pz += (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2858 assert((carry >> PyLong_SHIFT) == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2859 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2860 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2861 return long_normalize(z); |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2862 } |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2863 |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2864 /* A helper for Karatsuba multiplication (k_mul). |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2865 Takes a long "n" and an integer "size" representing the place to |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2866 split, and sets low and high such that abs(n) == (high << size) + low, |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2867 viewing the shift as being by digits. The sign bit is ignored, and |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2868 the return values are >= 0. |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2869 Returns 0 on success, -1 on failure. |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2870 */ |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2871 static int |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2872 kmul_split(PyLongObject *n, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2873 Py_ssize_t size, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2874 PyLongObject **high, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2875 PyLongObject **low) |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2876 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2877 PyLongObject *hi, *lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2878 Py_ssize_t size_lo, size_hi; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2879 const Py_ssize_t size_n = ABS(Py_SIZE(n)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2880 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2881 size_lo = MIN(size_n, size); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2882 size_hi = size_n - size_lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2883 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2884 if ((hi = _PyLong_New(size_hi)) == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2885 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2886 if ((lo = _PyLong_New(size_lo)) == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2887 Py_DECREF(hi); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2888 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2889 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2890 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2891 memcpy(lo->ob_digit, n->ob_digit, size_lo * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2892 memcpy(hi->ob_digit, n->ob_digit + size_lo, size_hi * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2893 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2894 *high = long_normalize(hi); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2895 *low = long_normalize(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2896 return 0; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2897 } |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2898 |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
2899 static PyLongObject *k_lopsided_mul(PyLongObject *a, PyLongObject *b); |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
2900 |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2901 /* Karatsuba multiplication. Ignores the input signs, and returns the |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2902 * absolute value of the product (or NULL if error). |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2903 * See Knuth Vol. 2 Chapter 4.3.3 (Pp. 294-295). |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2904 */ |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2905 static PyLongObject * |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2906 k_mul(PyLongObject *a, PyLongObject *b) |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2907 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2908 Py_ssize_t asize = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2909 Py_ssize_t bsize = ABS(Py_SIZE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2910 PyLongObject *ah = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2911 PyLongObject *al = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2912 PyLongObject *bh = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2913 PyLongObject *bl = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2914 PyLongObject *ret = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2915 PyLongObject *t1, *t2, *t3; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2916 Py_ssize_t shift; /* the number of digits we split off */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2917 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2918 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2919 /* (ah*X+al)(bh*X+bl) = ah*bh*X*X + (ah*bl + al*bh)*X + al*bl |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2920 * Let k = (ah+al)*(bh+bl) = ah*bl + al*bh + ah*bh + al*bl |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2921 * Then the original product is |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2922 * ah*bh*X*X + (k - ah*bh - al*bl)*X + al*bl |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2923 * By picking X to be a power of 2, "*X" is just shifting, and it's |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2924 * been reduced to 3 multiplies on numbers half the size. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2925 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2926 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2927 /* We want to split based on the larger number; fiddle so that b |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2928 * is largest. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2929 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2930 if (asize > bsize) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2931 t1 = a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2932 a = b; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2933 b = t1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2934 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2935 i = asize; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2936 asize = bsize; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2937 bsize = i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2938 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2939 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2940 /* Use gradeschool math when either number is too small. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2941 i = a == b ? KARATSUBA_SQUARE_CUTOFF : KARATSUBA_CUTOFF; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2942 if (asize <= i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2943 if (asize == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2944 return (PyLongObject *)PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2945 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2946 return x_mul(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2947 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2948 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2949 /* If a is small compared to b, splitting on b gives a degenerate |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2950 * case with ah==0, and Karatsuba may be (even much) less efficient |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2951 * than "grade school" then. However, we can still win, by viewing |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2952 * b as a string of "big digits", each of width a->ob_size. That |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2953 * leads to a sequence of balanced calls to k_mul. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2954 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2955 if (2 * asize <= bsize) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2956 return k_lopsided_mul(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2957 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2958 /* Split a & b into hi & lo pieces. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2959 shift = bsize >> 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2960 if (kmul_split(a, shift, &ah, &al) < 0) goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2961 assert(Py_SIZE(ah) > 0); /* the split isn't degenerate */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2962 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2963 if (a == b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2964 bh = ah; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2965 bl = al; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2966 Py_INCREF(bh); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2967 Py_INCREF(bl); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2968 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2969 else if (kmul_split(b, shift, &bh, &bl) < 0) goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2970 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2971 /* The plan: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2972 * 1. Allocate result space (asize + bsize digits: that's always |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2973 * enough). |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2974 * 2. Compute ah*bh, and copy into result at 2*shift. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2975 * 3. Compute al*bl, and copy into result at 0. Note that this |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2976 * can't overlap with #2. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2977 * 4. Subtract al*bl from the result, starting at shift. This may |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2978 * underflow (borrow out of the high digit), but we don't care: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2979 * we're effectively doing unsigned arithmetic mod |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2980 * BASE**(sizea + sizeb), and so long as the *final* result fits, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2981 * borrows and carries out of the high digit can be ignored. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2982 * 5. Subtract ah*bh from the result, starting at shift. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2983 * 6. Compute (ah+al)*(bh+bl), and add it into the result starting |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2984 * at shift. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2985 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2986 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2987 /* 1. Allocate result space. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2988 ret = _PyLong_New(asize + bsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2989 if (ret == NULL) goto fail; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2990 #ifdef Py_DEBUG |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2991 /* Fill with trash, to catch reference to uninitialized digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2992 memset(ret->ob_digit, 0xDF, Py_SIZE(ret) * sizeof(digit)); |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2993 #endif |
|
24751
dbf6e563023b
x_mul(): This failed to normalize its result.
Tim Peters <tim.peters@gmail.com>
parents:
24750
diff
changeset
|
2994 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2995 /* 2. t1 <- ah*bh, and copy into high digits of result. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2996 if ((t1 = k_mul(ah, bh)) == NULL) goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2997 assert(Py_SIZE(t1) >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2998 assert(2*shift + Py_SIZE(t1) <= Py_SIZE(ret)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2999 memcpy(ret->ob_digit + 2*shift, t1->ob_digit, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3000 Py_SIZE(t1) * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3001 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3002 /* Zero-out the digits higher than the ah*bh copy. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3003 i = Py_SIZE(ret) - 2*shift - Py_SIZE(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3004 if (i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3005 memset(ret->ob_digit + 2*shift + Py_SIZE(t1), 0, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3006 i * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3007 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3008 /* 3. t2 <- al*bl, and copy into the low digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3009 if ((t2 = k_mul(al, bl)) == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3010 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3011 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3012 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3013 assert(Py_SIZE(t2) >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3014 assert(Py_SIZE(t2) <= 2*shift); /* no overlap with high digits */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3015 memcpy(ret->ob_digit, t2->ob_digit, Py_SIZE(t2) * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3016 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3017 /* Zero out remaining digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3018 i = 2*shift - Py_SIZE(t2); /* number of uninitialized digits */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3019 if (i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3020 memset(ret->ob_digit + Py_SIZE(t2), 0, i * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3021 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3022 /* 4 & 5. Subtract ah*bh (t1) and al*bl (t2). We do al*bl first |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3023 * because it's fresher in cache. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3024 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3025 i = Py_SIZE(ret) - shift; /* # digits after shift */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3026 (void)v_isub(ret->ob_digit + shift, i, t2->ob_digit, Py_SIZE(t2)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3027 Py_DECREF(t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3028 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3029 (void)v_isub(ret->ob_digit + shift, i, t1->ob_digit, Py_SIZE(t1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3030 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3031 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3032 /* 6. t3 <- (ah+al)(bh+bl), and add into result. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3033 if ((t1 = x_add(ah, al)) == NULL) goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3034 Py_DECREF(ah); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3035 Py_DECREF(al); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3036 ah = al = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3037 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3038 if (a == b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3039 t2 = t1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3040 Py_INCREF(t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3041 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3042 else if ((t2 = x_add(bh, bl)) == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3043 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3044 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3045 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3046 Py_DECREF(bh); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3047 Py_DECREF(bl); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3048 bh = bl = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3049 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3050 t3 = k_mul(t1, t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3051 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3052 Py_DECREF(t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3053 if (t3 == NULL) goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3054 assert(Py_SIZE(t3) >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3055 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3056 /* Add t3. It's not obvious why we can't run out of room here. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3057 * See the (*) comment after this function. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3058 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3059 (void)v_iadd(ret->ob_digit + shift, i, t3->ob_digit, Py_SIZE(t3)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3060 Py_DECREF(t3); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3061 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3062 return long_normalize(ret); |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3063 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3064 fail: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3065 Py_XDECREF(ret); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3066 Py_XDECREF(ah); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3067 Py_XDECREF(al); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3068 Py_XDECREF(bh); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3069 Py_XDECREF(bl); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3070 return NULL; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3071 } |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3072 |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3073 /* (*) Why adding t3 can't "run out of room" above. |
|
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3074 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3075 Let f(x) mean the floor of x and c(x) mean the ceiling of x. Some facts |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3076 to start with: |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3077 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3078 1. For any integer i, i = c(i/2) + f(i/2). In particular, |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3079 bsize = c(bsize/2) + f(bsize/2). |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3080 2. shift = f(bsize/2) |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3081 3. asize <= bsize |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3082 4. Since we call k_lopsided_mul if asize*2 <= bsize, asize*2 > bsize in this |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3083 routine, so asize > bsize/2 >= f(bsize/2) in this routine. |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3084 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3085 We allocated asize + bsize result digits, and add t3 into them at an offset |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3086 of shift. This leaves asize+bsize-shift allocated digit positions for t3 |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3087 to fit into, = (by #1 and #2) asize + f(bsize/2) + c(bsize/2) - f(bsize/2) = |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3088 asize + c(bsize/2) available digit positions. |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3089 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3090 bh has c(bsize/2) digits, and bl at most f(size/2) digits. So bh+hl has |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3091 at most c(bsize/2) digits + 1 bit. |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3092 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3093 If asize == bsize, ah has c(bsize/2) digits, else ah has at most f(bsize/2) |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3094 digits, and al has at most f(bsize/2) digits in any case. So ah+al has at |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3095 most (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 1 bit. |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3096 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3097 The product (ah+al)*(bh+bl) therefore has at most |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3098 |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3099 c(bsize/2) + (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3100 |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3101 and we have asize + c(bsize/2) available digit positions. We need to show |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3102 this is always enough. An instance of c(bsize/2) cancels out in both, so |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3103 the question reduces to whether asize digits is enough to hold |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3104 (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits. If asize < bsize, |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3105 then we're asking whether asize digits >= f(bsize/2) digits + 2 bits. By #4, |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3106 asize is at least f(bsize/2)+1 digits, so this in turn reduces to whether 1 |
|
42334
e70cdce0e8b2
Merged revisions 56467-56482 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
42110
diff
changeset
|
3107 digit is enough to hold 2 bits. This is so since PyLong_SHIFT=15 >= 2. If |
|
24846
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3108 asize == bsize, then we're asking whether bsize digits is enough to hold |
|
24847
873f12f68e3b
Illustrating by example one good reason not to trust a proof <wink>.
Tim Peters <tim.peters@gmail.com>
parents:
24846
diff
changeset
|
3109 c(bsize/2) digits + 2 bits, or equivalently (by #1) whether f(bsize/2) digits |
|
873f12f68e3b
Illustrating by example one good reason not to trust a proof <wink>.
Tim Peters <tim.peters@gmail.com>
parents:
24846
diff
changeset
|
3110 is enough to hold 2 bits. This is so if bsize >= 2, which holds because |
|
873f12f68e3b
Illustrating by example one good reason not to trust a proof <wink>.
Tim Peters <tim.peters@gmail.com>
parents:
24846
diff
changeset
|
3111 bsize >= KARATSUBA_CUTOFF >= 2. |
|
24821
ae9c9f90b4b0
k_mul() comments: Explained why there's always enough room to subtract
Tim Peters <tim.peters@gmail.com>
parents:
24792
diff
changeset
|
3112 |
|
24824
7c91d303c563
k_mul() comments: Simplified the simplified explanation of why ah*bh and
Tim Peters <tim.peters@gmail.com>
parents:
24821
diff
changeset
|
3113 Note that since there's always enough room for (ah+al)*(bh+bl), and that's |
|
7c91d303c563
k_mul() comments: Simplified the simplified explanation of why ah*bh and
Tim Peters <tim.peters@gmail.com>
parents:
24821
diff
changeset
|
3114 clearly >= each of ah*bh and al*bl, there's always enough room to subtract |
|
7c91d303c563
k_mul() comments: Simplified the simplified explanation of why ah*bh and
Tim Peters <tim.peters@gmail.com>
parents:
24821
diff
changeset
|
3115 ah*bh and al*bl too. |
|
24791
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3116 */ |
|
dbf4cc560898
k_mul(): The fix for (ah+al)*(bh+bl) spilling 1 bit beyond the allocated
Tim Peters <tim.peters@gmail.com>
parents:
24777
diff
changeset
|
3117 |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3118 /* b has at least twice the digits of a, and a is big enough that Karatsuba |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3119 * would pay off *if* the inputs had balanced sizes. View b as a sequence |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3120 * of slices, each with a->ob_size digits, and multiply the slices by a, |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3121 * one at a time. This gives k_mul balanced inputs to work with, and is |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3122 * also cache-friendly (we compute one double-width slice of the result |
|
68488
0991b40e895d
#11515: fix several typos. Patch by Piotr Kasprzyk.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
61467
diff
changeset
|
3123 * at a time, then move on, never backtracking except for the helpful |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3124 * single-width slice overlap between successive partial sums). |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3125 */ |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3126 static PyLongObject * |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3127 k_lopsided_mul(PyLongObject *a, PyLongObject *b) |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3128 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3129 const Py_ssize_t asize = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3130 Py_ssize_t bsize = ABS(Py_SIZE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3131 Py_ssize_t nbdone; /* # of b digits already multiplied */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3132 PyLongObject *ret; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3133 PyLongObject *bslice = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3134 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3135 assert(asize > KARATSUBA_CUTOFF); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3136 assert(2 * asize <= bsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3137 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3138 /* Allocate result space, and zero it out. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3139 ret = _PyLong_New(asize + bsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3140 if (ret == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3141 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3142 memset(ret->ob_digit, 0, Py_SIZE(ret) * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3143 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3144 /* Successive slices of b are copied into bslice. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3145 bslice = _PyLong_New(asize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3146 if (bslice == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3147 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3148 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3149 nbdone = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3150 while (bsize > 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3151 PyLongObject *product; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3152 const Py_ssize_t nbtouse = MIN(bsize, asize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3153 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3154 /* Multiply the next slice of b by a. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3155 memcpy(bslice->ob_digit, b->ob_digit + nbdone, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3156 nbtouse * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3157 Py_SIZE(bslice) = nbtouse; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3158 product = k_mul(a, bslice); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3159 if (product == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3160 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3161 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3162 /* Add into result. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3163 (void)v_iadd(ret->ob_digit + nbdone, Py_SIZE(ret) - nbdone, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3164 product->ob_digit, Py_SIZE(product)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3165 Py_DECREF(product); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3166 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3167 bsize -= nbtouse; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3168 nbdone += nbtouse; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3169 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3170 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3171 Py_DECREF(bslice); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3172 return long_normalize(ret); |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3173 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3174 fail: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3175 Py_DECREF(ret); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3176 Py_XDECREF(bslice); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3177 return NULL; |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3178 } |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3179 |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3180 static PyObject * |
| 43313 | 3181 long_mul(PyLongObject *a, PyLongObject *b) |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3182 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3183 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3184 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3185 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3186 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3187 /* fast path for single-digit multiplication */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3188 if (ABS(Py_SIZE(a)) <= 1 && ABS(Py_SIZE(b)) <= 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3189 stwodigits v = (stwodigits)(MEDIUM_VALUE(a)) * MEDIUM_VALUE(b); |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
3190 #ifdef HAVE_LONG_LONG |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3191 return PyLong_FromLongLong((PY_LONG_LONG)v); |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
3192 #else |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3193 /* if we don't have long long then we're almost certainly |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3194 using 15-bit digits, so v will fit in a long. In the |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3195 unlikely event that we're using 30-bit digits on a platform |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3196 without long long, a large v will just cause us to fall |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3197 through to the general multiplication code below. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3198 if (v >= LONG_MIN && v <= LONG_MAX) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3199 return PyLong_FromLong((long)v); |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
3200 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3201 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3202 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3203 z = k_mul(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3204 /* Negate if exactly one of the inputs is negative. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3205 if (((Py_SIZE(a) ^ Py_SIZE(b)) < 0) && z) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3206 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3207 return (PyObject *)z; |
| 230 | 3208 } |
| 3209 | |
| 613 | 3210 /* The / and % operators are now defined in terms of divmod(). |
| 3211 The expression a mod b has the value a - b*floor(a/b). | |
| 3212 The long_divrem function gives the remainder after division of | |
| 230 | 3213 |a| by |b|, with the sign of a. This is also expressed |
| 3214 as a - b*trunc(a/b), if trunc truncates towards zero. | |
| 3215 Some examples: | |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3216 a b a rem b a mod b |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3217 13 10 3 3 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3218 -13 10 -3 7 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3219 13 -10 3 -7 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3220 -13 -10 -3 -3 |
| 230 | 3221 So, to get from rem to mod, we have to add b if a and b |
| 242 | 3222 have different signs. We then subtract one from the 'div' |
| 3223 part of the outcome to keep the invariant intact. */ | |
| 230 | 3224 |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3225 /* Compute |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3226 * *pdiv, *pmod = divmod(v, w) |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3227 * NULL can be passed for pdiv or pmod, in which case that part of |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3228 * the result is simply thrown away. The caller owns a reference to |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3229 * each of these it requests (does not pass NULL for). |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3230 */ |
| 613 | 3231 static int |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3232 l_divmod(PyLongObject *v, PyLongObject *w, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3233 PyLongObject **pdiv, PyLongObject **pmod) |
| 613 | 3234 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3235 PyLongObject *div, *mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3236 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3237 if (long_divrem(v, w, &div, &mod) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3238 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3239 if ((Py_SIZE(mod) < 0 && Py_SIZE(w) > 0) || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3240 (Py_SIZE(mod) > 0 && Py_SIZE(w) < 0)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3241 PyLongObject *temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3242 PyLongObject *one; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3243 temp = (PyLongObject *) long_add(mod, w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3244 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3245 mod = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3246 if (mod == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3247 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3248 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3249 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3250 one = (PyLongObject *) PyLong_FromLong(1L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3251 if (one == NULL || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3252 (temp = (PyLongObject *) long_sub(div, one)) == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3253 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3254 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3255 Py_XDECREF(one); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3256 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3257 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3258 Py_DECREF(one); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3259 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3260 div = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3261 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3262 if (pdiv != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3263 *pdiv = div; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3264 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3265 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3266 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3267 if (pmod != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3268 *pmod = mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3269 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3270 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3271 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3272 return 0; |
| 613 | 3273 } |
| 3274 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3275 static PyObject * |
| 43313 | 3276 long_div(PyObject *a, PyObject *b) |
| 613 | 3277 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3278 PyLongObject *div; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3279 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3280 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3281 if (l_divmod((PyLongObject*)a, (PyLongObject*)b, &div, NULL) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3282 div = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3283 return (PyObject *)div; |
| 613 | 3284 } |
| 3285 | |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3286 /* PyLong/PyLong -> float, with correctly rounded result. */ |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3287 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3288 #define MANT_DIG_DIGITS (DBL_MANT_DIG / PyLong_SHIFT) |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3289 #define MANT_DIG_BITS (DBL_MANT_DIG % PyLong_SHIFT) |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3290 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3291 static PyObject * |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3292 long_true_divide(PyObject *v, PyObject *w) |
|
19675
685dcae5c123
Move long_true_divide next to the other division routines (for clarity!).
Tim Peters <tim.peters@gmail.com>
parents:
19674
diff
changeset
|
3293 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3294 PyLongObject *a, *b, *x; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3295 Py_ssize_t a_size, b_size, shift, extra_bits, diff, x_size, x_bits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3296 digit mask, low; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3297 int inexact, negate, a_is_small, b_is_small; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3298 double dx, result; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3299 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3300 CHECK_BINOP(v, w); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3301 a = (PyLongObject *)v; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3302 b = (PyLongObject *)w; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3303 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3304 /* |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3305 Method in a nutshell: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3306 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3307 0. reduce to case a, b > 0; filter out obvious underflow/overflow |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3308 1. choose a suitable integer 'shift' |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3309 2. use integer arithmetic to compute x = floor(2**-shift*a/b) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3310 3. adjust x for correct rounding |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3311 4. convert x to a double dx with the same value |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3312 5. return ldexp(dx, shift). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3313 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3314 In more detail: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3315 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3316 0. For any a, a/0 raises ZeroDivisionError; for nonzero b, 0/b |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3317 returns either 0.0 or -0.0, depending on the sign of b. For a and |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3318 b both nonzero, ignore signs of a and b, and add the sign back in |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3319 at the end. Now write a_bits and b_bits for the bit lengths of a |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3320 and b respectively (that is, a_bits = 1 + floor(log_2(a)); likewise |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3321 for b). Then |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3322 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3323 2**(a_bits - b_bits - 1) < a/b < 2**(a_bits - b_bits + 1). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3324 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3325 So if a_bits - b_bits > DBL_MAX_EXP then a/b > 2**DBL_MAX_EXP and |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3326 so overflows. Similarly, if a_bits - b_bits < DBL_MIN_EXP - |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3327 DBL_MANT_DIG - 1 then a/b underflows to 0. With these cases out of |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3328 the way, we can assume that |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3329 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3330 DBL_MIN_EXP - DBL_MANT_DIG - 1 <= a_bits - b_bits <= DBL_MAX_EXP. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3331 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3332 1. The integer 'shift' is chosen so that x has the right number of |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3333 bits for a double, plus two or three extra bits that will be used |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3334 in the rounding decisions. Writing a_bits and b_bits for the |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3335 number of significant bits in a and b respectively, a |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3336 straightforward formula for shift is: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3337 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3338 shift = a_bits - b_bits - DBL_MANT_DIG - 2 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3339 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3340 This is fine in the usual case, but if a/b is smaller than the |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3341 smallest normal float then it can lead to double rounding on an |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3342 IEEE 754 platform, giving incorrectly rounded results. So we |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3343 adjust the formula slightly. The actual formula used is: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3344 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3345 shift = MAX(a_bits - b_bits, DBL_MIN_EXP) - DBL_MANT_DIG - 2 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3346 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3347 2. The quantity x is computed by first shifting a (left -shift bits |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3348 if shift <= 0, right shift bits if shift > 0) and then dividing by |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3349 b. For both the shift and the division, we keep track of whether |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3350 the result is inexact, in a flag 'inexact'; this information is |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3351 needed at the rounding stage. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3352 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3353 With the choice of shift above, together with our assumption that |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3354 a_bits - b_bits >= DBL_MIN_EXP - DBL_MANT_DIG - 1, it follows |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3355 that x >= 1. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3356 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3357 3. Now x * 2**shift <= a/b < (x+1) * 2**shift. We want to replace |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3358 this with an exactly representable float of the form |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3359 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3360 round(x/2**extra_bits) * 2**(extra_bits+shift). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3361 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3362 For float representability, we need x/2**extra_bits < |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3363 2**DBL_MANT_DIG and extra_bits + shift >= DBL_MIN_EXP - |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3364 DBL_MANT_DIG. This translates to the condition: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3365 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3366 extra_bits >= MAX(x_bits, DBL_MIN_EXP - shift) - DBL_MANT_DIG |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3367 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3368 To round, we just modify the bottom digit of x in-place; this can |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3369 end up giving a digit with value > PyLONG_MASK, but that's not a |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3370 problem since digits can hold values up to 2*PyLONG_MASK+1. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3371 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3372 With the original choices for shift above, extra_bits will always |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3373 be 2 or 3. Then rounding under the round-half-to-even rule, we |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3374 round up iff the most significant of the extra bits is 1, and |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3375 either: (a) the computation of x in step 2 had an inexact result, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3376 or (b) at least one other of the extra bits is 1, or (c) the least |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3377 significant bit of x (above those to be rounded) is 1. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3378 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3379 4. Conversion to a double is straightforward; all floating-point |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3380 operations involved in the conversion are exact, so there's no |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3381 danger of rounding errors. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3382 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3383 5. Use ldexp(x, shift) to compute x*2**shift, the final result. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3384 The result will always be exactly representable as a double, except |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3385 in the case that it overflows. To avoid dependence on the exact |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3386 behaviour of ldexp on overflow, we check for overflow before |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3387 applying ldexp. The result of ldexp is adjusted for sign before |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3388 returning. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3389 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3390 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3391 /* Reduce to case where a and b are both positive. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3392 a_size = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3393 b_size = ABS(Py_SIZE(b)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3394 negate = (Py_SIZE(a) < 0) ^ (Py_SIZE(b) < 0); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3395 if (b_size == 0) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3396 PyErr_SetString(PyExc_ZeroDivisionError, |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3397 "division by zero"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3398 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3399 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3400 if (a_size == 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3401 goto underflow_or_zero; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3402 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3403 /* Fast path for a and b small (exactly representable in a double). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3404 Relies on floating-point division being correctly rounded; results |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3405 may be subject to double rounding on x86 machines that operate with |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3406 the x87 FPU set to 64-bit precision. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3407 a_is_small = a_size <= MANT_DIG_DIGITS || |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3408 (a_size == MANT_DIG_DIGITS+1 && |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3409 a->ob_digit[MANT_DIG_DIGITS] >> MANT_DIG_BITS == 0); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3410 b_is_small = b_size <= MANT_DIG_DIGITS || |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3411 (b_size == MANT_DIG_DIGITS+1 && |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3412 b->ob_digit[MANT_DIG_DIGITS] >> MANT_DIG_BITS == 0); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3413 if (a_is_small && b_is_small) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3414 double da, db; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3415 da = a->ob_digit[--a_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3416 while (a_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3417 da = da * PyLong_BASE + a->ob_digit[--a_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3418 db = b->ob_digit[--b_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3419 while (b_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3420 db = db * PyLong_BASE + b->ob_digit[--b_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3421 result = da / db; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3422 goto success; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3423 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3424 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3425 /* Catch obvious cases of underflow and overflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3426 diff = a_size - b_size; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3427 if (diff > PY_SSIZE_T_MAX/PyLong_SHIFT - 1) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3428 /* Extreme overflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3429 goto overflow; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3430 else if (diff < 1 - PY_SSIZE_T_MAX/PyLong_SHIFT) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3431 /* Extreme underflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3432 goto underflow_or_zero; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3433 /* Next line is now safe from overflowing a Py_ssize_t */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3434 diff = diff * PyLong_SHIFT + bits_in_digit(a->ob_digit[a_size - 1]) - |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3435 bits_in_digit(b->ob_digit[b_size - 1]); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3436 /* Now diff = a_bits - b_bits. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3437 if (diff > DBL_MAX_EXP) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3438 goto overflow; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3439 else if (diff < DBL_MIN_EXP - DBL_MANT_DIG - 1) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3440 goto underflow_or_zero; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3441 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3442 /* Choose value for shift; see comments for step 1 above. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3443 shift = MAX(diff, DBL_MIN_EXP) - DBL_MANT_DIG - 2; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3444 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3445 inexact = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3446 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3447 /* x = abs(a * 2**-shift) */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3448 if (shift <= 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3449 Py_ssize_t i, shift_digits = -shift / PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3450 digit rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3451 /* x = a << -shift */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3452 if (a_size >= PY_SSIZE_T_MAX - 1 - shift_digits) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3453 /* In practice, it's probably impossible to end up |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3454 here. Both a and b would have to be enormous, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3455 using close to SIZE_T_MAX bytes of memory each. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3456 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3457 "intermediate overflow during division"); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3458 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3459 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3460 x = _PyLong_New(a_size + shift_digits + 1); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3461 if (x == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3462 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3463 for (i = 0; i < shift_digits; i++) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3464 x->ob_digit[i] = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3465 rem = v_lshift(x->ob_digit + shift_digits, a->ob_digit, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3466 a_size, -shift % PyLong_SHIFT); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3467 x->ob_digit[a_size + shift_digits] = rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3468 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3469 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3470 Py_ssize_t shift_digits = shift / PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3471 digit rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3472 /* x = a >> shift */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3473 assert(a_size >= shift_digits); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3474 x = _PyLong_New(a_size - shift_digits); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3475 if (x == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3476 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3477 rem = v_rshift(x->ob_digit, a->ob_digit + shift_digits, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3478 a_size - shift_digits, shift % PyLong_SHIFT); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3479 /* set inexact if any of the bits shifted out is nonzero */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3480 if (rem) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3481 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3482 while (!inexact && shift_digits > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3483 if (a->ob_digit[--shift_digits]) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3484 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3485 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3486 long_normalize(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3487 x_size = Py_SIZE(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3488 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3489 /* x //= b. If the remainder is nonzero, set inexact. We own the only |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3490 reference to x, so it's safe to modify it in-place. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3491 if (b_size == 1) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3492 digit rem = inplace_divrem1(x->ob_digit, x->ob_digit, x_size, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3493 b->ob_digit[0]); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3494 long_normalize(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3495 if (rem) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3496 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3497 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3498 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3499 PyLongObject *div, *rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3500 div = x_divrem(x, b, &rem); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3501 Py_DECREF(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3502 x = div; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3503 if (x == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3504 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3505 if (Py_SIZE(rem)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3506 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3507 Py_DECREF(rem); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3508 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3509 x_size = ABS(Py_SIZE(x)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3510 assert(x_size > 0); /* result of division is never zero */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3511 x_bits = (x_size-1)*PyLong_SHIFT+bits_in_digit(x->ob_digit[x_size-1]); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3512 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3513 /* The number of extra bits that have to be rounded away. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3514 extra_bits = MAX(x_bits, DBL_MIN_EXP - shift) - DBL_MANT_DIG; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3515 assert(extra_bits == 2 || extra_bits == 3); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3516 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3517 /* Round by directly modifying the low digit of x. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3518 mask = (digit)1 << (extra_bits - 1); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3519 low = x->ob_digit[0] | inexact; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3520 if (low & mask && low & (3*mask-1)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3521 low += mask; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3522 x->ob_digit[0] = low & ~(mask-1U); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3523 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3524 /* Convert x to a double dx; the conversion is exact. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3525 dx = x->ob_digit[--x_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3526 while (x_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3527 dx = dx * PyLong_BASE + x->ob_digit[--x_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3528 Py_DECREF(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3529 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3530 /* Check whether ldexp result will overflow a double. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3531 if (shift + x_bits >= DBL_MAX_EXP && |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3532 (shift + x_bits > DBL_MAX_EXP || dx == ldexp(1.0, (int)x_bits))) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3533 goto overflow; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3534 result = ldexp(dx, (int)shift); |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3535 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3536 success: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3537 return PyFloat_FromDouble(negate ? -result : result); |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3538 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3539 underflow_or_zero: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3540 return PyFloat_FromDouble(negate ? -0.0 : 0.0); |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3541 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3542 overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3543 PyErr_SetString(PyExc_OverflowError, |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3544 "integer division result too large for a float"); |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3545 error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3546 return NULL; |
|
19675
685dcae5c123
Move long_true_divide next to the other division routines (for clarity!).
Tim Peters <tim.peters@gmail.com>
parents:
19674
diff
changeset
|
3547 } |
|
685dcae5c123
Move long_true_divide next to the other division routines (for clarity!).
Tim Peters <tim.peters@gmail.com>
parents:
19674
diff
changeset
|
3548 |
|
685dcae5c123
Move long_true_divide next to the other division routines (for clarity!).
Tim Peters <tim.peters@gmail.com>
parents:
19674
diff
changeset
|
3549 static PyObject * |
| 43313 | 3550 long_mod(PyObject *a, PyObject *b) |
| 613 | 3551 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3552 PyLongObject *mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3553 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3554 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3555 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3556 if (l_divmod((PyLongObject*)a, (PyLongObject*)b, NULL, &mod) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3557 mod = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3558 return (PyObject *)mod; |
| 613 | 3559 } |
| 3560 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3561 static PyObject * |
| 43313 | 3562 long_divmod(PyObject *a, PyObject *b) |
| 230 | 3563 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3564 PyLongObject *div, *mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3565 PyObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3566 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3567 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3568 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3569 if (l_divmod((PyLongObject*)a, (PyLongObject*)b, &div, &mod) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3570 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3571 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3572 z = PyTuple_New(2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3573 if (z != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3574 PyTuple_SetItem(z, 0, (PyObject *) div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3575 PyTuple_SetItem(z, 1, (PyObject *) mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3576 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3577 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3578 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3579 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3580 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3581 return z; |
| 230 | 3582 } |
| 3583 | |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3584 /* pow(v, w, x) */ |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3585 static PyObject * |
|
15725
8e402aeca0a3
Make long a new style number type. Sequence repeat is now done here
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
15318
diff
changeset
|
3586 long_pow(PyObject *v, PyObject *w, PyObject *x) |
| 230 | 3587 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3588 PyLongObject *a, *b, *c; /* a,b,c = v,w,x */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3589 int negativeOutput = 0; /* if x<0 return negative output */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3590 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3591 PyLongObject *z = NULL; /* accumulated result */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3592 Py_ssize_t i, j, k; /* counters */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3593 PyLongObject *temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3594 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3595 /* 5-ary values. If the exponent is large enough, table is |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3596 * precomputed so that table[i] == a**i % c for i in range(32). |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3597 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3598 PyLongObject *table[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3599 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3600 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3601 /* a, b, c = v, w, x */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3602 CHECK_BINOP(v, w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3603 a = (PyLongObject*)v; Py_INCREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3604 b = (PyLongObject*)w; Py_INCREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3605 if (PyLong_Check(x)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3606 c = (PyLongObject *)x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3607 Py_INCREF(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3608 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3609 else if (x == Py_None) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3610 c = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3611 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3612 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3613 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3614 Py_INCREF(Py_NotImplemented); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3615 return Py_NotImplemented; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3616 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3617 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3618 if (Py_SIZE(b) < 0) { /* if exponent is negative */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3619 if (c) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3620 PyErr_SetString(PyExc_TypeError, "pow() 2nd argument " |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3621 "cannot be negative when 3rd argument specified"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3622 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3623 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3624 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3625 /* else return a float. This works because we know |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3626 that this calls float_pow() which converts its |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3627 arguments to double. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3628 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3629 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3630 return PyFloat_Type.tp_as_number->nb_power(v, w, x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3631 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3632 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3633 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3634 if (c) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3635 /* if modulus == 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3636 raise ValueError() */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3637 if (Py_SIZE(c) == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3638 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3639 "pow() 3rd argument cannot be 0"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3640 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3641 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3642 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3643 /* if modulus < 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3644 negativeOutput = True |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3645 modulus = -modulus */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3646 if (Py_SIZE(c) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3647 negativeOutput = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3648 temp = (PyLongObject *)_PyLong_Copy(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3649 if (temp == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3650 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3651 Py_DECREF(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3652 c = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3653 temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3654 NEGATE(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3655 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3656 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3657 /* if modulus == 1: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3658 return 0 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3659 if ((Py_SIZE(c) == 1) && (c->ob_digit[0] == 1)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3660 z = (PyLongObject *)PyLong_FromLong(0L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3661 goto Done; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3662 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3663 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3664 /* if base < 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3665 base = base % modulus |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3666 Having the base positive just makes things easier. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3667 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3668 if (l_divmod(a, c, NULL, &temp) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3669 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3670 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3671 a = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3672 temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3673 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3674 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3675 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3676 /* At this point a, b, and c are guaranteed non-negative UNLESS |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3677 c is NULL, in which case a may be negative. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3678 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3679 z = (PyLongObject *)PyLong_FromLong(1L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3680 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3681 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3682 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3683 /* Perform a modular reduction, X = X % c, but leave X alone if c |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3684 * is NULL. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3685 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3686 #define REDUCE(X) \ |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3687 do { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3688 if (c != NULL) { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3689 if (l_divmod(X, c, NULL, &temp) < 0) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3690 goto Error; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3691 Py_XDECREF(X); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3692 X = temp; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3693 temp = NULL; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3694 } \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3695 } while(0) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3696 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3697 /* Multiply two values, then reduce the result: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3698 result = X*Y % c. If c is NULL, skip the mod. */ |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3699 #define MULT(X, Y, result) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3700 do { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3701 temp = (PyLongObject *)long_mul(X, Y); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3702 if (temp == NULL) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3703 goto Error; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3704 Py_XDECREF(result); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3705 result = temp; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3706 temp = NULL; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3707 REDUCE(result); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3708 } while(0) |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3709 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3710 if (Py_SIZE(b) <= FIVEARY_CUTOFF) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3711 /* Left-to-right binary exponentiation (HAC Algorithm 14.79) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3712 /* http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3713 for (i = Py_SIZE(b) - 1; i >= 0; --i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3714 digit bi = b->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3715 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3716 for (j = (digit)1 << (PyLong_SHIFT-1); j != 0; j >>= 1) { |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3717 MULT(z, z, z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3718 if (bi & j) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3719 MULT(z, a, z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3720 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3721 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3722 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3723 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3724 /* Left-to-right 5-ary exponentiation (HAC Algorithm 14.82) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3725 Py_INCREF(z); /* still holds 1L */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3726 table[0] = z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3727 for (i = 1; i < 32; ++i) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3728 MULT(table[i-1], a, table[i]); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3729 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3730 for (i = Py_SIZE(b) - 1; i >= 0; --i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3731 const digit bi = b->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3732 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3733 for (j = PyLong_SHIFT - 5; j >= 0; j -= 5) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3734 const int index = (bi >> j) & 0x1f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3735 for (k = 0; k < 5; ++k) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3736 MULT(z, z, z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3737 if (index) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3738 MULT(z, table[index], z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3739 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3740 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3741 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3742 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3743 if (negativeOutput && (Py_SIZE(z) != 0)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3744 temp = (PyLongObject *)long_sub(z, c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3745 if (temp == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3746 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3747 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3748 z = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3749 temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3750 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3751 goto Done; |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3752 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3753 Error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3754 if (z != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3755 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3756 z = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3757 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3758 /* fall through */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3759 Done: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3760 if (Py_SIZE(b) > FIVEARY_CUTOFF) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3761 for (i = 0; i < 32; ++i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3762 Py_XDECREF(table[i]); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3763 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3764 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3765 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3766 Py_XDECREF(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3767 Py_XDECREF(temp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3768 return (PyObject *)z; |
| 230 | 3769 } |
| 3770 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3771 static PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
3772 long_invert(PyLongObject *v) |
| 230 | 3773 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3774 /* Implement ~x as -(x+1) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3775 PyLongObject *x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3776 PyLongObject *w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3777 if (ABS(Py_SIZE(v)) <=1) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3778 return PyLong_FromLong(-(MEDIUM_VALUE(v)+1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3779 w = (PyLongObject *)PyLong_FromLong(1L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3780 if (w == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3781 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3782 x = (PyLongObject *) long_add(v, w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3783 Py_DECREF(w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3784 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3785 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3786 Py_SIZE(x) = -(Py_SIZE(x)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3787 return (PyObject *)maybe_small_long(x); |
| 230 | 3788 } |
| 3789 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3790 static PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
3791 long_neg(PyLongObject *v) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3792 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3793 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3794 if (ABS(Py_SIZE(v)) <= 1) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3795 return PyLong_FromLong(-MEDIUM_VALUE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3796 z = (PyLongObject *)_PyLong_Copy(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3797 if (z != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3798 Py_SIZE(z) = -(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3799 return (PyObject *)z; |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3800 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3801 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3802 static PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
3803 long_abs(PyLongObject *v) |
| 230 | 3804 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3805 if (Py_SIZE(v) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3806 return long_neg(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3807 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3808 return long_long((PyObject *)v); |
| 230 | 3809 } |
| 3810 | |
| 242 | 3811 static int |
|
40401
88133417dfd0
- patch #1600346 submitted by Tomer Filiba
Jack Diederich <jackdied@gmail.com>
parents:
39703
diff
changeset
|
3812 long_bool(PyLongObject *v) |
| 242 | 3813 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3814 return Py_SIZE(v) != 0; |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3815 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3816 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3817 static PyObject * |
| 43313 | 3818 long_rshift(PyLongObject *a, PyLongObject *b) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3819 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3820 PyLongObject *z = NULL; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3821 Py_ssize_t shiftby, newsize, wordshift, loshift, hishift, i, j; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3822 digit lomask, himask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3823 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3824 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3825 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3826 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3827 /* Right shifting negative numbers is harder */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3828 PyLongObject *a1, *a2; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3829 a1 = (PyLongObject *) long_invert(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3830 if (a1 == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3831 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3832 a2 = (PyLongObject *) long_rshift(a1, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3833 Py_DECREF(a1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3834 if (a2 == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3835 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3836 z = (PyLongObject *) long_invert(a2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3837 Py_DECREF(a2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3838 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3839 else { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3840 shiftby = PyLong_AsSsize_t((PyObject *)b); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3841 if (shiftby == -1L && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3842 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3843 if (shiftby < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3844 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3845 "negative shift count"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3846 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3847 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3848 wordshift = shiftby / PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3849 newsize = ABS(Py_SIZE(a)) - wordshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3850 if (newsize <= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3851 return PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3852 loshift = shiftby % PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3853 hishift = PyLong_SHIFT - loshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3854 lomask = ((digit)1 << hishift) - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3855 himask = PyLong_MASK ^ lomask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3856 z = _PyLong_New(newsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3857 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3858 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3859 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3860 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3861 for (i = 0, j = wordshift; i < newsize; i++, j++) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3862 z->ob_digit[i] = (a->ob_digit[j] >> loshift) & lomask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3863 if (i+1 < newsize) |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3864 z->ob_digit[i] |= (a->ob_digit[j+1] << hishift) & himask; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3865 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3866 z = long_normalize(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3867 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3868 rshift_error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3869 return (PyObject *) maybe_small_long(z); |
|
15725
8e402aeca0a3
Make long a new style number type. Sequence repeat is now done here
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
15318
diff
changeset
|
3870 |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3871 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3872 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3873 static PyObject * |
|
15725
8e402aeca0a3
Make long a new style number type. Sequence repeat is now done here
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
15318
diff
changeset
|
3874 long_lshift(PyObject *v, PyObject *w) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3875 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3876 /* This version due to Tim Peters */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3877 PyLongObject *a = (PyLongObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3878 PyLongObject *b = (PyLongObject*)w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3879 PyLongObject *z = NULL; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3880 Py_ssize_t shiftby, oldsize, newsize, wordshift, remshift, i, j; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3881 twodigits accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3882 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3883 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3884 |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3885 shiftby = PyLong_AsSsize_t((PyObject *)b); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3886 if (shiftby == -1L && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3887 goto lshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3888 if (shiftby < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3889 PyErr_SetString(PyExc_ValueError, "negative shift count"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3890 goto lshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3891 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3892 /* wordshift, remshift = divmod(shiftby, PyLong_SHIFT) */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3893 wordshift = shiftby / PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3894 remshift = shiftby - wordshift * PyLong_SHIFT; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3895 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3896 oldsize = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3897 newsize = oldsize + wordshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3898 if (remshift) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3899 ++newsize; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3900 z = _PyLong_New(newsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3901 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3902 goto lshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3903 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3904 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3905 for (i = 0; i < wordshift; i++) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3906 z->ob_digit[i] = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3907 accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3908 for (i = wordshift, j = 0; j < oldsize; i++, j++) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3909 accum |= (twodigits)a->ob_digit[j] << remshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3910 z->ob_digit[i] = (digit)(accum & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3911 accum >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3912 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3913 if (remshift) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3914 z->ob_digit[newsize-1] = (digit)accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3915 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3916 assert(!accum); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3917 z = long_normalize(z); |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3918 lshift_error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3919 return (PyObject *) maybe_small_long(z); |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3920 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3921 |
|
56734
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3922 /* Compute two's complement of digit vector a[0:m], writing result to |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3923 z[0:m]. The digit vector a need not be normalized, but should not |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3924 be entirely zero. a and z may point to the same digit vector. */ |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3925 |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3926 static void |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3927 v_complement(digit *z, digit *a, Py_ssize_t m) |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3928 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3929 Py_ssize_t i; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3930 digit carry = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3931 for (i = 0; i < m; ++i) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3932 carry += a[i] ^ PyLong_MASK; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3933 z[i] = carry & PyLong_MASK; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3934 carry >>= PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3935 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3936 assert(carry == 0); |
|
56734
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
3937 } |
|
590
f11fae8ee1e4
Changed to 2's complement bitwise ops. Got rid of ZABS etc.
Guido van Rossum <guido@python.org>
parents:
546
diff
changeset
|
3938 |
|
f11fae8ee1e4
Changed to 2's complement bitwise ops. Got rid of ZABS etc.
Guido van Rossum <guido@python.org>
parents:
546
diff
changeset
|
3939 /* Bitwise and/xor/or operations */ |
|
f11fae8ee1e4
Changed to 2's complement bitwise ops. Got rid of ZABS etc.
Guido van Rossum <guido@python.org>
parents:
546
diff
changeset
|
3940 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3941 static PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
3942 long_bitwise(PyLongObject *a, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3943 int op, /* '&', '|', '^' */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3944 PyLongObject *b) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3945 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3946 int nega, negb, negz; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3947 Py_ssize_t size_a, size_b, size_z, i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3948 PyLongObject *z; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3949 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3950 /* Bitwise operations for negative numbers operate as though |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3951 on a two's complement representation. So convert arguments |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3952 from sign-magnitude to two's complement, and convert the |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3953 result back to sign-magnitude at the end. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3954 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3955 /* If a is negative, replace it by its two's complement. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3956 size_a = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3957 nega = Py_SIZE(a) < 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3958 if (nega) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3959 z = _PyLong_New(size_a); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3960 if (z == NULL) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3961 return NULL; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3962 v_complement(z->ob_digit, a->ob_digit, size_a); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3963 a = z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3964 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3965 else |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3966 /* Keep reference count consistent. */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3967 Py_INCREF(a); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3968 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3969 /* Same for b. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3970 size_b = ABS(Py_SIZE(b)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3971 negb = Py_SIZE(b) < 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3972 if (negb) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3973 z = _PyLong_New(size_b); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3974 if (z == NULL) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3975 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3976 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3977 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3978 v_complement(z->ob_digit, b->ob_digit, size_b); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3979 b = z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3980 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3981 else |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3982 Py_INCREF(b); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3983 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3984 /* Swap a and b if necessary to ensure size_a >= size_b. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3985 if (size_a < size_b) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3986 z = a; a = b; b = z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3987 size_z = size_a; size_a = size_b; size_b = size_z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3988 negz = nega; nega = negb; negb = negz; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3989 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3990 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3991 /* JRH: The original logic here was to allocate the result value (z) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3992 as the longer of the two operands. However, there are some cases |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3993 where the result is guaranteed to be shorter than that: AND of two |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3994 positives, OR of two negatives: use the shorter number. AND with |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3995 mixed signs: use the positive number. OR with mixed signs: use the |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3996 negative number. |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3997 */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3998 switch (op) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3999 case '^': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4000 negz = nega ^ negb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4001 size_z = size_a; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4002 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4003 case '&': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4004 negz = nega & negb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4005 size_z = negb ? size_a : size_b; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4006 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4007 case '|': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4008 negz = nega | negb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4009 size_z = negb ? size_b : size_a; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4010 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4011 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4012 PyErr_BadArgument(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4013 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4014 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4015 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4016 /* We allow an extra digit if z is negative, to make sure that |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4017 the final two's complement of z doesn't overflow. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4018 z = _PyLong_New(size_z + negz); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4019 if (z == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4020 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4021 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4022 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4023 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4024 |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4025 /* Compute digits for overlap of a and b. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4026 switch(op) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4027 case '&': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4028 for (i = 0; i < size_b; ++i) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4029 z->ob_digit[i] = a->ob_digit[i] & b->ob_digit[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4030 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4031 case '|': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4032 for (i = 0; i < size_b; ++i) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4033 z->ob_digit[i] = a->ob_digit[i] | b->ob_digit[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4034 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4035 case '^': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4036 for (i = 0; i < size_b; ++i) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4037 z->ob_digit[i] = a->ob_digit[i] ^ b->ob_digit[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4038 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4039 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4040 PyErr_BadArgument(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4041 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4042 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4043 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4044 /* Copy any remaining digits of a, inverting if necessary. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4045 if (op == '^' && negb) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4046 for (; i < size_z; ++i) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4047 z->ob_digit[i] = a->ob_digit[i] ^ PyLong_MASK; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4048 else if (i < size_z) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4049 memcpy(&z->ob_digit[i], &a->ob_digit[i], |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4050 (size_z-i)*sizeof(digit)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4051 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4052 /* Complement result if negative. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4053 if (negz) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4054 Py_SIZE(z) = -(Py_SIZE(z)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4055 z->ob_digit[size_z] = PyLong_MASK; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4056 v_complement(z->ob_digit, z->ob_digit, size_z+1); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4057 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4058 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4059 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4060 Py_DECREF(b); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4061 return (PyObject *)maybe_small_long(long_normalize(z)); |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4062 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4063 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4064 static PyObject * |
| 43313 | 4065 long_and(PyObject *a, PyObject *b) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4066 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4067 PyObject *c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4068 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4069 c = long_bitwise((PyLongObject*)a, '&', (PyLongObject*)b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4070 return c; |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4071 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4072 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4073 static PyObject * |
| 43313 | 4074 long_xor(PyObject *a, PyObject *b) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4075 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4076 PyObject *c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4077 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4078 c = long_bitwise((PyLongObject*)a, '^', (PyLongObject*)b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4079 return c; |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4080 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4081 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4082 static PyObject * |
| 43313 | 4083 long_or(PyObject *a, PyObject *b) |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4084 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4085 PyObject *c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4086 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4087 c = long_bitwise((PyLongObject*)a, '|', (PyLongObject*)b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4088 return c; |
| 242 | 4089 } |
| 4090 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4091 static PyObject * |
|
26291
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4092 long_long(PyObject *v) |
|
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4093 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4094 if (PyLong_CheckExact(v)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4095 Py_INCREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4096 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4097 v = _PyLong_Copy((PyLongObject *)v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4098 return v; |
|
26291
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4099 } |
|
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4100 |
|
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4101 static PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
4102 long_float(PyObject *v) |
|
1049
2ed511171809
Made builtins int(), long(), float(), oct() and hex() more generic.
Guido van Rossum <guido@python.org>
parents:
958
diff
changeset
|
4103 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4104 double result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4105 result = PyLong_AsDouble(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4106 if (result == -1.0 && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4107 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4108 return PyFloat_FromDouble(result); |
|
1049
2ed511171809
Made builtins int(), long(), float(), oct() and hex() more generic.
Guido van Rossum <guido@python.org>
parents:
958
diff
changeset
|
4109 } |
|
2ed511171809
Made builtins int(), long(), float(), oct() and hex() more generic.
Guido van Rossum <guido@python.org>
parents:
958
diff
changeset
|
4110 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4111 static PyObject * |
|
19552
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4112 long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds); |
|
1049
2ed511171809
Made builtins int(), long(), float(), oct() and hex() more generic.
Guido van Rossum <guido@python.org>
parents:
958
diff
changeset
|
4113 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4114 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4115 long_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4116 { |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4117 PyObject *obase = NULL, *x = NULL; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4118 long base; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4119 int overflow; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4120 static char *kwlist[] = {"x", "base", 0}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4121 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4122 if (type != &PyLong_Type) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4123 return long_subtype_new(type, args, kwds); /* Wimp out */ |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4124 if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OO:int", kwlist, |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4125 &x, &obase)) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4126 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4127 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4128 return PyLong_FromLong(0L); |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4129 if (obase == NULL) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4130 return PyNumber_Long(x); |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4131 |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4132 base = PyLong_AsLongAndOverflow(obase, &overflow); |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4133 if (base == -1 && PyErr_Occurred()) |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4134 return NULL; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4135 if (overflow || (base != 0 && base < 2) || base > 36) { |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4136 PyErr_SetString(PyExc_ValueError, |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4137 "int() arg 2 must be >= 2 and <= 36"); |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4138 return NULL; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4139 } |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4140 |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4141 if (PyUnicode_Check(x)) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4142 return PyLong_FromUnicode(PyUnicode_AS_UNICODE(x), |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4143 PyUnicode_GET_SIZE(x), |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4144 (int)base); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4145 else if (PyByteArray_Check(x) || PyBytes_Check(x)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4146 /* Since PyLong_FromString doesn't have a length parameter, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4147 * check here for possible NULs in the string. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4148 char *string; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4149 Py_ssize_t size = Py_SIZE(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4150 if (PyByteArray_Check(x)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4151 string = PyByteArray_AS_STRING(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4152 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4153 string = PyBytes_AS_STRING(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4154 if (strlen(string) != (size_t)size) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4155 /* We only see this if there's a null byte in x, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4156 x is a bytes or buffer, *and* a base is given. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4157 PyErr_Format(PyExc_ValueError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4158 "invalid literal for int() with base %d: %R", |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4159 (int)base, x); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4160 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4161 } |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4162 return PyLong_FromString(string, NULL, (int)base); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4163 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4164 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4165 PyErr_SetString(PyExc_TypeError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4166 "int() can't convert non-string with explicit base"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4167 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4168 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4169 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4170 |
|
19552
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4171 /* Wimpy, slow approach to tp_new calls for subtypes of long: |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4172 first create a regular long from whatever arguments we got, |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4173 then allocate a subtype instance and initialize it from |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4174 the regular long. The regular long is then thrown away. |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4175 */ |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4176 static PyObject * |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4177 long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4178 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4179 PyLongObject *tmp, *newobj; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4180 Py_ssize_t i, n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4181 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4182 assert(PyType_IsSubtype(type, &PyLong_Type)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4183 tmp = (PyLongObject *)long_new(&PyLong_Type, args, kwds); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4184 if (tmp == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4185 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4186 assert(PyLong_CheckExact(tmp)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4187 n = Py_SIZE(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4188 if (n < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4189 n = -n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4190 newobj = (PyLongObject *)type->tp_alloc(type, n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4191 if (newobj == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4192 Py_DECREF(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4193 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4194 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4195 assert(PyLong_Check(newobj)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4196 Py_SIZE(newobj) = Py_SIZE(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4197 for (i = 0; i < n; i++) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4198 newobj->ob_digit[i] = tmp->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4199 Py_DECREF(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4200 return (PyObject *)newobj; |
|
19552
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4201 } |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4202 |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4203 static PyObject * |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4204 long_getnewargs(PyLongObject *v) |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4205 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4206 return Py_BuildValue("(N)", _PyLong_Copy(v)); |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4207 } |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4208 |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4209 static PyObject * |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4210 long_get0(PyLongObject *v, void *context) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4211 return PyLong_FromLong(0L); |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4212 } |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4213 |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4214 static PyObject * |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4215 long_get1(PyLongObject *v, void *context) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4216 return PyLong_FromLong(1L); |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4217 } |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4218 |
|
42753
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4219 static PyObject * |
|
42817
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4220 long__format__(PyObject *self, PyObject *args) |
|
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4221 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4222 PyObject *format_spec; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4223 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4224 if (!PyArg_ParseTuple(args, "U:__format__", &format_spec)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4225 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4226 return _PyLong_FormatAdvanced(self, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4227 PyUnicode_AS_UNICODE(format_spec), |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4228 PyUnicode_GET_SIZE(format_spec)); |
|
42817
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4229 } |
|
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4230 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4231 /* Return a pair (q, r) such that a = b * q + r, and |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4232 abs(r) <= abs(b)/2, with equality possible only if q is even. |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4233 In other words, q == a / b, rounded to the nearest integer using |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4234 round-half-to-even. */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4235 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4236 PyObject * |
|
62154
0d9347934cc5
Fix naming inconsistency.
Mark Dickinson <dickinsm@gmail.com>
parents:
61940
diff
changeset
|
4237 _PyLong_DivmodNear(PyObject *a, PyObject *b) |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4238 { |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4239 PyLongObject *quo = NULL, *rem = NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4240 PyObject *one = NULL, *twice_rem, *result, *temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4241 int cmp, quo_is_odd, quo_is_neg; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4242 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4243 /* Equivalent Python code: |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4244 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4245 def divmod_near(a, b): |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4246 q, r = divmod(a, b) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4247 # round up if either r / b > 0.5, or r / b == 0.5 and q is odd. |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4248 # The expression r / b > 0.5 is equivalent to 2 * r > b if b is |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4249 # positive, 2 * r < b if b negative. |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4250 greater_than_half = 2*r > b if b > 0 else 2*r < b |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4251 exactly_half = 2*r == b |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4252 if greater_than_half or exactly_half and q % 2 == 1: |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4253 q += 1 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4254 r -= b |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4255 return q, r |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4256 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4257 */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4258 if (!PyLong_Check(a) || !PyLong_Check(b)) { |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4259 PyErr_SetString(PyExc_TypeError, |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4260 "non-integer arguments in division"); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4261 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4262 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4263 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4264 /* Do a and b have different signs? If so, quotient is negative. */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4265 quo_is_neg = (Py_SIZE(a) < 0) != (Py_SIZE(b) < 0); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4266 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4267 one = PyLong_FromLong(1L); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4268 if (one == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4269 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4270 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4271 if (long_divrem((PyLongObject*)a, (PyLongObject*)b, &quo, &rem) < 0) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4272 goto error; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4273 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4274 /* compare twice the remainder with the divisor, to see |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4275 if we need to adjust the quotient and remainder */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4276 twice_rem = long_lshift((PyObject *)rem, one); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4277 if (twice_rem == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4278 goto error; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4279 if (quo_is_neg) { |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4280 temp = long_neg((PyLongObject*)twice_rem); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4281 Py_DECREF(twice_rem); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4282 twice_rem = temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4283 if (twice_rem == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4284 goto error; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4285 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4286 cmp = long_compare((PyLongObject *)twice_rem, (PyLongObject *)b); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4287 Py_DECREF(twice_rem); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4288 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4289 quo_is_odd = Py_SIZE(quo) != 0 && ((quo->ob_digit[0] & 1) != 0); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4290 if ((Py_SIZE(b) < 0 ? cmp < 0 : cmp > 0) || (cmp == 0 && quo_is_odd)) { |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4291 /* fix up quotient */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4292 if (quo_is_neg) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4293 temp = long_sub(quo, (PyLongObject *)one); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4294 else |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4295 temp = long_add(quo, (PyLongObject *)one); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4296 Py_DECREF(quo); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4297 quo = (PyLongObject *)temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4298 if (quo == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4299 goto error; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4300 /* and remainder */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4301 if (quo_is_neg) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4302 temp = long_add(rem, (PyLongObject *)b); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4303 else |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4304 temp = long_sub(rem, (PyLongObject *)b); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4305 Py_DECREF(rem); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4306 rem = (PyLongObject *)temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4307 if (rem == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4308 goto error; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4309 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4310 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4311 result = PyTuple_New(2); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4312 if (result == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4313 goto error; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4314 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4315 /* PyTuple_SET_ITEM steals references */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4316 PyTuple_SET_ITEM(result, 0, (PyObject *)quo); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4317 PyTuple_SET_ITEM(result, 1, (PyObject *)rem); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4318 Py_DECREF(one); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4319 return result; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4320 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4321 error: |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4322 Py_XDECREF(quo); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4323 Py_XDECREF(rem); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4324 Py_XDECREF(one); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4325 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4326 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4327 |
|
42817
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4328 static PyObject * |
|
42753
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4329 long_round(PyObject *self, PyObject *args) |
|
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4330 { |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4331 PyObject *o_ndigits=NULL, *temp, *result, *ndigits; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4332 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4333 /* To round an integer m to the nearest 10**n (n positive), we make use of |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4334 * the divmod_near operation, defined by: |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4335 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4336 * divmod_near(a, b) = (q, r) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4337 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4338 * where q is the nearest integer to the quotient a / b (the |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4339 * nearest even integer in the case of a tie) and r == a - q * b. |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4340 * Hence q * b = a - r is the nearest multiple of b to a, |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4341 * preferring even multiples in the case of a tie. |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4342 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4343 * So the nearest multiple of 10**n to m is: |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4344 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4345 * m - divmod_near(m, 10**n)[1]. |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4346 */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4347 if (!PyArg_ParseTuple(args, "|O", &o_ndigits)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4348 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4349 if (o_ndigits == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4350 return long_long(self); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4351 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4352 ndigits = PyNumber_Index(o_ndigits); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4353 if (ndigits == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4354 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4355 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4356 /* if ndigits >= 0 then no rounding is necessary; return self unchanged */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4357 if (Py_SIZE(ndigits) >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4358 Py_DECREF(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4359 return long_long(self); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4360 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4361 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4362 /* result = self - divmod_near(self, 10 ** -ndigits)[1] */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4363 temp = long_neg((PyLongObject*)ndigits); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4364 Py_DECREF(ndigits); |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4365 ndigits = temp; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4366 if (ndigits == NULL) |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4367 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4368 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4369 result = PyLong_FromLong(10L); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4370 if (result == NULL) { |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4371 Py_DECREF(ndigits); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4372 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4373 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4374 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4375 temp = long_pow(result, ndigits, Py_None); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4376 Py_DECREF(ndigits); |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4377 Py_DECREF(result); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4378 result = temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4379 if (result == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4380 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4381 |
|
62154
0d9347934cc5
Fix naming inconsistency.
Mark Dickinson <dickinsm@gmail.com>
parents:
61940
diff
changeset
|
4382 temp = _PyLong_DivmodNear(self, result); |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4383 Py_DECREF(result); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4384 result = temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4385 if (result == NULL) |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4386 return NULL; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4387 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4388 temp = long_sub((PyLongObject *)self, |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4389 (PyLongObject *)PyTuple_GET_ITEM(result, 1)); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4390 Py_DECREF(result); |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4391 result = temp; |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4392 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4393 return result; |
|
42753
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4394 } |
|
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4395 |
|
47466
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4396 static PyObject * |
|
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4397 long_sizeof(PyLongObject *v) |
|
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4398 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4399 Py_ssize_t res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4400 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4401 res = offsetof(PyLongObject, ob_digit) + ABS(Py_SIZE(v))*sizeof(digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4402 return PyLong_FromSsize_t(res); |
|
47466
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4403 } |
|
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4404 |
|
50207
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4405 static PyObject * |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4406 long_bit_length(PyLongObject *v) |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4407 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4408 PyLongObject *result, *x, *y; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4409 Py_ssize_t ndigits, msd_bits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4410 digit msd; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4411 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4412 assert(v != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4413 assert(PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4414 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4415 ndigits = ABS(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4416 if (ndigits == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4417 return PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4418 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4419 msd = v->ob_digit[ndigits-1]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4420 while (msd >= 32) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4421 msd_bits += 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4422 msd >>= 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4423 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4424 msd_bits += (long)(BitLengthTable[msd]); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4425 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4426 if (ndigits <= PY_SSIZE_T_MAX/PyLong_SHIFT) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4427 return PyLong_FromSsize_t((ndigits-1)*PyLong_SHIFT + msd_bits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4428 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4429 /* expression above may overflow; use Python integers instead */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4430 result = (PyLongObject *)PyLong_FromSsize_t(ndigits - 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4431 if (result == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4432 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4433 x = (PyLongObject *)PyLong_FromLong(PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4434 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4435 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4436 y = (PyLongObject *)long_mul(result, x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4437 Py_DECREF(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4438 if (y == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4439 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4440 Py_DECREF(result); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4441 result = y; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4442 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4443 x = (PyLongObject *)PyLong_FromLong((long)msd_bits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4444 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4445 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4446 y = (PyLongObject *)long_add(result, x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4447 Py_DECREF(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4448 if (y == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4449 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4450 Py_DECREF(result); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4451 result = y; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4452 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4453 return (PyObject *)result; |
|
50207
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4454 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4455 error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4456 Py_DECREF(result); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4457 return NULL; |
|
50207
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4458 } |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4459 |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4460 PyDoc_STRVAR(long_bit_length_doc, |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4461 "int.bit_length() -> int\n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4462 \n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4463 Number of bits necessary to represent self in binary.\n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4464 >>> bin(37)\n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4465 '0b100101'\n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4466 >>> (37).bit_length()\n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4467 6"); |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4468 |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4469 #if 0 |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4470 static PyObject * |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4471 long_is_finite(PyObject *v) |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4472 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4473 Py_RETURN_TRUE; |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4474 } |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4475 #endif |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4476 |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4477 |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4478 static PyObject * |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4479 long_to_bytes(PyLongObject *v, PyObject *args, PyObject *kwds) |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4480 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4481 PyObject *byteorder_str; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4482 PyObject *is_signed_obj = NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4483 Py_ssize_t length; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4484 int little_endian; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4485 int is_signed; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4486 PyObject *bytes; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4487 static char *kwlist[] = {"length", "byteorder", "signed", NULL}; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4488 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4489 if (!PyArg_ParseTupleAndKeywords(args, kwds, "nU|O:to_bytes", kwlist, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4490 &length, &byteorder_str, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4491 &is_signed_obj)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4492 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4493 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4494 if (args != NULL && Py_SIZE(args) > 2) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4495 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4496 "'signed' is a keyword-only argument"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4497 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4498 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4499 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4500 if (!PyUnicode_CompareWithASCIIString(byteorder_str, "little")) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4501 little_endian = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4502 else if (!PyUnicode_CompareWithASCIIString(byteorder_str, "big")) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4503 little_endian = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4504 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4505 PyErr_SetString(PyExc_ValueError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4506 "byteorder must be either 'little' or 'big'"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4507 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4508 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4509 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4510 if (is_signed_obj != NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4511 int cmp = PyObject_IsTrue(is_signed_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4512 if (cmp < 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4513 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4514 is_signed = cmp ? 1 : 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4515 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4516 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4517 /* If the signed argument was omitted, use False as the |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4518 default. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4519 is_signed = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4520 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4521 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4522 if (length < 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4523 PyErr_SetString(PyExc_ValueError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4524 "length argument must be non-negative"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4525 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4526 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4527 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4528 bytes = PyBytes_FromStringAndSize(NULL, length); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4529 if (bytes == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4530 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4531 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4532 if (_PyLong_AsByteArray(v, (unsigned char *)PyBytes_AS_STRING(bytes), |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4533 length, little_endian, is_signed) < 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4534 Py_DECREF(bytes); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4535 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4536 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4537 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4538 return bytes; |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4539 } |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4540 |
|
58596
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4541 PyDoc_STRVAR(long_to_bytes_doc, |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4542 "int.to_bytes(length, byteorder, *, signed=False) -> bytes\n\ |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4543 \n\ |
|
58596
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4544 Return an array of bytes representing an integer.\n\ |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4545 \n\ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4546 The integer is represented using length bytes. An OverflowError is\n\ |
|
58596
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4547 raised if the integer is not representable with the given number of\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4548 bytes.\n\ |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4549 \n\ |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4550 The byteorder argument determines the byte order used to represent the\n\ |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4551 integer. If byteorder is 'big', the most significant byte is at the\n\ |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4552 beginning of the byte array. If byteorder is 'little', the most\n\ |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4553 significant byte is at the end of the byte array. To request the native\n\ |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4554 byte order of the host system, use `sys.byteorder' as the byte order value.\n\ |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4555 \n\ |
|
58596
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4556 The signed keyword-only argument determines whether two's complement is\n\ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4557 used to represent the integer. If signed is False and a negative integer\n\ |
|
58596
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4558 is given, an OverflowError is raised."); |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4559 |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4560 static PyObject * |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4561 long_from_bytes(PyTypeObject *type, PyObject *args, PyObject *kwds) |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4562 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4563 PyObject *byteorder_str; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4564 PyObject *is_signed_obj = NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4565 int little_endian; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4566 int is_signed; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4567 PyObject *obj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4568 PyObject *bytes; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4569 PyObject *long_obj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4570 static char *kwlist[] = {"bytes", "byteorder", "signed", NULL}; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4571 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4572 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OU|O:from_bytes", kwlist, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4573 &obj, &byteorder_str, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4574 &is_signed_obj)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4575 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4576 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4577 if (args != NULL && Py_SIZE(args) > 2) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4578 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4579 "'signed' is a keyword-only argument"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4580 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4581 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4582 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4583 if (!PyUnicode_CompareWithASCIIString(byteorder_str, "little")) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4584 little_endian = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4585 else if (!PyUnicode_CompareWithASCIIString(byteorder_str, "big")) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4586 little_endian = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4587 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4588 PyErr_SetString(PyExc_ValueError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4589 "byteorder must be either 'little' or 'big'"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4590 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4591 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4592 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4593 if (is_signed_obj != NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4594 int cmp = PyObject_IsTrue(is_signed_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4595 if (cmp < 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4596 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4597 is_signed = cmp ? 1 : 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4598 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4599 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4600 /* If the signed argument was omitted, use False as the |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4601 default. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4602 is_signed = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4603 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4604 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4605 bytes = PyObject_Bytes(obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4606 if (bytes == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4607 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4608 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4609 long_obj = _PyLong_FromByteArray( |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4610 (unsigned char *)PyBytes_AS_STRING(bytes), Py_SIZE(bytes), |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4611 little_endian, is_signed); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4612 Py_DECREF(bytes); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4613 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4614 /* If from_bytes() was used on subclass, allocate new subclass |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4615 * instance, initialize it with decoded long value and return it. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4616 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4617 if (type != &PyLong_Type && PyType_IsSubtype(type, &PyLong_Type)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4618 PyLongObject *newobj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4619 int i; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4620 Py_ssize_t n = ABS(Py_SIZE(long_obj)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4621 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4622 newobj = (PyLongObject *)type->tp_alloc(type, n); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4623 if (newobj == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4624 Py_DECREF(long_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4625 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4626 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4627 assert(PyLong_Check(newobj)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4628 Py_SIZE(newobj) = Py_SIZE(long_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4629 for (i = 0; i < n; i++) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4630 newobj->ob_digit[i] = |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4631 ((PyLongObject *)long_obj)->ob_digit[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4632 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4633 Py_DECREF(long_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4634 return (PyObject *)newobj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4635 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4636 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4637 return long_obj; |
|
58223
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4638 } |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4639 |
|
58596
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4640 PyDoc_STRVAR(long_from_bytes_doc, |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4641 "int.from_bytes(bytes, byteorder, *, signed=False) -> int\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4642 \n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4643 Return the integer represented by the given array of bytes.\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4644 \n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4645 The bytes argument must either support the buffer protocol or be an\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4646 iterable object producing bytes. Bytes and bytearray are examples of\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4647 built-in objects that support the buffer protocol.\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4648 \n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4649 The byteorder argument determines the byte order used to represent the\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4650 integer. If byteorder is 'big', the most significant byte is at the\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4651 beginning of the byte array. If byteorder is 'little', the most\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4652 significant byte is at the end of the byte array. To request the native\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4653 byte order of the host system, use `sys.byteorder' as the byte order value.\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4654 \n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4655 The signed keyword-only argument indicates whether two's complement is\n\ |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4656 used to represent the integer."); |
|
5a7d7eeb88c1
Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions.
Mark Dickinson <dickinsm@gmail.com>
parents:
58582
diff
changeset
|
4657 |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4658 static PyMethodDef long_methods[] = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4659 {"conjugate", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4660 "Returns self, the complex conjugate of any int."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4661 {"bit_length", (PyCFunction)long_bit_length, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4662 long_bit_length_doc}, |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4663 #if 0 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4664 {"is_finite", (PyCFunction)long_is_finite, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4665 "Returns always True."}, |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4666 #endif |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4667 {"to_bytes", (PyCFunction)long_to_bytes, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4668 METH_VARARGS|METH_KEYWORDS, long_to_bytes_doc}, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4669 {"from_bytes", (PyCFunction)long_from_bytes, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4670 METH_VARARGS|METH_KEYWORDS|METH_CLASS, long_from_bytes_doc}, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4671 {"__trunc__", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4672 "Truncating an Integral returns itself."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4673 {"__floor__", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4674 "Flooring an Integral returns itself."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4675 {"__ceil__", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4676 "Ceiling of an Integral returns itself."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4677 {"__round__", (PyCFunction)long_round, METH_VARARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4678 "Rounding an Integral returns itself.\n" |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4679 "Rounding with an ndigits argument also returns an integer."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4680 {"__getnewargs__", (PyCFunction)long_getnewargs, METH_NOARGS}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4681 {"__format__", (PyCFunction)long__format__, METH_VARARGS}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4682 {"__sizeof__", (PyCFunction)long_sizeof, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4683 "Returns size in memory, in bytes"}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4684 {NULL, NULL} /* sentinel */ |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4685 }; |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4686 |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4687 static PyGetSetDef long_getset[] = { |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4688 {"real", |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4689 (getter)long_long, (setter)NULL, |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4690 "the real part of a complex number", |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4691 NULL}, |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4692 {"imag", |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4693 (getter)long_get0, (setter)NULL, |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4694 "the imaginary part of a complex number", |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4695 NULL}, |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4696 {"numerator", |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4697 (getter)long_long, (setter)NULL, |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4698 "the numerator of a rational number in lowest terms", |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4699 NULL}, |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4700 {"denominator", |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4701 (getter)long_get1, (setter)NULL, |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4702 "the denominator of a rational number in lowest terms", |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4703 NULL}, |
|
42417
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4704 {NULL} /* Sentinel */ |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4705 }; |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4706 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23248
diff
changeset
|
4707 PyDoc_STRVAR(long_doc, |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4708 "int(x[, base]) -> integer\n\ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4709 \n\ |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4710 Convert a string or number to an integer, if possible. A floating\n\ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4711 point argument will be truncated towards zero (this does not include a\n\ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4712 string representation of a floating point number!) When converting a\n\ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4713 string, use the optional base. It is an error to supply a base when\n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23248
diff
changeset
|
4714 converting a non-string."); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4715 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4716 static PyNumberMethods long_as_number = { |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4717 (binaryfunc)long_add, /*nb_add*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4718 (binaryfunc)long_sub, /*nb_subtract*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4719 (binaryfunc)long_mul, /*nb_multiply*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4720 long_mod, /*nb_remainder*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4721 long_divmod, /*nb_divmod*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4722 long_pow, /*nb_power*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4723 (unaryfunc)long_neg, /*nb_negative*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4724 (unaryfunc)long_long, /*tp_positive*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4725 (unaryfunc)long_abs, /*tp_absolute*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4726 (inquiry)long_bool, /*tp_bool*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4727 (unaryfunc)long_invert, /*nb_invert*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4728 long_lshift, /*nb_lshift*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4729 (binaryfunc)long_rshift, /*nb_rshift*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4730 long_and, /*nb_and*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4731 long_xor, /*nb_xor*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4732 long_or, /*nb_or*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4733 long_long, /*nb_int*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4734 0, /*nb_reserved*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4735 long_float, /*nb_float*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4736 0, /* nb_inplace_add */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4737 0, /* nb_inplace_subtract */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4738 0, /* nb_inplace_multiply */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4739 0, /* nb_inplace_remainder */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4740 0, /* nb_inplace_power */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4741 0, /* nb_inplace_lshift */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4742 0, /* nb_inplace_rshift */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4743 0, /* nb_inplace_and */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4744 0, /* nb_inplace_xor */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4745 0, /* nb_inplace_or */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4746 long_div, /* nb_floor_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4747 long_true_divide, /* nb_true_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4748 0, /* nb_inplace_floor_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4749 0, /* nb_inplace_true_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4750 long_long, /* nb_index */ |
| 230 | 4751 }; |
| 4752 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4753 PyTypeObject PyLong_Type = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4754 PyVarObject_HEAD_INIT(&PyType_Type, 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4755 "int", /* tp_name */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4756 offsetof(PyLongObject, ob_digit), /* tp_basicsize */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4757 sizeof(digit), /* tp_itemsize */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4758 long_dealloc, /* tp_dealloc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4759 0, /* tp_print */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4760 0, /* tp_getattr */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4761 0, /* tp_setattr */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4762 0, /* tp_reserved */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4763 long_to_decimal_string, /* tp_repr */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4764 &long_as_number, /* tp_as_number */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4765 0, /* tp_as_sequence */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4766 0, /* tp_as_mapping */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4767 (hashfunc)long_hash, /* tp_hash */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4768 0, /* tp_call */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4769 long_to_decimal_string, /* tp_str */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4770 PyObject_GenericGetAttr, /* tp_getattro */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4771 0, /* tp_setattro */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4772 0, /* tp_as_buffer */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4773 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4774 Py_TPFLAGS_LONG_SUBCLASS, /* tp_flags */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4775 long_doc, /* tp_doc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4776 0, /* tp_traverse */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4777 0, /* tp_clear */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4778 long_richcompare, /* tp_richcompare */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4779 0, /* tp_weaklistoffset */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4780 0, /* tp_iter */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4781 0, /* tp_iternext */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4782 long_methods, /* tp_methods */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4783 0, /* tp_members */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4784 long_getset, /* tp_getset */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4785 0, /* tp_base */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4786 0, /* tp_dict */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4787 0, /* tp_descr_get */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4788 0, /* tp_descr_set */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4789 0, /* tp_dictoffset */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4790 0, /* tp_init */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4791 0, /* tp_alloc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4792 long_new, /* tp_new */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4793 PyObject_Del, /* tp_free */ |
| 230 | 4794 }; |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4795 |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4796 static PyTypeObject Int_InfoType; |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4797 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4798 PyDoc_STRVAR(int_info__doc__, |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4799 "sys.int_info\n\ |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4800 \n\ |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4801 A struct sequence that holds information about Python's\n\ |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4802 internal representation of integers. The attributes are read only."); |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4803 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4804 static PyStructSequence_Field int_info_fields[] = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4805 {"bits_per_digit", "size of a digit in bits"}, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4806 {"sizeof_digit", "size in bytes of the C type used to represent a digit"}, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4807 {NULL, NULL} |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4808 }; |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4809 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4810 static PyStructSequence_Desc int_info_desc = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4811 "sys.int_info", /* name */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4812 int_info__doc__, /* doc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4813 int_info_fields, /* fields */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4814 2 /* number of fields */ |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4815 }; |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4816 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4817 PyObject * |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4818 PyLong_GetInfo(void) |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4819 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4820 PyObject* int_info; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4821 int field = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4822 int_info = PyStructSequence_New(&Int_InfoType); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4823 if (int_info == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4824 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4825 PyStructSequence_SET_ITEM(int_info, field++, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4826 PyLong_FromLong(PyLong_SHIFT)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4827 PyStructSequence_SET_ITEM(int_info, field++, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4828 PyLong_FromLong(sizeof(digit))); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4829 if (PyErr_Occurred()) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4830 Py_CLEAR(int_info); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4831 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4832 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4833 return int_info; |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4834 } |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4835 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4836 int |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4837 _PyLong_Init(void) |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4838 { |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4839 #if NSMALLNEGINTS + NSMALLPOSINTS > 0 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4840 int ival, size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4841 PyLongObject *v = small_ints; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4842 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4843 for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++, v++) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4844 size = (ival < 0) ? -1 : ((ival == 0) ? 0 : 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4845 if (Py_TYPE(v) == &PyLong_Type) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4846 /* The element is already initialized, most likely |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4847 * the Python interpreter was initialized before. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4848 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4849 Py_ssize_t refcnt; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4850 PyObject* op = (PyObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4851 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4852 refcnt = Py_REFCNT(op) < 0 ? 0 : Py_REFCNT(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4853 _Py_NewReference(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4854 /* _Py_NewReference sets the ref count to 1 but |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4855 * the ref count might be larger. Set the refcnt |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4856 * to the original refcnt + 1 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4857 Py_REFCNT(op) = refcnt + 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4858 assert(Py_SIZE(op) == size); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4859 assert(v->ob_digit[0] == abs(ival)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4860 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4861 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4862 PyObject_INIT(v, &PyLong_Type); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4863 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4864 Py_SIZE(v) = size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4865 v->ob_digit[0] = abs(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4866 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4867 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4868 /* initialize int_info */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4869 if (Int_InfoType.tp_name == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4870 PyStructSequence_InitType(&Int_InfoType, &int_info_desc); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4871 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4872 return 1; |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4873 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4874 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4875 void |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4876 PyLong_Fini(void) |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4877 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4878 /* Integers are currently statically allocated. Py_DECREF is not |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4879 needed, but Python must forget about the reference or multiple |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4880 reinitializations will fail. */ |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4881 #if NSMALLNEGINTS + NSMALLPOSINTS > 0 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4882 int i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4883 PyLongObject *v = small_ints; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4884 for (i = 0; i < NSMALLNEGINTS + NSMALLPOSINTS; i++, v++) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4885 _Py_DEC_REFTOTAL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4886 _Py_ForgetReference((PyObject*)v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4887 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4888 #endif |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4889 } |