Mercurial > cpython-lru_cache-weakref
annotate Objects/longobject.c @ 79453:366c19bb5ca2
MERGE: Closes #16126: PyErr_Format format mismatch in _testcapimodule.c
| author | Jesus Cea <jcea@jcea.es> |
|---|---|
| date | Thu, 04 Oct 2012 16:07:03 +0200 |
| parents | bd5c74def80d |
| children | b728aac3bdb3 |
| 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 |
|
79069
5ed83105731d
Issue 15959: Fix type mismatch for quick{_neg}_int_allocs. Thanks Serhiy Storchaka.
Mark Dickinson <mdickinson@enthought.com>
parents:
79004
diff
changeset
|
33 Py_ssize_t quick_int_allocs, 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
|
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) { |
|
76440
cdcc6b489862
Issue #14630: Fix an incorrect access of ob_digit[0] for a zero instance of an int subclass.
Mark Dickinson <mdickinson@enthought.com>
parents:
72344
diff
changeset
|
159 sdigit ival = MEDIUM_VALUE(src); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
160 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
161 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
162 result = _PyLong_New(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
163 if (result != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
164 Py_SIZE(result) = Py_SIZE(src); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
165 while (--i >= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
166 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
|
167 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
168 return (PyObject *)result; |
|
19837
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
169 } |
|
5158e4789459
SF bug #460020: bug or feature: unicode() and subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19787
diff
changeset
|
170 |
| 230 | 171 /* Create a new long int object from a C long int */ |
| 172 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
173 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
174 PyLong_FromLong(long ival) |
| 230 | 175 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
176 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
177 unsigned long abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
178 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
|
179 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
180 int sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
181 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
182 CHECK_SMALL_INT(ival); |
|
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 if (ival < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
185 /* 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
|
186 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
|
187 abs_ival = 0U-(unsigned long)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
188 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
189 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
190 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
191 abs_ival = (unsigned long)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
192 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
193 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
194 /* Fast path for single-digit ints */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
195 if (!(abs_ival >> PyLong_SHIFT)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
196 v = _PyLong_New(1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
197 if (v) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
198 Py_SIZE(v) = sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
199 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
|
200 abs_ival, unsigned long, digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
201 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
202 return (PyObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
203 } |
|
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
|
204 |
|
53541
1a451ff6583c
Typo fix. Thanks Damien Diederen.
Mark Dickinson <dickinsm@gmail.com>
parents:
53290
diff
changeset
|
205 #if PyLong_SHIFT==15 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
206 /* 2 digits */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
207 if (!(abs_ival >> 2*PyLong_SHIFT)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
208 v = _PyLong_New(2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
209 if (v) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
210 Py_SIZE(v) = 2*sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
211 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
|
212 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
|
213 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
|
214 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
|
215 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
216 return (PyObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
217 } |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
218 #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
|
219 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
220 /* 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
|
221 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
222 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
223 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
224 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
225 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
226 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
227 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
228 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
229 Py_SIZE(v) = ndigits*sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
230 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
231 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
232 *p++ = Py_SAFE_DOWNCAST( |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
233 t & PyLong_MASK, unsigned long, digit); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
234 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
235 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
236 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
237 return (PyObject *)v; |
| 230 | 238 } |
| 239 | |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
240 /* 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
|
241 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
242 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
243 PyLong_FromUnsignedLong(unsigned long ival) |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
244 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
245 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
246 unsigned long t; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
247 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
248 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
249 if (ival < PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
250 return PyLong_FromLong(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
251 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
252 t = (unsigned long)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
253 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
254 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
255 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
256 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
257 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
258 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
259 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
260 Py_SIZE(v) = ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
261 while (ival) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
262 *p++ = (digit)(ival & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
263 ival >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
264 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
265 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
266 return (PyObject *)v; |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
267 } |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
268 |
|
254
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
269 /* 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
|
270 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
271 PyObject * |
|
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
272 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
|
273 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
274 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
275 double frac; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
276 int i, ndig, expo, neg; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
277 neg = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
278 if (Py_IS_INFINITY(dval)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
279 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
280 "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
|
281 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
282 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
283 if (Py_IS_NAN(dval)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
284 PyErr_SetString(PyExc_ValueError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
285 "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
|
286 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
287 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
288 if (dval < 0.0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
289 neg = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
290 dval = -dval; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
291 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
292 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
|
293 if (expo <= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
294 return PyLong_FromLong(0L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
295 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
|
296 v = _PyLong_New(ndig); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
297 if (v == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
298 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
299 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
|
300 for (i = ndig; --i >= 0; ) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
301 digit bits = (digit)frac; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
302 v->ob_digit[i] = bits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
303 frac = frac - (double)bits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
304 frac = ldexp(frac, PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
305 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
306 if (neg) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
307 Py_SIZE(v) = -(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
308 return (PyObject *)v; |
|
254
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
309 } |
|
71b0bd5ed162
Added dnewlongobject(), function to convert double to long int.
Guido van Rossum <guido@python.org>
parents:
250
diff
changeset
|
310 |
|
40450
cc992d75d5b3
Four months of trunk changes (including a few releases...)
Thomas Wouters <thomas@python.org>
parents:
40401
diff
changeset
|
311 /* 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
|
312 * 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
|
313 * 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
|
314 * 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
|
315 * (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
|
316 * 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
|
317 * 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
|
318 * 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
|
319 */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
320 #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
|
321 #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
|
322 |
|
73075
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
323 /* Get a C long int from a long int object or any object that has an __int__ |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
324 method. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
325 |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
326 On overflow, return -1 and set *overflow to 1 or -1 depending on the sign of |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
327 the result. Otherwise *overflow is 0. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
328 |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
329 For other errors (e.g., TypeError), return -1 and set an error condition. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
330 In this case *overflow will be 0. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
331 */ |
| 230 | 332 |
| 333 long | |
|
44158
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
334 PyLong_AsLongAndOverflow(PyObject *vv, int *overflow) |
| 230 | 335 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
336 /* This version by Tim Peters */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
337 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
338 unsigned long x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
339 long res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
340 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
341 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
342 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
|
343 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
344 *overflow = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
345 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
346 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
347 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
348 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
349 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
350 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
351 PyNumberMethods *nb; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
352 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
|
353 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
|
354 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
355 "an integer is required"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
356 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
357 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
358 vv = (*nb->nb_int) (vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
359 if (vv == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
360 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
361 do_decref = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
362 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
363 Py_DECREF(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
364 PyErr_SetString(PyExc_TypeError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
365 "nb_int should return int object"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
366 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
367 } |
|
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 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
370 res = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
371 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
372 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
373 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
374 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
375 case -1: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
376 res = -(sdigit)v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
377 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
378 case 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
379 res = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
380 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
381 case 1: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
382 res = v->ob_digit[0]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
383 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
384 default: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
385 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
386 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
387 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
388 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
389 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
390 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
391 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
392 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
393 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
|
394 if ((x >> PyLong_SHIFT) != prev) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
395 *overflow = sign; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
396 goto exit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
397 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
398 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
399 /* 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
|
400 * care (see comment above). |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
401 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
402 if (x <= (unsigned long)LONG_MAX) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
403 res = (long)x * sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
404 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
405 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
|
406 res = LONG_MIN; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
407 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
408 else { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
409 *overflow = sign; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
410 /* res is already set to -1 */ |
|
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 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
413 exit: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
414 if (do_decref) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
415 Py_DECREF(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
416 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
417 return res; |
| 230 | 418 } |
| 419 | |
|
73075
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
420 /* Get a C long int from a long int object or any object that has an __int__ |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
421 method. Return -1 and set an error if overflow occurs. */ |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
422 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
423 long |
|
44158
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
424 PyLong_AsLong(PyObject *obj) |
|
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
425 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
426 int overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
427 long result = PyLong_AsLongAndOverflow(obj, &overflow); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
428 if (overflow) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
429 /* 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
|
430 message for overflow == -1 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
431 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
432 "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
|
433 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
434 return result; |
|
44158
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
435 } |
|
81e0c0e2a8c1
Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow.
Martin v. Löwis <martin@v.loewis.de>
parents:
44099
diff
changeset
|
436 |
|
39610
3674f20ac781
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
Thomas Wouters <thomas@python.org>
parents:
39574
diff
changeset
|
437 /* 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
|
438 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
|
439 |
|
3674f20ac781
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
Thomas Wouters <thomas@python.org>
parents:
39574
diff
changeset
|
440 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
|
441 PyLong_AsSsize_t(PyObject *vv) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
442 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
443 size_t x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
444 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
445 int sign; |
|
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 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
448 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
449 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
450 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
451 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
452 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
|
453 return -1; |
|
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 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
456 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
457 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
458 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
459 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
|
460 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
461 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
|
462 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
463 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
464 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
465 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
466 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
467 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
468 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
469 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
470 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
471 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
|
472 if ((x >> PyLong_SHIFT) != prev) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
473 goto overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
474 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
475 /* 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
|
476 * extra care (see comment above). |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
477 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
478 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
|
479 return (Py_ssize_t)x * sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
480 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
481 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
|
482 return PY_SSIZE_T_MIN; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
483 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
484 /* else overflow */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
485 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
486 overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
487 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
488 "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
|
489 return -1; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
490 } |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
491 |
|
24777
696a284569e6
Fix comment for PyLong_AsUnsignedLong() to say that the return value
Guido van Rossum <guido@python.org>
parents:
24775
diff
changeset
|
492 /* 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
|
493 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
|
494 |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
495 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
|
496 PyLong_AsUnsignedLong(PyObject *vv) |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
497 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
498 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
499 unsigned long x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
500 Py_ssize_t i; |
|
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 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
503 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
504 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
505 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
506 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
507 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
|
508 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
509 } |
|
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 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
512 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
513 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
514 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
515 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
516 "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
|
517 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
518 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
519 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
520 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
521 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
|
522 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
523 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
524 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
525 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
|
526 if ((x >> PyLong_SHIFT) != prev) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
527 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
528 "python int too large to convert " |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
529 "to C unsigned long"); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
530 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
531 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
532 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
533 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
|
534 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
535 |
|
72344
d14f717b5e3d
Issue #12963: PyLong_AsSize_t() now returns (size_t)-1 in all error cases.
Stefan Krah <skrah@bytereef.org>
parents:
68586
diff
changeset
|
536 /* Get a C size_t from a long int object. Returns (size_t)-1 and sets |
|
d14f717b5e3d
Issue #12963: PyLong_AsSize_t() now returns (size_t)-1 in all error cases.
Stefan Krah <skrah@bytereef.org>
parents:
68586
diff
changeset
|
537 an error condition if overflow occurs. */ |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
538 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
539 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
|
540 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
|
541 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
542 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
543 size_t x, prev; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
544 Py_ssize_t i; |
|
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 if (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
547 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
548 return (size_t) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
549 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
550 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
551 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
|
552 return (size_t)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
553 } |
|
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 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
556 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
557 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
558 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
559 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
560 "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
|
561 return (size_t) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
562 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
563 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
564 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
565 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
|
566 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
567 while (--i >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
568 prev = x; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
569 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
|
570 if ((x >> PyLong_SHIFT) != prev) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
571 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
572 "Python int too large to convert to C size_t"); |
|
72344
d14f717b5e3d
Issue #12963: PyLong_AsSize_t() now returns (size_t)-1 in all error cases.
Stefan Krah <skrah@bytereef.org>
parents:
68586
diff
changeset
|
573 return (size_t) -1; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
574 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
575 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
576 return x; |
|
4870
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
577 } |
|
68f4134869db
Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong().
Guido van Rossum <guido@python.org>
parents:
4587
diff
changeset
|
578 |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
579 /* 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
|
580 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
|
581 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
582 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
|
583 _PyLong_AsUnsignedLongMask(PyObject *vv) |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
584 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
585 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
586 unsigned long x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
587 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
588 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
589 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
590 if (vv == NULL || !PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
591 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
592 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
593 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
594 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
595 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
596 switch (i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
597 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
598 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
|
599 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
600 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
601 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
602 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
603 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
604 i = -i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
605 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
606 while (--i >= 0) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
607 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
|
608 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
609 return x * sign; |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
610 } |
|
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
611 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
612 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
|
613 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
|
614 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
615 PyNumberMethods *nb; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
616 PyLongObject *lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
617 unsigned long val; |
|
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 if (op && PyLong_Check(op)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
620 return _PyLong_AsUnsignedLongMask(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
621 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
622 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
|
623 nb->nb_int == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
624 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
|
625 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
626 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
627 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
628 lo = (PyLongObject*) (*nb->nb_int) (op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
629 if (lo == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
630 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
631 if (PyLong_Check(lo)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
632 val = _PyLong_AsUnsignedLongMask((PyObject *)lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
633 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
634 if (PyErr_Occurred()) |
|
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 return val; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
637 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
638 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
639 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
640 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
641 PyErr_SetString(PyExc_TypeError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
642 "nb_int should return int object"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
643 return (unsigned long)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
644 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
645 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
646 |
|
27549
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
647 int |
|
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
648 _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
|
649 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
650 PyLongObject *v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
651 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
652 assert(v != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
653 assert(PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
654 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
655 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
|
656 } |
|
7fcdeeb16ec0
_PyLong_NumBits(): The definition of this was too specific to the quirky
Tim Peters <tim.peters@gmail.com>
parents:
27521
diff
changeset
|
657 |
|
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
|
658 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
|
659 _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
|
660 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
661 PyLongObject *v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
662 size_t result = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
663 Py_ssize_t ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
664 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
665 assert(v != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
666 assert(PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
667 ndigits = ABS(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
668 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
|
669 if (ndigits > 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
670 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
|
671 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
672 result = (ndigits - 1) * PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
673 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
|
674 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
675 do { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
676 ++result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
677 if (result == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
678 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
679 msd >>= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
680 } while (msd); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
681 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
682 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
|
683 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
684 Overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
685 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
|
686 "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
|
687 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
|
688 } |
|
0904d878b8f1
Added new private API function _PyLong_NumBits. This will be used at the
Tim Peters <tim.peters@gmail.com>
parents:
26867
diff
changeset
|
689 |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
690 PyObject * |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
691 _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
|
692 int little_endian, int is_signed) |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
693 { |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
694 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
|
695 int incr; /* direction to move pstartbyte */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
696 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
|
697 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
|
698 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
|
699 PyLongObject* v; /* result */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
700 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
|
701 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
702 if (n == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
703 return PyLong_FromLong(0L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
704 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
705 if (little_endian) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
706 pstartbyte = bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
707 pendbyte = bytes + n - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
708 incr = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
709 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
710 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
711 pstartbyte = bytes + n - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
712 pendbyte = bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
713 incr = -1; |
|
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 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
716 if (is_signed) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
717 is_signed = *pendbyte >= 0x80; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
718 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
719 /* 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
|
720 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
|
721 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
|
722 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
723 size_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
724 const unsigned char* p = pendbyte; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
725 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
|
726 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
|
727 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
728 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
|
729 if (*p != insignficant) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
730 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
731 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
732 numsignificantbytes = n - i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
733 /* 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
|
734 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
|
735 -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
|
736 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
|
737 check every case, bump it regardless. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
738 if (is_signed && numsignificantbytes < n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
739 ++numsignificantbytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
740 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
741 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
742 /* 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
|
743 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
|
744 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
|
745 /* catch overflow before it happens */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
746 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
|
747 PyErr_SetString(PyExc_OverflowError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
748 "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
|
749 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
750 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
751 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
|
752 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
753 if (v == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
754 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
755 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
756 /* 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
|
757 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
|
758 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
|
759 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
760 size_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
761 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
|
762 twodigits accum = 0; /* sliding register */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
763 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
|
764 const unsigned char* p = pstartbyte; |
|
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 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
|
767 twodigits thisbyte = *p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
768 /* 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
|
769 if (is_signed) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
770 thisbyte = (0xff ^ thisbyte) + carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
771 carry = thisbyte >> 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
772 thisbyte &= 0xff; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
773 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
774 /* 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
|
775 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
|
776 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
|
777 accum |= (twodigits)thisbyte << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
778 accumbits += 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
779 if (accumbits >= PyLong_SHIFT) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
780 /* 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
|
781 assert(idigit < ndigits); |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
782 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
|
783 ++idigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
784 accum >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
785 accumbits -= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
786 assert(accumbits < PyLong_SHIFT); |
|
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 assert(accumbits < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
790 if (accumbits) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
791 assert(idigit < ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
792 v->ob_digit[idigit] = (digit)accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
793 ++idigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
794 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
795 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
796 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
797 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
|
798 return (PyObject *)long_normalize(v); |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
799 } |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
800 |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
801 int |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
802 _PyLong_AsByteArray(PyLongObject* v, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
803 unsigned char* bytes, size_t n, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
804 int little_endian, int is_signed) |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
805 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
806 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
|
807 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
|
808 twodigits accum; /* sliding register */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
809 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
|
810 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
|
811 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
|
812 size_t j; /* # bytes filled */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
813 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
|
814 int pincr; /* direction to move p */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
815 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
816 assert(v != NULL && PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
817 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
818 if (Py_SIZE(v) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
819 ndigits = -(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
820 if (!is_signed) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
821 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
822 "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
|
823 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
824 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
825 do_twos_comp = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
826 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
827 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
828 ndigits = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
829 do_twos_comp = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
830 } |
|
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 if (little_endian) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
833 p = bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
834 pincr = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
835 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
836 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
837 p = bytes + n - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
838 pincr = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
839 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
840 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
841 /* Copy over all the Python digits. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
842 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
|
843 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
|
844 normalized. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
845 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
|
846 j = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
847 accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
848 accumbits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
849 carry = do_twos_comp ? 1 : 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
850 for (i = 0; i < ndigits; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
851 digit thisdigit = v->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
852 if (do_twos_comp) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
853 thisdigit = (thisdigit ^ PyLong_MASK) + carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
854 carry = thisdigit >> PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
855 thisdigit &= PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
856 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
857 /* 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
|
858 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
|
859 prepended to accum. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
860 accum |= (twodigits)thisdigit << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
861 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
862 /* 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
|
863 partly empty. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
864 if (i == ndigits - 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
865 /* 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
|
866 * 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
|
867 * 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
|
868 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
|
869 while (s != 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
870 s >>= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
871 accumbits++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
872 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
873 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
874 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
875 accumbits += PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
876 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
877 /* Store as many bytes as possible. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
878 while (accumbits >= 8) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
879 if (j >= n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
880 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
881 ++j; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
882 *p = (unsigned char)(accum & 0xff); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
883 p += pincr; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
884 accumbits -= 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
885 accum >>= 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
886 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
887 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
888 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
889 /* Store the straggler (if any). */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
890 assert(accumbits < 8); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
891 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
|
892 if (accumbits > 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
893 if (j >= n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
894 goto Overflow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
895 ++j; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
896 if (do_twos_comp) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
897 /* 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
|
898 (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
|
899 infinite supply of sign bits). */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
900 accum |= (~(twodigits)0) << accumbits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
901 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
902 *p = (unsigned char)(accum & 0xff); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
903 p += pincr; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
904 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
905 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
|
906 /* 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
|
907 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
|
908 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
|
909 exists. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
910 unsigned char msb = *(p - pincr); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
911 int sign_bit_set = msb >= 0x80; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
912 assert(accumbits == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
913 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
|
914 return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
915 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
916 goto Overflow; |
|
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 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
919 /* 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
|
920 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
921 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
|
922 for ( ; j < n; ++j, p += pincr) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
923 *p = signbyte; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
924 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
925 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
926 return 0; |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
927 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
928 Overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
929 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
|
930 return -1; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
931 |
|
18082
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
932 } |
|
dd09f11fa40d
Two new private longobject API functions,
Tim Peters <tim.peters@gmail.com>
parents:
15946
diff
changeset
|
933 |
|
73075
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
934 /* Create a new long int object from a C pointer */ |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
935 |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
936 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
937 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
|
938 { |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
939 #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
|
940 # 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
|
941 #endif |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
942 #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
|
943 # 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
|
944 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
945 /* special-case null pointer */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
946 if (!p) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
947 return PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
948 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
|
949 |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
950 } |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
951 |
|
73075
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
952 /* Get a C pointer from a long int object. */ |
|
9123
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
953 |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
954 void * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
955 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
|
956 { |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
957 #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
|
958 long x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
959 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
960 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
|
961 x = PyLong_AsLong(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
962 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
963 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
|
964 #else |
|
18134
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
965 |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
966 #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
|
967 # 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
|
968 #endif |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
969 #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
|
970 # 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
|
971 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
972 PY_LONG_LONG x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
973 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
974 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
|
975 x = PyLong_AsLongLong(vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
976 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
977 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
|
978 |
|
eff8da7c3dcb
PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with
Tim Peters <tim.peters@gmail.com>
parents:
18121
diff
changeset
|
979 #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
|
980 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
981 if (x == -1 && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
982 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
983 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
|
984 } |
|
17d0c51e0887
Patches from Greg Stein to support 'P' format in struct module's
Guido van Rossum <guido@python.org>
parents:
9094
diff
changeset
|
985 |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
986 #ifdef HAVE_LONG_LONG |
| 18093 | 987 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
988 /* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later |
| 18093 | 989 * 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
|
990 */ |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
991 |
|
18121
166b7b365851
Change IS_LITTLE_ENDIAN macro -- a little faster now.
Tim Peters <tim.peters@gmail.com>
parents:
18115
diff
changeset
|
992 #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
|
993 #define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) |
| 18093 | 994 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
995 /* 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
|
996 |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
997 PyObject * |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
998 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
|
999 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1000 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1001 unsigned PY_LONG_LONG abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1002 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
|
1003 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1004 int negative = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1005 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1006 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1007 if (ival < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1008 /* 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
|
1009 in PyLong_FromLong above. */ |
|
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)(-1-ival) + 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1011 negative = 1; |
|
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 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1014 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
|
1015 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1016 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1017 /* Count the number of Python digits. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1018 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
|
1019 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
|
1020 needed. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1021 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1022 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1023 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1024 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1025 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1026 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1027 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1028 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1029 Py_SIZE(v) = negative ? -ndigits : ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1030 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1031 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1032 *p++ = (digit)(t & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1033 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1034 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1035 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1036 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
|
1037 } |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1038 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1039 /* Create a new long int object from a C unsigned PY_LONG_LONG int. */ |
| 18093 | 1040 |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1041 PyObject * |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1042 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
|
1043 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1044 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1045 unsigned PY_LONG_LONG t; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1046 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1047 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1048 if (ival < PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1049 return PyLong_FromLong((long)ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1050 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1051 t = (unsigned PY_LONG_LONG)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1052 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1053 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1054 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1055 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1056 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1057 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1058 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1059 Py_SIZE(v) = ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1060 while (ival) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1061 *p++ = (digit)(ival & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1062 ival >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1063 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1064 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1065 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
|
1066 } |
|
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1067 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1068 /* 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
|
1069 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1070 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
|
1071 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
|
1072 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1073 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1074 size_t abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1075 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
|
1076 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1077 int negative = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1078 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1079 CHECK_SMALL_INT(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1080 if (ival < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1081 /* 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
|
1082 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
|
1083 negative = 1; |
|
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 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1086 abs_ival = (size_t)ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1087 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1088 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1089 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1090 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1091 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1092 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1093 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1094 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1095 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1096 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1097 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1098 Py_SIZE(v) = negative ? -ndigits : ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1099 t = abs_ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1100 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1101 *p++ = (digit)(t & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1102 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1103 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1104 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1105 return (PyObject *)v; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1106 } |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1107 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1108 /* 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
|
1109 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1110 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
|
1111 PyLong_FromSize_t(size_t ival) |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1112 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1113 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1114 size_t t; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1115 int ndigits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1116 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1117 if (ival < PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1118 return PyLong_FromLong((long)ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1119 /* Count the number of Python digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1120 t = ival; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1121 while (t) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1122 ++ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1123 t >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1124 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1125 v = _PyLong_New(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1126 if (v != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1127 digit *p = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1128 Py_SIZE(v) = ndigits; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1129 while (ival) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1130 *p++ = (digit)(ival & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1131 ival >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1132 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1133 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1134 return (PyObject *)v; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1135 } |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1136 |
|
73075
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1137 /* Get a C long long int from a long int object or any object that has an |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1138 __int__ method. 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
|
1139 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1140 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
|
1141 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
|
1142 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1143 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1144 PY_LONG_LONG bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1145 int one = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1146 int res; |
|
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 (vv == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1149 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1150 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1151 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1152 if (!PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1153 PyNumberMethods *nb; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1154 PyObject *io; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1155 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
|
1156 nb->nb_int == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1157 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
|
1158 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1159 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1160 io = (*nb->nb_int) (vv); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1161 if (io == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1162 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1163 if (PyLong_Check(io)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1164 bytes = PyLong_AsLongLong(io); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1165 Py_DECREF(io); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1166 return bytes; |
|
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 Py_DECREF(io); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1169 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
|
1170 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1171 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1172 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1173 v = (PyLongObject*)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1174 switch(Py_SIZE(v)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1175 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
|
1176 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1177 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
|
1178 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1179 res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1180 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
|
1181 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1182 /* 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
|
1183 if (res < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1184 return (PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1185 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1186 return bytes; |
| 18093 | 1187 } |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1188 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1189 /* Get a C unsigned PY_LONG_LONG int from a long int object. |
| 18093 | 1190 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
|
1191 |
|
28437
871da703e4c0
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Martin v. Löwis <martin@v.loewis.de>
parents:
28032
diff
changeset
|
1192 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
|
1193 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
|
1194 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1195 PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1196 unsigned PY_LONG_LONG bytes; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1197 int one = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1198 int res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1199 |
|
72312
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
1200 if (vv == NULL) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1201 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1202 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1203 } |
|
72312
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
1204 if (!PyLong_Check(vv)) { |
|
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
1205 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
1206 return (unsigned PY_LONG_LONG)-1; |
|
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
1207 } |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1208 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1209 v = (PyLongObject*)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1210 switch(Py_SIZE(v)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1211 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1212 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
|
1213 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1214 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1215 res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1216 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
|
1217 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1218 /* 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
|
1219 if (res < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1220 return (unsigned PY_LONG_LONG)res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1221 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1222 return bytes; |
| 18093 | 1223 } |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1224 |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1225 /* 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
|
1226 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
|
1227 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1228 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
|
1229 _PyLong_AsUnsignedLongLongMask(PyObject *vv) |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1230 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1231 register PyLongObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1232 unsigned PY_LONG_LONG x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1233 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1234 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1235 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1236 if (vv == NULL || !PyLong_Check(vv)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1237 PyErr_BadInternalCall(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1238 return (unsigned long) -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1239 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1240 v = (PyLongObject *)vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1241 switch(Py_SIZE(v)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1242 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1243 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
|
1244 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1245 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1246 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1247 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1248 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1249 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1250 i = -i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1251 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1252 while (--i >= 0) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1253 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
|
1254 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1255 return x * sign; |
|
28652
28a2975514cd
SF # 595026: support for masks in getargs.c.
Thomas Heller <theller@ctypes.org>
parents:
28437
diff
changeset
|
1256 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1257 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1258 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
|
1259 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
|
1260 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1261 PyNumberMethods *nb; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1262 PyLongObject *lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1263 unsigned PY_LONG_LONG val; |
|
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 if (op && PyLong_Check(op)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1266 return _PyLong_AsUnsignedLongLongMask(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1267 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1268 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
|
1269 nb->nb_int == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1270 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
|
1271 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1272 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1273 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1274 lo = (PyLongObject*) (*nb->nb_int) (op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1275 if (lo == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1276 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1277 if (PyLong_Check(lo)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1278 val = _PyLong_AsUnsignedLongLongMask((PyObject *)lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1279 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1280 if (PyErr_Occurred()) |
|
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 return val; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1283 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1284 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1285 { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1286 Py_DECREF(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1287 PyErr_SetString(PyExc_TypeError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1288 "nb_int should return int object"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1289 return (unsigned PY_LONG_LONG)-1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1290 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
1291 } |
| 18093 | 1292 #undef IS_LITTLE_ENDIAN |
| 1293 | |
|
73075
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1294 /* Get a C long long int from a long int object or any object that has an |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1295 __int__ method. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1296 |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1297 On overflow, return -1 and set *overflow to 1 or -1 depending on the sign of |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1298 the result. Otherwise *overflow is 0. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1299 |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1300 For other errors (e.g., TypeError), return -1 and set an error condition. |
|
d4839fea4a5a
Issue #12965: Fix some inaccurate comments in Objects/longobject.c. Thanks Stefan Krah.
Mark Dickinson <mdickinson@enthought.com>
parents:
72510
diff
changeset
|
1301 In this case *overflow will be 0. |
|
58582
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1302 */ |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1303 |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1304 PY_LONG_LONG |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1305 PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow) |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1306 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1307 /* This version by Tim Peters */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1308 register PyLongObject *v; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1309 unsigned PY_LONG_LONG x, prev; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1310 PY_LONG_LONG res; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1311 Py_ssize_t i; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1312 int sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1313 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
|
1314 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1315 *overflow = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1316 if (vv == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1317 PyErr_BadInternalCall(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1318 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1319 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1320 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1321 if (!PyLong_Check(vv)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1322 PyNumberMethods *nb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1323 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
|
1324 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
|
1325 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1326 "an integer is required"); |
|
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 vv = (*nb->nb_int) (vv); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1330 if (vv == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1331 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1332 do_decref = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1333 if (!PyLong_Check(vv)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1334 Py_DECREF(vv); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1335 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1336 "nb_int should return int object"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1337 return -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1338 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1339 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1340 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1341 res = -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1342 v = (PyLongObject *)vv; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1343 i = Py_SIZE(v); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1344 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1345 switch (i) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1346 case -1: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1347 res = -(sdigit)v->ob_digit[0]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1348 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1349 case 0: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1350 res = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1351 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1352 case 1: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1353 res = v->ob_digit[0]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1354 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1355 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1356 sign = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1357 x = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1358 if (i < 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1359 sign = -1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1360 i = -(i); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1361 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1362 while (--i >= 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1363 prev = x; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1364 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
|
1365 if ((x >> PyLong_SHIFT) != prev) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1366 *overflow = sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1367 goto exit; |
|
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 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1370 /* 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
|
1371 * care (see comment above). |
|
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 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
|
1374 res = (PY_LONG_LONG)x * sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1375 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1376 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
|
1377 res = PY_LLONG_MIN; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1378 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1379 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1380 *overflow = sign; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1381 /* res is already set to -1 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1382 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1383 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1384 exit: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1385 if (do_decref) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1386 Py_DECREF(vv); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1387 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1388 return res; |
|
58582
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1389 } |
|
5893ef9a9b84
Merged revisions 77842 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
58225
diff
changeset
|
1390 |
|
8822
bd47ee068b83
Changes for BeOS, QNX and long long, by Chris Herborth.
Guido van Rossum <guido@python.org>
parents:
8808
diff
changeset
|
1391 #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
|
1392 |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1393 #define CHECK_BINOP(v,w) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1394 do { \ |
|
71810
d0b0fcbb40db
Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED.
Brian Curtin <brian@python.org>
parents:
68586
diff
changeset
|
1395 if (!PyLong_Check(v) || !PyLong_Check(w)) \ |
|
d0b0fcbb40db
Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED.
Brian Curtin <brian@python.org>
parents:
68586
diff
changeset
|
1396 Py_RETURN_NOTIMPLEMENTED; \ |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1397 } 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
|
1398 |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1399 /* 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
|
1400 2**k if d is nonzero, else 0. */ |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1401 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1402 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
|
1403 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
|
1404 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
|
1405 }; |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1406 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1407 static int |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1408 bits_in_digit(digit d) |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1409 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1410 int d_bits = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1411 while (d >= 32) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1412 d_bits += 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1413 d >>= 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1414 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1415 d_bits += (int)BitLengthTable[d]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1416 return d_bits; |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1417 } |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1418 |
|
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
|
1419 /* 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
|
1420 * 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
|
1421 * 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
|
1422 */ |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1423 static digit |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1424 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
|
1425 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1426 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1427 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1428 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1429 assert(m >= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1430 for (i = 0; i < n; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1431 carry += x[i] + y[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1432 x[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1433 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1434 assert((carry & 1) == carry); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1435 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1436 for (; carry && i < m; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1437 carry += x[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1438 x[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1439 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1440 assert((carry & 1) == carry); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1441 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1442 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
|
1443 } |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1444 |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1445 /* 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
|
1446 * 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
|
1447 * 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
|
1448 */ |
|
c248bee52dc6
Introduced helper functions v_iadd and v_isub, for in-place digit-vector
Tim Peters <tim.peters@gmail.com>
parents:
24747
diff
changeset
|
1449 static digit |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1450 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
|
1451 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1452 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1453 digit borrow = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1454 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1455 assert(m >= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1456 for (i = 0; i < n; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1457 borrow = x[i] - y[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1458 x[i] = borrow & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1459 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1460 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
|
1461 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1462 for (; borrow && i < m; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1463 borrow = x[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1464 x[i] = borrow & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1465 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1466 borrow &= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1467 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1468 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
|
1469 } |
|
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
|
1470 |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1471 /* 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
|
1472 * 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
|
1473 */ |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1474 static digit |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1475 v_lshift(digit *z, digit *a, Py_ssize_t m, int d) |
| 230 | 1476 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1477 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1478 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1479 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1480 assert(0 <= d && d < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1481 for (i=0; i < m; i++) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1482 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
|
1483 z[i] = (digit)acc & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1484 carry = (digit)(acc >> PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1485 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1486 return carry; |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1487 } |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1488 |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1489 /* 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
|
1490 * 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
|
1491 */ |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1492 static digit |
|
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
1493 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
|
1494 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1495 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1496 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1497 digit mask = ((digit)1 << d) - 1U; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1498 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1499 assert(0 <= d && d < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1500 for (i=m; i-- > 0;) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1501 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
|
1502 carry = (digit)acc & mask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1503 z[i] = (digit)(acc >> d); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1504 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1505 return carry; |
| 230 | 1506 } |
| 1507 | |
|
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 /* 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
|
1509 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
|
1510 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
|
1511 _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
|
1512 immutable. */ |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1513 |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1514 static digit |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
1515 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
|
1516 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1517 twodigits rem = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1518 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1519 assert(n > 0 && n <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1520 pin += size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1521 pout += size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1522 while (--size >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1523 digit hi; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1524 rem = (rem << PyLong_SHIFT) | *--pin; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1525 *--pout = hi = (digit)(rem / n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1526 rem -= (twodigits)hi * n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1527 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1528 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
|
1529 } |
|
19250f9181dc
divrem1 & long_format: found a clean way to factor divrem1 so that
Tim Peters <tim.peters@gmail.com>
parents:
18593
diff
changeset
|
1530 |
| 230 | 1531 /* Divide a long integer by a digit, returning both the quotient |
| 1532 (as function result) and the remainder (through *prem). | |
| 1533 The sign of a is ignored; n should not be zero. */ | |
| 1534 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
1535 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
|
1536 divrem1(PyLongObject *a, digit n, digit *prem) |
| 230 | 1537 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1538 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
|
1539 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1540 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1541 assert(n > 0 && n <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1542 z = _PyLong_New(size); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1543 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1544 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1545 *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
|
1546 return long_normalize(z); |
| 230 | 1547 } |
| 1548 | |
|
56017
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1549 /* 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
|
1550 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
|
1551 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
|
1552 |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1553 static int |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1554 long_to_decimal_string_internal(PyObject *aa, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1555 PyObject **p_output, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1556 _PyUnicodeWriter *writer) |
|
56017
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1557 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1558 PyLongObject *scratch, *a; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1559 PyObject *str; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1560 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
|
1561 digit *pout, *pin, rem, tenpow; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1562 int negative; |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1563 enum PyUnicode_Kind kind; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1564 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1565 a = (PyLongObject *)aa; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1566 if (a == NULL || !PyLong_Check(a)) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1567 PyErr_BadInternalCall(); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1568 return -1; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1569 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1570 size_a = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1571 negative = Py_SIZE(a) < 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1572 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1573 /* 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
|
1574 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
|
1575 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1576 #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
|
1577 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1578 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
|
1579 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
|
1580 > 3 * _PyLong_DECIMAL_SHIFT |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1581 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1582 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
|
1583 PyErr_SetString(PyExc_OverflowError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1584 "long is too large to format"); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1585 return -1; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1586 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1587 /* 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
|
1588 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
|
1589 scratch = _PyLong_New(size); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1590 if (scratch == NULL) |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1591 return -1; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1592 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1593 /* 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
|
1594 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
|
1595 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
|
1596 pin = a->ob_digit; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1597 pout = scratch->ob_digit; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1598 size = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1599 for (i = size_a; --i >= 0; ) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1600 digit hi = pin[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1601 for (j = 0; j < size; j++) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1602 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
|
1603 hi = (digit)(z / _PyLong_DECIMAL_BASE); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1604 pout[j] = (digit)(z - (twodigits)hi * |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1605 _PyLong_DECIMAL_BASE); |
|
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 while (hi) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1608 pout[size++] = hi % _PyLong_DECIMAL_BASE; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1609 hi /= _PyLong_DECIMAL_BASE; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1610 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1611 /* check for keyboard interrupt */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1612 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
1613 Py_DECREF(scratch); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1614 return -1; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
1615 }); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1616 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1617 /* 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
|
1618 works correctly */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1619 if (size == 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1620 pout[size++] = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1621 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1622 /* 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
|
1623 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
|
1624 tenpow = 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1625 rem = pout[size-1]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1626 while (rem >= tenpow) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1627 tenpow *= 10; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1628 strlen++; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1629 } |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1630 if (writer) { |
|
78936
1349e9537f91
Fixed resource leak to scratch when _PyUnicodeWriter_Prepare fails
Christian Heimes <christian@cheimes.de>
parents:
77230
diff
changeset
|
1631 if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1) { |
|
1349e9537f91
Fixed resource leak to scratch when _PyUnicodeWriter_Prepare fails
Christian Heimes <christian@cheimes.de>
parents:
77230
diff
changeset
|
1632 Py_DECREF(scratch); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1633 return -1; |
|
78936
1349e9537f91
Fixed resource leak to scratch when _PyUnicodeWriter_Prepare fails
Christian Heimes <christian@cheimes.de>
parents:
77230
diff
changeset
|
1634 } |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1635 kind = writer->kind; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1636 str = NULL; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1637 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1638 else { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1639 str = PyUnicode_New(strlen, '9'); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1640 if (str == NULL) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1641 Py_DECREF(scratch); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1642 return -1; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1643 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1644 kind = PyUnicode_KIND(str); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1645 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1646 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1647 #define WRITE_DIGITS(TYPE) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1648 do { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1649 if (writer) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1650 p = (TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos + strlen; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1651 else \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1652 p = (TYPE*)PyUnicode_DATA(str) + strlen; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1653 \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1654 /* pout[0] through pout[size-2] contribute exactly \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1655 _PyLong_DECIMAL_SHIFT digits each */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1656 for (i=0; i < size - 1; i++) { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1657 rem = pout[i]; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1658 for (j = 0; j < _PyLong_DECIMAL_SHIFT; j++) { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1659 *--p = '0' + rem % 10; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1660 rem /= 10; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1661 } \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1662 } \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1663 /* pout[size-1]: always produce at least one decimal digit */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1664 rem = pout[i]; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1665 do { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1666 *--p = '0' + rem % 10; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1667 rem /= 10; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1668 } while (rem != 0); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1669 \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1670 /* and sign */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1671 if (negative) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1672 *--p = '-'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1673 \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1674 /* check we've counted correctly */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1675 if (writer) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1676 assert(p == ((TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos)); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1677 else \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1678 assert(p == (TYPE*)PyUnicode_DATA(str)); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1679 } while (0) |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1680 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1681 /* fill the string right-to-left */ |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1682 if (kind == PyUnicode_1BYTE_KIND) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1683 Py_UCS1 *p; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1684 WRITE_DIGITS(Py_UCS1); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1685 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1686 else if (kind == PyUnicode_2BYTE_KIND) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1687 Py_UCS2 *p; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1688 WRITE_DIGITS(Py_UCS2); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1689 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1690 else { |
|
77230
6abab1a103a6
Issue #14744: Fix compilation on Windows
Victor Stinner <victor.stinner@gmail.com>
parents:
77223
diff
changeset
|
1691 Py_UCS4 *p; |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1692 assert (kind == PyUnicode_4BYTE_KIND); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1693 WRITE_DIGITS(Py_UCS4); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1694 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1695 #undef WRITE_DIGITS |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1696 |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1697 Py_DECREF(scratch); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1698 if (writer) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1699 writer->pos += strlen; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1700 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1701 else { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1702 assert(_PyUnicode_CheckConsistency(str, 1)); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1703 *p_output = (PyObject *)str; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1704 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1705 return 0; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1706 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1707 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1708 static PyObject * |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1709 long_to_decimal_string(PyObject *aa) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1710 { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1711 PyObject *v; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1712 if (long_to_decimal_string_internal(aa, &v, NULL) == -1) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1713 return NULL; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1714 return v; |
|
56017
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1715 } |
|
1e09dc68c8f3
Issue #6713: Improve performance of str(n) and repr(n) for integers n
Mark Dickinson <dickinsm@gmail.com>
parents:
55938
diff
changeset
|
1716 |
|
56074
37e96246bda1
Issue #6713 (continued): remove unused arbitrary-base conversion code
Mark Dickinson <dickinsm@gmail.com>
parents:
56048
diff
changeset
|
1717 /* Convert a long int object to a string, using a given conversion base, |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1718 which should be one of 2, 8 or 16. Return a string object. |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1719 If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x' |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1720 if alternate is nonzero. */ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1721 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1722 static int |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1723 long_format_binary(PyObject *aa, int base, int alternate, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1724 PyObject **p_output, _PyUnicodeWriter *writer) |
| 230 | 1725 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1726 register PyLongObject *a = (PyLongObject *)aa; |
| 72475 | 1727 PyObject *v; |
|
76439
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1728 Py_ssize_t sz; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1729 Py_ssize_t size_a; |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1730 enum PyUnicode_Kind kind; |
|
76439
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1731 int negative; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1732 int bits; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1733 |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1734 assert(base == 2 || base == 8 || base == 16); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1735 if (a == NULL || !PyLong_Check(a)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1736 PyErr_BadInternalCall(); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1737 return -1; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1738 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1739 size_a = ABS(Py_SIZE(a)); |
|
76439
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1740 negative = Py_SIZE(a) < 0; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1741 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1742 /* 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
|
1743 switch (base) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1744 case 16: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1745 bits = 4; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1746 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1747 case 8: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1748 bits = 3; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1749 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1750 case 2: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1751 bits = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1752 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1753 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1754 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
|
1755 bits = 0; /* to silence gcc warning */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1756 } |
|
76439
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1757 |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1758 /* Compute exact length 'sz' of output string. */ |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1759 if (size_a == 0) { |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1760 sz = 1; |
|
76439
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1761 } |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1762 else { |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1763 Py_ssize_t size_a_in_bits; |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1764 /* Ensure overflow doesn't occur during computation of sz. */ |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1765 if (size_a > (PY_SSIZE_T_MAX - 3) / PyLong_SHIFT) { |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1766 PyErr_SetString(PyExc_OverflowError, |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1767 "int is too large to format"); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1768 return -1; |
|
76439
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1769 } |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1770 size_a_in_bits = (size_a - 1) * PyLong_SHIFT + |
|
dcd3344b6d5b
Issue #14339: Improve speed of bin, oct and hex builtins. Patch by Serhiy Storchaka (with minor modifications).
Mark Dickinson <mdickinson@enthought.com>
parents:
73075
diff
changeset
|
1771 bits_in_digit(a->ob_digit[size_a - 1]); |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1772 /* Allow 1 character for a '-' sign. */ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1773 sz = negative + (size_a_in_bits + (bits - 1)) / bits; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1774 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1775 if (alternate) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1776 /* 2 characters for prefix */ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1777 sz += 2; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1778 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1779 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1780 if (writer) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1781 if (_PyUnicodeWriter_Prepare(writer, sz, 'x') == -1) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1782 return -1; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1783 kind = writer->kind; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1784 v = NULL; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1785 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
1786 else { |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1787 v = PyUnicode_New(sz, 'x'); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1788 if (v == NULL) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1789 return -1; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1790 kind = PyUnicode_KIND(v); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1791 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1792 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1793 #define WRITE_DIGITS(TYPE) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1794 do { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1795 if (writer) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1796 p = (TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos + sz; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1797 else \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1798 p = (TYPE*)PyUnicode_DATA(v) + sz; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1799 \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1800 if (size_a == 0) { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1801 *--p = '0'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1802 } \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1803 else { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1804 /* JRH: special case for power-of-2 bases */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1805 twodigits accum = 0; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1806 int accumbits = 0; /* # of bits in accum */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1807 Py_ssize_t i; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1808 for (i = 0; i < size_a; ++i) { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1809 accum |= (twodigits)a->ob_digit[i] << accumbits; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1810 accumbits += PyLong_SHIFT; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1811 assert(accumbits >= bits); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1812 do { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1813 char cdigit; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1814 cdigit = (char)(accum & (base - 1)); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1815 cdigit += (cdigit < 10) ? '0' : 'a'-10; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1816 *--p = cdigit; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1817 accumbits -= bits; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1818 accum >>= bits; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1819 } while (i < size_a-1 ? accumbits >= bits : accum > 0); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1820 } \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1821 } \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1822 \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1823 if (alternate) { \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1824 if (base == 16) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1825 *--p = 'x'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1826 else if (base == 8) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1827 *--p = 'o'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1828 else /* (base == 2) */ \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1829 *--p = 'b'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1830 *--p = '0'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1831 } \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1832 if (negative) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1833 *--p = '-'; \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1834 if (writer) \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1835 assert(p == ((TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos)); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1836 else \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1837 assert(p == (TYPE*)PyUnicode_DATA(v)); \ |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1838 } while (0) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1839 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1840 if (kind == PyUnicode_1BYTE_KIND) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1841 Py_UCS1 *p; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1842 WRITE_DIGITS(Py_UCS1); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1843 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1844 else if (kind == PyUnicode_2BYTE_KIND) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1845 Py_UCS2 *p; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1846 WRITE_DIGITS(Py_UCS2); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1847 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1848 else { |
|
77230
6abab1a103a6
Issue #14744: Fix compilation on Windows
Victor Stinner <victor.stinner@gmail.com>
parents:
77223
diff
changeset
|
1849 Py_UCS4 *p; |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1850 assert (kind == PyUnicode_4BYTE_KIND); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1851 WRITE_DIGITS(Py_UCS4); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1852 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1853 #undef WRITE_DIGITS |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1854 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1855 if (writer) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1856 writer->pos += sz; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1857 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1858 else { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1859 assert(_PyUnicode_CheckConsistency(v, 1)); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1860 *p_output = v; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1861 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1862 return 0; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1863 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1864 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1865 PyObject * |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1866 _PyLong_Format(PyObject *obj, int base) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1867 { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1868 PyObject *str; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1869 int err; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1870 if (base == 10) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1871 err = long_to_decimal_string_internal(obj, &str, NULL); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1872 else |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1873 err = long_format_binary(obj, base, 1, &str, NULL); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1874 if (err == -1) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1875 return NULL; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1876 return str; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1877 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1878 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1879 int |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1880 _PyLong_FormatWriter(_PyUnicodeWriter *writer, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1881 PyObject *obj, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1882 int base, int alternate) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1883 { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1884 if (base == 10) |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1885 return long_to_decimal_string_internal(obj, NULL, writer); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1886 else |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
1887 return long_format_binary(obj, base, alternate, NULL, writer); |
| 230 | 1888 } |
| 1889 | |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1890 /* 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
|
1891 * '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
|
1892 * '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
|
1893 * 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
|
1894 * 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
|
1895 * 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
|
1896 */ |
|
50656
c7c344b63ecc
Reduce the size of the _PyLong_DigitValue table.
Raymond Hettinger <python@rcn.com>
parents:
50241
diff
changeset
|
1897 unsigned char _PyLong_DigitValue[256] = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1898 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
|
1899 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
|
1900 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
|
1901 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
|
1902 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
|
1903 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
|
1904 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
|
1905 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
|
1906 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
|
1907 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
|
1908 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
|
1909 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
|
1910 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
|
1911 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
|
1912 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
|
1913 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
|
1914 }; |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1915 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
1916 /* *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
|
1917 * 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
|
1918 * 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
|
1919 * 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
|
1920 * 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
|
1921 */ |
|
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
|
1922 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
|
1923 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
|
1924 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1925 char *p = *str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1926 char *start = p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1927 int bits_per_char; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1928 Py_ssize_t n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1929 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1930 twodigits accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1931 int bits_in_accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1932 digit *pdigit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1933 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1934 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
|
1935 n = base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1936 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
|
1937 n >>= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1938 /* 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
|
1939 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
|
1940 ++p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1941 *str = p; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1942 /* 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
|
1943 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
|
1944 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
|
1945 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1946 "int string too large to convert"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1947 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1948 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1949 n = n / PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1950 z = _PyLong_New(n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1951 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1952 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1953 /* 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
|
1954 * 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
|
1955 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1956 accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1957 bits_in_accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1958 pdigit = z->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1959 while (--p >= start) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1960 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
|
1961 assert(k >= 0 && k < base); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1962 accum |= (twodigits)k << bits_in_accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1963 bits_in_accum += bits_per_char; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1964 if (bits_in_accum >= PyLong_SHIFT) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1965 *pdigit++ = (digit)(accum & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1966 assert(pdigit - z->ob_digit <= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1967 accum >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1968 bits_in_accum -= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1969 assert(bits_in_accum < PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1970 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1971 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1972 if (bits_in_accum) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1973 assert(bits_in_accum <= PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1974 *pdigit++ = (digit)accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1975 assert(pdigit - z->ob_digit <= n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1976 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1977 while (pdigit - z->ob_digit < n) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1978 *pdigit++ = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1979 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
|
1980 } |
|
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
|
1981 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
1982 PyObject * |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
1983 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
|
1984 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1985 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
|
1986 char *start, *orig_str = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1987 PyLongObject *z = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1988 PyObject *strobj; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1989 Py_ssize_t slen; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1990 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1991 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
|
1992 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1993 "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
|
1994 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1995 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1996 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
|
1997 str++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1998 if (*str == '+') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
1999 ++str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2000 else if (*str == '-') { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2001 ++str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2002 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2003 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2004 if (base == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2005 if (str[0] != '0') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2006 base = 10; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2007 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
|
2008 base = 16; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2009 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
|
2010 base = 8; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2011 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
|
2012 base = 2; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2013 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2014 /* "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
|
2015 it might still be zero though */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2016 error_if_nonzero = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2017 base = 10; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2018 } |
|
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 if (str[0] == '0' && |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2021 ((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
|
2022 (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
|
2023 (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
|
2024 str += 2; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2025 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2026 start = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2027 if ((base & (base - 1)) == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2028 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
|
2029 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
|
2030 /*** |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2031 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
|
2032 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
|
2033 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
|
2034 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2035 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
|
2036 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
|
2037 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
|
2038 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2039 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
|
2040 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
|
2041 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
|
2042 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2043 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
|
2044 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
|
2045 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
|
2046 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2047 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
|
2048 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
|
2049 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2050 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
|
2051 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
|
2052 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2053 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
|
2054 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
|
2055 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
|
2056 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2057 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
|
2058 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
|
2059 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2060 (((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
|
2061 |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
2062 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
|
2063 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2064 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
|
2065 case |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2066 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2067 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
|
2068 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2069 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
|
2070 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2071 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
|
2072 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2073 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
|
2074 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
|
2075 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
|
2076 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2077 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
|
2078 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
|
2079 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
|
2080 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
|
2081 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
|
2082 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
|
2083 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
|
2084 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
|
2085 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
|
2086 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
|
2087 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
|
2088 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2089 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
|
2090 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
|
2091 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
|
2092 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
|
2093 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
|
2094 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
|
2095 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
|
2096 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
|
2097 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
|
2098 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
|
2099 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
|
2100 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
|
2101 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2102 >>> 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
|
2103 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
|
2104 |
|
19fd6141940d
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
2105 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
|
2106 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
|
2107 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
|
2108 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
|
2109 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
|
2110 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
|
2111 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
|
2112 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
|
2113 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
|
2114 ***/ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2115 register twodigits c; /* current input character */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2116 Py_ssize_t size_z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2117 int i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2118 int convwidth; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2119 twodigits convmultmax, convmult; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2120 digit *pz, *pzstop; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2121 char* scan; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2122 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2123 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
|
2124 static int convwidth_base[37] = {0,}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2125 static twodigits convmultmax_base[37] = {0,}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2126 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2127 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
|
2128 twodigits convmax = base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2129 int i = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2130 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2131 log_base_BASE[base] = (log((double)base) / |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2132 log((double)PyLong_BASE)); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2133 for (;;) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2134 twodigits next = convmax * base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2135 if (next > PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2136 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2137 convmax = next; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2138 ++i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2139 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2140 convmultmax_base[base] = convmax; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2141 assert(i > 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2142 convwidth_base[base] = i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2143 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2144 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2145 /* 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
|
2146 scan = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2147 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
|
2148 ++scan; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2149 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2150 /* 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
|
2151 * 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
|
2152 * 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
|
2153 * being stored into. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2154 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2155 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
|
2156 /* 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
|
2157 /* size_z = 1; */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2158 assert(size_z > 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2159 z = _PyLong_New(size_z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2160 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2161 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2162 Py_SIZE(z) = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2163 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2164 /* `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
|
2165 * digit in base `convmultmax`. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2166 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2167 convwidth = convwidth_base[base]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2168 convmultmax = convmultmax_base[base]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2169 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2170 /* Work ;-) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2171 while (str < scan) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2172 /* 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
|
2173 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
|
2174 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
|
2175 c = (twodigits)(c * base + |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2176 (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
|
2177 assert(c < PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2178 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2179 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2180 convmult = convmultmax; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2181 /* 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
|
2182 * convwidth digits. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2183 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2184 if (i != convwidth) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2185 convmult = base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2186 for ( ; i > 1; --i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2187 convmult *= base; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2188 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2189 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2190 /* 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
|
2191 pz = z->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2192 pzstop = pz + Py_SIZE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2193 for (; pz < pzstop; ++pz) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2194 c += (twodigits)*pz * convmult; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2195 *pz = (digit)(c & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2196 c >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2197 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2198 /* carry off the current end? */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2199 if (c) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2200 assert(c < PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2201 if (Py_SIZE(z) < size_z) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2202 *pz = (digit)c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2203 ++Py_SIZE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2204 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2205 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2206 PyLongObject *tmp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2207 /* Extremely rare. Get more space. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2208 assert(Py_SIZE(z) == size_z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2209 tmp = _PyLong_New(size_z + 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2210 if (tmp == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2211 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2212 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2213 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2214 memcpy(tmp->ob_digit, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2215 z->ob_digit, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2216 sizeof(digit) * size_z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2217 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2218 z = tmp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2219 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
|
2220 ++size_z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2221 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2222 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2223 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2224 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2225 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2226 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2227 if (error_if_nonzero) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2228 /* 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
|
2229 doesn't make too much sense */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2230 base = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2231 if (Py_SIZE(z) != 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2232 goto onError; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2233 /* 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
|
2234 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
|
2235 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2236 if (str == start) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2237 goto onError; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2238 if (sign < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2239 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2240 while (*str && isspace(Py_CHARMASK(*str))) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2241 str++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2242 if (*str != '\0') |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2243 goto onError; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2244 if (pend) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2245 *pend = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2246 long_normalize(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2247 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
|
2248 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2249 onError: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2250 Py_XDECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2251 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
|
2252 strobj = PyUnicode_FromStringAndSize(orig_str, slen); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2253 if (strobj == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2254 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2255 PyErr_Format(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2256 "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
|
2257 base, strobj); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2258 Py_DECREF(strobj); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2259 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
|
2260 } |
|
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
|
2261 |
|
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
|
2262 PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36430
diff
changeset
|
2263 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
|
2264 { |
| 72475 | 2265 PyObject *v, *unicode = PyUnicode_FromUnicode(u, length); |
| 2266 if (unicode == NULL) | |
| 2267 return NULL; | |
| 2268 v = PyLong_FromUnicodeObject(unicode, base); | |
| 2269 Py_DECREF(unicode); | |
| 2270 return v; | |
| 2271 } | |
| 2272 | |
| 2273 PyObject * | |
| 2274 PyLong_FromUnicodeObject(PyObject *u, int base) | |
| 2275 { | |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2276 PyObject *result; |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2277 PyObject *asciidig; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2278 char *buffer, *end; |
| 72475 | 2279 Py_ssize_t buflen; |
| 2280 | |
| 2281 asciidig = _PyUnicode_TransformDecimalAndSpaceToASCII(u); | |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2282 if (asciidig == NULL) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2283 return NULL; |
| 72475 | 2284 buffer = PyUnicode_AsUTF8AndSize(asciidig, &buflen); |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2285 if (buffer == NULL) { |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2286 Py_DECREF(asciidig); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2287 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2288 } |
|
66673
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2289 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
|
2290 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
|
2291 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
|
2292 "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
|
2293 Py_DECREF(result); |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2294 result = NULL; |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2295 } |
|
7b6af56ee74d
Issue #10557: Fixed error messages from float() and other numeric
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
66555
diff
changeset
|
2296 Py_DECREF(asciidig); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2297 return result; |
| 230 | 2298 } |
| 2299 | |
|
13406
a503af7e7fb7
Some cleanup of longs in prepartion for Cray J90 fixes: got
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
2300 /* forward */ |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2301 static PyLongObject *x_divrem |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2302 (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
|
2303 static PyObject *long_long(PyObject *v); |
| 230 | 2304 |
| 2305 /* Long division with remainder, top-level routine */ | |
| 2306 | |
| 613 | 2307 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
|
2308 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
|
2309 PyLongObject **pdiv, PyLongObject **prem) |
| 230 | 2310 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2311 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
|
2312 PyLongObject *z; |
|
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 if (size_b == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2315 PyErr_SetString(PyExc_ZeroDivisionError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2316 "integer division or modulo by zero"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2317 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2318 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2319 if (size_a < size_b || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2320 (size_a == size_b && |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2321 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
|
2322 /* |a| < |b|. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2323 *pdiv = (PyLongObject*)PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2324 if (*pdiv == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2325 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2326 Py_INCREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2327 *prem = (PyLongObject *) a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2328 return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2329 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2330 if (size_b == 1) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2331 digit rem = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2332 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
|
2333 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2334 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2335 *prem = (PyLongObject *) PyLong_FromLong((long)rem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2336 if (*prem == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2337 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2338 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2339 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2340 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2341 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2342 z = x_divrem(a, b, prem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2343 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2344 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2345 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2346 /* Set the signs. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2347 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
|
2348 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
|
2349 so a = b*z + r. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2350 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
|
2351 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2352 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
|
2353 NEGATE(*prem); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2354 *pdiv = maybe_small_long(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2355 return 0; |
| 230 | 2356 } |
| 2357 | |
|
52289
a1d16d98aa40
Merged revisions 70542 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
52215
diff
changeset
|
2358 /* 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
|
2359 and w1 should satisfy 2 <= ABS(Py_SIZE(w1)) <= ABS(Py_SIZE(v1)). */ |
| 230 | 2360 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2361 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
|
2362 x_divrem(PyLongObject *v1, PyLongObject *w1, PyLongObject **prem) |
| 230 | 2363 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2364 PyLongObject *v, *w, *a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2365 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
|
2366 int d; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2367 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
|
2368 twodigits vv; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2369 sdigit zhi; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2370 stwodigits z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2371 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2372 /* 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
|
2373 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
|
2374 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
|
2375 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
|
2376 that won't overflow a digit. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2377 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2378 /* 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
|
2379 size_v = ABS(Py_SIZE(v1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2380 size_w = ABS(Py_SIZE(w1)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2381 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
|
2382 v = _PyLong_New(size_v+1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2383 if (v == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2384 *prem = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2385 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2386 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2387 w = _PyLong_New(size_w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2388 if (w == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2389 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2390 *prem = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2391 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2392 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2393 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2394 /* 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
|
2395 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
|
2396 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
|
2397 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
|
2398 assert(carry == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2399 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
|
2400 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
|
2401 v->ob_digit[size_v] = carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2402 size_v++; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2403 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2404 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2405 /* 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
|
2406 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
|
2407 k = size_v - size_w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2408 assert(k >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2409 a = _PyLong_New(k); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2410 if (a == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2411 Py_DECREF(w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2412 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2413 *prem = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2414 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2415 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2416 v0 = v->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2417 w0 = w->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2418 wm1 = w0[size_w-1]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2419 wm2 = w0[size_w-2]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2420 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
|
2421 /* 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
|
2422 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
|
2423 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2424 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2425 Py_DECREF(a); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2426 Py_DECREF(w); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2427 Py_DECREF(v); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2428 *prem = NULL; |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2429 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
2430 }); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2431 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2432 /* 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
|
2433 vtop = vk[size_w]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2434 assert(vtop <= wm1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2435 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
|
2436 q = (digit)(vv / wm1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2437 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
|
2438 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
|
2439 | vk[size_w-2])) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2440 --q; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2441 r += wm1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2442 if (r >= PyLong_BASE) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2443 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2444 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2445 assert(q <= PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2446 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2447 /* 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
|
2448 zhi = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2449 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
|
2450 /* invariants: -PyLong_BASE <= -q <= zhi <= 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2451 -PyLong_BASE * q <= z < PyLong_BASE */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2452 z = (sdigit)vk[i] + zhi - |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2453 (stwodigits)q * (stwodigits)w0[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2454 vk[i] = (digit)z & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2455 zhi = (sdigit)Py_ARITHMETIC_RIGHT_SHIFT(stwodigits, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2456 z, PyLong_SHIFT); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2457 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2458 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2459 /* 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
|
2460 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
|
2461 if ((sdigit)vtop + zhi < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2462 carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2463 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
|
2464 carry += vk[i] + w0[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2465 vk[i] = carry & PyLong_MASK; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2466 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2467 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2468 --q; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2469 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2470 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2471 /* store quotient digit */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2472 assert(q < PyLong_BASE); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2473 *--ak = q; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2474 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2475 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2476 /* 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
|
2477 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
|
2478 assert(carry==0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2479 Py_DECREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2480 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2481 *prem = long_normalize(w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2482 return long_normalize(a); |
| 230 | 2483 } |
| 2484 | |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2485 /* 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
|
2486 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
|
2487 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
|
2488 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
|
2489 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
|
2490 -1.0. */ |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2491 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2492 /* 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
|
2493 #if DBL_MANT_DIG == 53 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2494 #define EXP2_DBL_MANT_DIG 9007199254740992.0 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2495 #else |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2496 #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
|
2497 #endif |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2498 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2499 double |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2500 _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e) |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2501 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2502 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
|
2503 /* 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
|
2504 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
|
2505 double dx; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2506 /* 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
|
2507 "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
|
2508 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
|
2509 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
|
2510 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2511 a_size = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2512 if (a_size == 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2513 /* 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
|
2514 *e = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2515 return 0.0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2516 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2517 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
|
2518 /* 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
|
2519 "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
|
2520 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
|
2521 (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
|
2522 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
|
2523 goto overflow; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2524 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
|
2525 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2526 /* 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
|
2527 (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
|
2528 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2529 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
|
2530 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
|
2531 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2532 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
|
2533 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2534 digits. If shifting right, we use |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2535 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2536 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
|
2537 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2538 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
|
2539 the inequalities |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2540 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2541 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
|
2542 m // PyLong_SHIFT - n // PyLong_SHIFT <= |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2543 1 + (m - n - 1) // PyLong_SHIFT, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2544 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2545 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
|
2546 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2547 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
|
2548 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2549 in both cases. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2550 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2551 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
|
2552 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
|
2553 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
|
2554 x_size = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2555 while (x_size < shift_digits) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2556 x_digits[x_size++] = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2557 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
|
2558 (int)shift_bits); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2559 x_size += a_size; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2560 x_digits[x_size++] = rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2561 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2562 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2563 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
|
2564 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
|
2565 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
|
2566 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
|
2567 x_size = a_size - shift_digits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2568 /* 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
|
2569 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
|
2570 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
|
2571 of x. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2572 if (rem) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2573 x_digits[0] |= 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2574 else |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2575 while (shift_digits > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2576 if (a->ob_digit[--shift_digits]) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2577 x_digits[0] |= 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2578 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2579 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2580 } |
|
72510
b534b56379cb
Use the new Py_ARRAY_LENGTH macro
Victor Stinner <victor.stinner@haypocalc.com>
parents:
72475
diff
changeset
|
2581 assert(1 <= x_size && x_size <= (Py_ssize_t)Py_ARRAY_LENGTH(x_digits)); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2582 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2583 /* Round, and convert to double. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2584 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
|
2585 dx = x_digits[--x_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2586 while (x_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2587 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
|
2588 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2589 /* 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
|
2590 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
|
2591 if (dx == 1.0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2592 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
|
2593 goto overflow; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2594 dx = 0.5; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2595 a_bits += 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2596 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2597 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2598 *e = a_bits; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2599 return Py_SIZE(a) < 0 ? -dx : dx; |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2600 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2601 overflow: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2602 /* exponent > PY_SSIZE_T_MAX */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2603 PyErr_SetString(PyExc_OverflowError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2604 "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
|
2605 *e = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2606 return -1.0; |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2607 } |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2608 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2609 /* 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
|
2610 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
|
2611 |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2612 double |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2613 PyLong_AsDouble(PyObject *v) |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2614 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2615 Py_ssize_t exponent; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2616 double x; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2617 |
|
72312
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
2618 if (v == NULL) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2619 PyErr_BadInternalCall(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2620 return -1.0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2621 } |
|
72312
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
2622 if (!PyLong_Check(v)) { |
|
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
2623 PyErr_SetString(PyExc_TypeError, "an integer is required"); |
|
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
2624 return -1.0; |
|
4a66a35da3fd
Issue #12909: Make PyLong_As* functions consistent in their use of exceptions.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
71810
diff
changeset
|
2625 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2626 x = _PyLong_Frexp((PyLongObject *)v, &exponent); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2627 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
|
2628 PyErr_SetString(PyExc_OverflowError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2629 "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
|
2630 return -1.0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2631 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
2632 return ldexp(x, (int)exponent); |
|
58088
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2633 } |
|
46d60e5ff103
Merged revisions 77234 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57942
diff
changeset
|
2634 |
| 230 | 2635 /* Methods */ |
| 2636 | |
| 2637 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
|
2638 long_dealloc(PyObject *v) |
| 230 | 2639 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2640 Py_TYPE(v)->tp_free(v); |
| 230 | 2641 } |
| 2642 | |
| 2643 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
|
2644 long_compare(PyLongObject *a, PyLongObject *b) |
| 230 | 2645 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2646 Py_ssize_t sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2647 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2648 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
|
2649 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
|
2650 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2651 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2652 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
|
2653 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
|
2654 ; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2655 if (i < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2656 sign = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2657 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2658 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
|
2659 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2660 sign = -sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2661 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2662 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2663 return sign < 0 ? -1 : sign > 0 ? 1 : 0; |
| 230 | 2664 } |
| 2665 | |
|
50241
45bea584694e
Issue #3106: Speedup some comparisons. This also removes the last call
Antoine Pitrou <solipsis@pitrou.net>
parents:
50207
diff
changeset
|
2666 #define TEST_COND(cond) \ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2667 ((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
|
2668 |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2669 static PyObject * |
|
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2670 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
|
2671 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2672 int result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2673 PyObject *v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2674 CHECK_BINOP(self, other); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2675 if (self == other) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2676 result = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2677 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2678 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
|
2679 /* 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
|
2680 switch (op) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2681 case Py_EQ: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2682 v = TEST_COND(result == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2683 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2684 case Py_NE: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2685 v = TEST_COND(result != 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2686 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2687 case Py_LE: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2688 v = TEST_COND(result <= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2689 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2690 case Py_GE: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2691 v = TEST_COND(result >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2692 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2693 case Py_LT: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2694 v = TEST_COND(result == -1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2695 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2696 case Py_GT: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2697 v = TEST_COND(result == 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2698 break; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2699 default: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2700 PyErr_BadArgument(); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2701 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2702 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2703 Py_INCREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2704 return v; |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2705 } |
|
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39610
diff
changeset
|
2706 |
|
65494
e8969fb822fc
make hashes always the size of pointers; introduce Py_hash_t #9778
Benjamin Peterson <benjamin@python.org>
parents:
62154
diff
changeset
|
2707 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
|
2708 long_hash(PyLongObject *v) |
|
1257
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2709 { |
|
65603
be8ae6b17539
follow up to #9778: define and use an unsigned hash type
Benjamin Peterson <benjamin@python.org>
parents:
65494
diff
changeset
|
2710 Py_uhash_t x; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2711 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2712 int sign; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2713 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2714 i = Py_SIZE(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2715 switch(i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2716 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
|
2717 case 0: return 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2718 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
|
2719 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2720 sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2721 x = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2722 if (i < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2723 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2724 i = -(i); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2725 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2726 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
|
2727 /* 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
|
2728 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
|
2729 _PyHASH_MODULUS. |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2730 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2731 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
|
2732 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
|
2733 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2734 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
|
2735 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2736 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
|
2737 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
|
2738 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
|
2739 _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
|
2740 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
|
2741 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
|
2742 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
|
2743 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2744 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
|
2745 |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2746 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
|
2747 _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
|
2748 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
|
2749 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
|
2750 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
|
2751 _PyHASH_MODULUS. */ |
|
0bc8ffe6ba9a
Issue #8188: Introduce a new scheme for computing hashes of numbers
Mark Dickinson <dickinsm@gmail.com>
parents:
61492
diff
changeset
|
2752 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
|
2753 (x >> (_PyHASH_BITS - PyLong_SHIFT)); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2754 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
|
2755 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
|
2756 x -= _PyHASH_MODULUS; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2757 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2758 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
|
2759 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
|
2760 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
|
2761 return (Py_hash_t)x; |
|
1257
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2762 } |
|
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2763 |
|
1cabc2b6c970
* Changed all copyright messages to include 1993.
Guido van Rossum <guido@python.org>
parents:
1252
diff
changeset
|
2764 |
| 230 | 2765 /* Add the absolute values of two long integers. */ |
| 2766 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2767 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
|
2768 x_add(PyLongObject *a, PyLongObject *b) |
| 230 | 2769 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2770 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
|
2771 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2772 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2773 digit carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2774 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2775 /* 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
|
2776 if (size_a < size_b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2777 { 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
|
2778 { Py_ssize_t size_temp = size_a; |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2779 size_a = size_b; |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2780 size_b = size_temp; } |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2781 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2782 z = _PyLong_New(size_a+1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2783 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2784 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2785 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
|
2786 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
|
2787 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
|
2788 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2789 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2790 for (; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2791 carry += a->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2792 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
|
2793 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2794 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2795 z->ob_digit[i] = carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2796 return long_normalize(z); |
| 230 | 2797 } |
| 2798 | |
| 2799 /* Subtract the absolute values of two integers. */ | |
| 2800 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2801 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
|
2802 x_sub(PyLongObject *a, PyLongObject *b) |
| 230 | 2803 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2804 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
|
2805 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2806 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2807 int sign = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2808 digit borrow = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2809 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2810 /* 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
|
2811 if (size_a < size_b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2812 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2813 { 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
|
2814 { Py_ssize_t size_temp = size_a; |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2815 size_a = size_b; |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2816 size_b = size_temp; } |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2817 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2818 else if (size_a == size_b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2819 /* 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
|
2820 i = size_a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2821 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
|
2822 ; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2823 if (i < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2824 return (PyLongObject *)PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2825 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
|
2826 sign = -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2827 { 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
|
2828 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2829 size_a = size_b = i+1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2830 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2831 z = _PyLong_New(size_a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2832 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2833 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2834 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
|
2835 /* The following assumes unsigned arithmetic |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2836 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
|
2837 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
|
2838 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
|
2839 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2840 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
|
2841 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2842 for (; i < size_a; ++i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2843 borrow = a->ob_digit[i] - borrow; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2844 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
|
2845 borrow >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2846 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
|
2847 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2848 assert(borrow == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2849 if (sign < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2850 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2851 return long_normalize(z); |
| 230 | 2852 } |
| 2853 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2854 static PyObject * |
| 43313 | 2855 long_add(PyLongObject *a, PyLongObject *b) |
| 230 | 2856 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2857 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2858 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2859 CHECK_BINOP(a, b); |
|
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 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
|
2862 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
|
2863 MEDIUM_VALUE(b)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2864 return result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2865 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2866 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2867 if (Py_SIZE(b) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2868 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2869 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
|
2870 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2871 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2872 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2873 z = x_sub(b, a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2874 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2875 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2876 if (Py_SIZE(b) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2877 z = x_sub(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2878 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2879 z = x_add(a, b); |
|
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 return (PyObject *)z; |
| 230 | 2882 } |
| 2883 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
2884 static PyObject * |
| 43313 | 2885 long_sub(PyLongObject *a, PyLongObject *b) |
| 230 | 2886 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2887 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2888 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2889 CHECK_BINOP(a, b); |
|
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 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
|
2892 PyObject* r; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2893 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
|
2894 return r; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2895 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2896 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2897 if (Py_SIZE(b) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2898 z = x_sub(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2899 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2900 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2901 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
|
2902 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2903 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2904 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2905 if (Py_SIZE(b) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2906 z = x_add(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2907 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2908 z = x_sub(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2909 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2910 return (PyObject *)z; |
| 230 | 2911 } |
| 2912 | |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2913 /* 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
|
2914 * 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
|
2915 */ |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2916 static PyLongObject * |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2917 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
|
2918 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2919 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2920 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
|
2921 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
|
2922 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2923 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2924 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
|
2925 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2926 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2927 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2928 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
|
2929 if (a == b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2930 /* 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
|
2931 * 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
|
2932 * 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
|
2933 * 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
|
2934 * 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
|
2935 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2936 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
|
2937 twodigits carry; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2938 twodigits f = a->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2939 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
|
2940 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
|
2941 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
|
2942 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2943 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2944 Py_DECREF(z); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2945 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
2946 }); |
|
61467
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 carry = *pz + f * f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2949 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2950 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2951 assert(carry <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2952 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2953 /* 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
|
2954 * 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
|
2955 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2956 f <<= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2957 while (pa < paend) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2958 carry += *pz + *pa++ * f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2959 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2960 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2961 assert(carry <= (PyLong_MASK << 1)); |
|
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 (carry) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2964 carry += *pz; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2965 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2966 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2967 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2968 if (carry) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2969 *pz += (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2970 assert((carry >> PyLong_SHIFT) == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2971 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2972 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2973 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
|
2974 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
|
2975 twodigits carry = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2976 twodigits f = a->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2977 digit *pz = z->ob_digit + i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2978 digit *pb = b->ob_digit; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2979 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
|
2980 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2981 SIGCHECK({ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2982 Py_DECREF(z); |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
2983 return NULL; |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
2984 }); |
|
61467
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 while (pb < pbend) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2987 carry += *pz + *pb++ * f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2988 *pz++ = (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2989 carry >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2990 assert(carry <= PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2991 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2992 if (carry) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2993 *pz += (digit)(carry & PyLong_MASK); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2994 assert((carry >> PyLong_SHIFT) == 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2995 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2996 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
2997 return long_normalize(z); |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2998 } |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
2999 |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3000 /* 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
|
3001 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
|
3002 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
|
3003 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
|
3004 the return values are >= 0. |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3005 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
|
3006 */ |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3007 static int |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3008 kmul_split(PyLongObject *n, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3009 Py_ssize_t size, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3010 PyLongObject **high, |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3011 PyLongObject **low) |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3012 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3013 PyLongObject *hi, *lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3014 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
|
3015 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
|
3016 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3017 size_lo = MIN(size_n, size); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3018 size_hi = size_n - size_lo; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3019 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3020 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
|
3021 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3022 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
|
3023 Py_DECREF(hi); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3024 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3025 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3026 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3027 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
|
3028 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
|
3029 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3030 *high = long_normalize(hi); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3031 *low = long_normalize(lo); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3032 return 0; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3033 } |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3034 |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3035 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
|
3036 |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3037 /* 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
|
3038 * 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
|
3039 * 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
|
3040 */ |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3041 static PyLongObject * |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3042 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
|
3043 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3044 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
|
3045 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
|
3046 PyLongObject *ah = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3047 PyLongObject *al = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3048 PyLongObject *bh = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3049 PyLongObject *bl = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3050 PyLongObject *ret = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3051 PyLongObject *t1, *t2, *t3; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3052 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
|
3053 Py_ssize_t i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3054 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3055 /* (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
|
3056 * 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
|
3057 * Then the original product is |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3058 * 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
|
3059 * 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
|
3060 * 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
|
3061 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3062 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3063 /* 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
|
3064 * is largest. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3065 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3066 if (asize > bsize) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3067 t1 = a; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3068 a = b; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3069 b = t1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3070 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3071 i = asize; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3072 asize = bsize; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3073 bsize = i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3074 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3075 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3076 /* 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
|
3077 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
|
3078 if (asize <= i) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3079 if (asize == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3080 return (PyLongObject *)PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3081 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3082 return x_mul(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3083 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3084 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3085 /* 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
|
3086 * 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
|
3087 * 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
|
3088 * 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
|
3089 * 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
|
3090 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3091 if (2 * asize <= bsize) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3092 return k_lopsided_mul(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3093 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3094 /* 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
|
3095 shift = bsize >> 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3096 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
|
3097 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
|
3098 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3099 if (a == b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3100 bh = ah; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3101 bl = al; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3102 Py_INCREF(bh); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3103 Py_INCREF(bl); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3104 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3105 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
|
3106 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3107 /* The plan: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3108 * 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
|
3109 * enough). |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3110 * 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
|
3111 * 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
|
3112 * can't overlap with #2. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3113 * 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
|
3114 * 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
|
3115 * 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
|
3116 * 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
|
3117 * 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
|
3118 * 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
|
3119 * 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
|
3120 * at shift. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3121 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3122 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3123 /* 1. Allocate result space. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3124 ret = _PyLong_New(asize + bsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3125 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
|
3126 #ifdef Py_DEBUG |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3127 /* 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
|
3128 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
|
3129 #endif |
|
24751
dbf6e563023b
x_mul(): This failed to normalize its result.
Tim Peters <tim.peters@gmail.com>
parents:
24750
diff
changeset
|
3130 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3131 /* 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
|
3132 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
|
3133 assert(Py_SIZE(t1) >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3134 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
|
3135 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
|
3136 Py_SIZE(t1) * sizeof(digit)); |
|
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 /* 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
|
3139 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
|
3140 if (i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3141 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
|
3142 i * 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 /* 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
|
3145 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
|
3146 Py_DECREF(t1); |
|
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 assert(Py_SIZE(t2) >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3150 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
|
3151 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
|
3152 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3153 /* Zero out remaining digits. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3154 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
|
3155 if (i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3156 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
|
3157 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3158 /* 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
|
3159 * because it's fresher in cache. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3160 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3161 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
|
3162 (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
|
3163 Py_DECREF(t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3164 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3165 (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
|
3166 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3167 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3168 /* 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
|
3169 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
|
3170 Py_DECREF(ah); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3171 Py_DECREF(al); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3172 ah = al = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3173 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3174 if (a == b) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3175 t2 = t1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3176 Py_INCREF(t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3177 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3178 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
|
3179 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3180 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3181 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3182 Py_DECREF(bh); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3183 Py_DECREF(bl); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3184 bh = bl = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3185 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3186 t3 = k_mul(t1, t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3187 Py_DECREF(t1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3188 Py_DECREF(t2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3189 if (t3 == NULL) goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3190 assert(Py_SIZE(t3) >= 0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3191 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3192 /* 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
|
3193 * See the (*) comment after this function. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3194 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3195 (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
|
3196 Py_DECREF(t3); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3197 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3198 return long_normalize(ret); |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3199 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3200 fail: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3201 Py_XDECREF(ret); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3202 Py_XDECREF(ah); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3203 Py_XDECREF(al); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3204 Py_XDECREF(bh); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3205 Py_XDECREF(bl); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3206 return NULL; |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3207 } |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3208 |
|
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
|
3209 /* (*) 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
|
3210 |
|
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
|
3211 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
|
3212 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
|
3213 |
|
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
|
3214 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
|
3215 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
|
3216 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
|
3217 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
|
3218 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
|
3219 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
|
3220 |
|
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
|
3221 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
|
3222 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
|
3223 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
|
3224 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
|
3225 |
|
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
|
3226 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
|
3227 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
|
3228 |
|
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
|
3229 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
|
3230 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
|
3231 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
|
3232 |
|
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
|
3233 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
|
3234 |
|
10a4ec45549d
k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits"
Tim Peters <tim.peters@gmail.com>
parents:
24845
diff
changeset
|
3235 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
|
3236 |
|
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
|
3237 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
|
3238 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
|
3239 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
|
3240 (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
|
3241 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
|
3242 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
|
3243 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
|
3244 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
|
3245 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
|
3246 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
|
3247 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
|
3248 |
|
24824
7c91d303c563
k_mul() comments: Simplified the simplified explanation of why ah*bh and
Tim Peters <tim.peters@gmail.com>
parents:
24821
diff
changeset
|
3249 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
|
3250 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
|
3251 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
|
3252 */ |
|
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
|
3253 |
|
24773
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3254 /* 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
|
3255 * 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
|
3256 * 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
|
3257 * 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
|
3258 * 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
|
3259 * 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
|
3260 * 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
|
3261 */ |
|
801a44ab2aae
Added new function k_lopsided_mul(), which is much more efficient than
Tim Peters <tim.peters@gmail.com>
parents:
24765
diff
changeset
|
3262 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
|
3263 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
|
3264 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3265 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
|
3266 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
|
3267 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
|
3268 PyLongObject *ret; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3269 PyLongObject *bslice = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3270 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3271 assert(asize > KARATSUBA_CUTOFF); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3272 assert(2 * asize <= bsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3273 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3274 /* 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
|
3275 ret = _PyLong_New(asize + bsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3276 if (ret == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3277 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3278 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
|
3279 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3280 /* 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
|
3281 bslice = _PyLong_New(asize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3282 if (bslice == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3283 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3284 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3285 nbdone = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3286 while (bsize > 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3287 PyLongObject *product; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3288 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
|
3289 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3290 /* 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
|
3291 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
|
3292 nbtouse * sizeof(digit)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3293 Py_SIZE(bslice) = nbtouse; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3294 product = k_mul(a, bslice); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3295 if (product == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3296 goto fail; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3297 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3298 /* Add into result. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3299 (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
|
3300 product->ob_digit, Py_SIZE(product)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3301 Py_DECREF(product); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3302 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3303 bsize -= nbtouse; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3304 nbdone += nbtouse; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3305 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3306 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3307 Py_DECREF(bslice); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3308 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
|
3309 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3310 fail: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3311 Py_DECREF(ret); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3312 Py_XDECREF(bslice); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3313 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
|
3314 } |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3315 |
|
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3316 static PyObject * |
| 43313 | 3317 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
|
3318 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3319 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3320 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3321 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3322 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3323 /* fast path for single-digit multiplication */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3324 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
|
3325 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
|
3326 #ifdef HAVE_LONG_LONG |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3327 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
|
3328 #else |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3329 /* 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
|
3330 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
|
3331 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
|
3332 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
|
3333 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
|
3334 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
|
3335 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
|
3336 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3337 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3338 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3339 z = k_mul(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3340 /* 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
|
3341 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
|
3342 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3343 return (PyObject *)z; |
| 230 | 3344 } |
| 3345 | |
| 613 | 3346 /* The / and % operators are now defined in terms of divmod(). |
| 3347 The expression a mod b has the value a - b*floor(a/b). | |
| 3348 The long_divrem function gives the remainder after division of | |
| 230 | 3349 |a| by |b|, with the sign of a. This is also expressed |
| 3350 as a - b*trunc(a/b), if trunc truncates towards zero. | |
| 3351 Some examples: | |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3352 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
|
3353 13 10 3 3 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3354 -13 10 -3 7 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3355 13 -10 3 -7 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3356 -13 -10 -3 -3 |
| 230 | 3357 So, to get from rem to mod, we have to add b if a and b |
| 242 | 3358 have different signs. We then subtract one from the 'div' |
| 3359 part of the outcome to keep the invariant intact. */ | |
| 230 | 3360 |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3361 /* Compute |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3362 * *pdiv, *pmod = divmod(v, w) |
|
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3363 * 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
|
3364 * 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
|
3365 * 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
|
3366 */ |
| 613 | 3367 static int |
|
24745
ba035f4b47c1
Cautious introduction of a patch that started from
Tim Peters <tim.peters@gmail.com>
parents:
24280
diff
changeset
|
3368 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
|
3369 PyLongObject **pdiv, PyLongObject **pmod) |
| 613 | 3370 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3371 PyLongObject *div, *mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3372 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3373 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
|
3374 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3375 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
|
3376 (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
|
3377 PyLongObject *temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3378 PyLongObject *one; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3379 temp = (PyLongObject *) long_add(mod, w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3380 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3381 mod = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3382 if (mod == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3383 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3384 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3385 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3386 one = (PyLongObject *) PyLong_FromLong(1L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3387 if (one == NULL || |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3388 (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
|
3389 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3390 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3391 Py_XDECREF(one); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3392 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3393 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3394 Py_DECREF(one); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3395 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3396 div = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3397 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3398 if (pdiv != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3399 *pdiv = div; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3400 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3401 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3402 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3403 if (pmod != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3404 *pmod = mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3405 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3406 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3407 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3408 return 0; |
| 613 | 3409 } |
| 3410 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3411 static PyObject * |
| 43313 | 3412 long_div(PyObject *a, PyObject *b) |
| 613 | 3413 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3414 PyLongObject *div; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3415 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3416 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3417 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
|
3418 div = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3419 return (PyObject *)div; |
| 613 | 3420 } |
| 3421 | |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3422 /* PyLong/PyLong -> float, with correctly rounded result. */ |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3423 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3424 #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
|
3425 #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
|
3426 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3427 static PyObject * |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3428 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
|
3429 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3430 PyLongObject *a, *b, *x; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3431 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
|
3432 digit mask, low; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3433 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
|
3434 double dx, result; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3435 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3436 CHECK_BINOP(v, w); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3437 a = (PyLongObject *)v; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3438 b = (PyLongObject *)w; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3439 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3440 /* |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3441 Method in a nutshell: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3442 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3443 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
|
3444 1. choose a suitable integer 'shift' |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3445 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
|
3446 3. adjust x for correct rounding |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3447 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
|
3448 5. return ldexp(dx, shift). |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3449 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3450 In more detail: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3451 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3452 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
|
3453 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
|
3454 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
|
3455 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
|
3456 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
|
3457 for b). Then |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3458 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3459 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
|
3460 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3461 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
|
3462 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
|
3463 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
|
3464 the way, we can assume that |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3465 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3466 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
|
3467 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3468 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
|
3469 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
|
3470 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
|
3471 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
|
3472 straightforward formula for shift is: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3473 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3474 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
|
3475 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3476 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
|
3477 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
|
3478 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
|
3479 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
|
3480 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3481 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
|
3482 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3483 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
|
3484 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
|
3485 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
|
3486 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
|
3487 needed at the rounding stage. |
|
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 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
|
3490 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
|
3491 that x >= 1. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3492 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3493 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
|
3494 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
|
3495 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3496 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
|
3497 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3498 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
|
3499 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
|
3500 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
|
3501 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3502 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
|
3503 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3504 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
|
3505 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
|
3506 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
|
3507 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3508 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
|
3509 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
|
3510 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
|
3511 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
|
3512 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
|
3513 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
|
3514 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3515 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
|
3516 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
|
3517 danger of rounding errors. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3518 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3519 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
|
3520 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
|
3521 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
|
3522 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
|
3523 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
|
3524 returning. |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3525 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3526 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3527 /* 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
|
3528 a_size = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3529 b_size = ABS(Py_SIZE(b)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3530 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
|
3531 if (b_size == 0) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3532 PyErr_SetString(PyExc_ZeroDivisionError, |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3533 "division by zero"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3534 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3535 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3536 if (a_size == 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3537 goto underflow_or_zero; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3538 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3539 /* 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
|
3540 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
|
3541 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
|
3542 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
|
3543 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
|
3544 (a_size == MANT_DIG_DIGITS+1 && |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3545 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
|
3546 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
|
3547 (b_size == MANT_DIG_DIGITS+1 && |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3548 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
|
3549 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
|
3550 double da, db; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3551 da = a->ob_digit[--a_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3552 while (a_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3553 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
|
3554 db = b->ob_digit[--b_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3555 while (b_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3556 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
|
3557 result = da / db; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3558 goto success; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3559 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3560 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3561 /* 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
|
3562 diff = a_size - b_size; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3563 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
|
3564 /* Extreme overflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3565 goto overflow; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3566 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
|
3567 /* Extreme underflow */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3568 goto underflow_or_zero; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3569 /* 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
|
3570 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
|
3571 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
|
3572 /* Now diff = a_bits - b_bits. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3573 if (diff > DBL_MAX_EXP) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3574 goto overflow; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3575 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
|
3576 goto underflow_or_zero; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3577 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3578 /* 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
|
3579 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
|
3580 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3581 inexact = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3582 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3583 /* x = abs(a * 2**-shift) */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3584 if (shift <= 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3585 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
|
3586 digit rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3587 /* x = a << -shift */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3588 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
|
3589 /* 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
|
3590 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
|
3591 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
|
3592 PyErr_SetString(PyExc_OverflowError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3593 "intermediate overflow during division"); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3594 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3595 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3596 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
|
3597 if (x == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3598 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3599 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
|
3600 x->ob_digit[i] = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3601 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
|
3602 a_size, -shift % PyLong_SHIFT); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3603 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
|
3604 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3605 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3606 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
|
3607 digit rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3608 /* x = a >> shift */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3609 assert(a_size >= shift_digits); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3610 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
|
3611 if (x == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3612 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3613 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
|
3614 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
|
3615 /* 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
|
3616 if (rem) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3617 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3618 while (!inexact && shift_digits > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3619 if (a->ob_digit[--shift_digits]) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3620 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3621 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3622 long_normalize(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3623 x_size = Py_SIZE(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3624 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3625 /* 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
|
3626 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
|
3627 if (b_size == 1) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3628 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
|
3629 b->ob_digit[0]); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3630 long_normalize(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3631 if (rem) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3632 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3633 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3634 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3635 PyLongObject *div, *rem; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3636 div = x_divrem(x, b, &rem); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3637 Py_DECREF(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3638 x = div; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3639 if (x == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3640 goto error; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3641 if (Py_SIZE(rem)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3642 inexact = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3643 Py_DECREF(rem); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3644 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3645 x_size = ABS(Py_SIZE(x)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3646 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
|
3647 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
|
3648 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3649 /* 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
|
3650 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
|
3651 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
|
3652 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3653 /* 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
|
3654 mask = (digit)1 << (extra_bits - 1); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3655 low = x->ob_digit[0] | inexact; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3656 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
|
3657 low += mask; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3658 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
|
3659 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3660 /* 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
|
3661 dx = x->ob_digit[--x_size]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3662 while (x_size > 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3663 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
|
3664 Py_DECREF(x); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3665 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3666 /* 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
|
3667 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
|
3668 (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
|
3669 goto overflow; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3670 result = ldexp(dx, (int)shift); |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3671 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3672 success: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3673 return PyFloat_FromDouble(negate ? -result : result); |
|
57942
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3674 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3675 underflow_or_zero: |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3676 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
|
3677 |
|
aaa5ab7b942a
Merged revisions 77062 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
57858
diff
changeset
|
3678 overflow: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3679 PyErr_SetString(PyExc_OverflowError, |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3680 "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
|
3681 error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3682 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
|
3683 } |
|
685dcae5c123
Move long_true_divide next to the other division routines (for clarity!).
Tim Peters <tim.peters@gmail.com>
parents:
19674
diff
changeset
|
3684 |
|
685dcae5c123
Move long_true_divide next to the other division routines (for clarity!).
Tim Peters <tim.peters@gmail.com>
parents:
19674
diff
changeset
|
3685 static PyObject * |
| 43313 | 3686 long_mod(PyObject *a, PyObject *b) |
| 613 | 3687 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3688 PyLongObject *mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3689 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3690 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3691 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3692 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
|
3693 mod = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3694 return (PyObject *)mod; |
| 613 | 3695 } |
| 3696 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3697 static PyObject * |
| 43313 | 3698 long_divmod(PyObject *a, PyObject *b) |
| 230 | 3699 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3700 PyLongObject *div, *mod; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3701 PyObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3702 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3703 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3704 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3705 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
|
3706 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3707 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3708 z = PyTuple_New(2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3709 if (z != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3710 PyTuple_SetItem(z, 0, (PyObject *) div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3711 PyTuple_SetItem(z, 1, (PyObject *) mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3712 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3713 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3714 Py_DECREF(div); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3715 Py_DECREF(mod); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3716 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3717 return z; |
| 230 | 3718 } |
| 3719 | |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3720 /* pow(v, w, x) */ |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3721 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
|
3722 long_pow(PyObject *v, PyObject *w, PyObject *x) |
| 230 | 3723 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3724 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
|
3725 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
|
3726 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3727 PyLongObject *z = NULL; /* accumulated result */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3728 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
|
3729 PyLongObject *temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3730 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3731 /* 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
|
3732 * 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
|
3733 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3734 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
|
3735 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
|
3736 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3737 /* a, b, c = v, w, x */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3738 CHECK_BINOP(v, w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3739 a = (PyLongObject*)v; Py_INCREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3740 b = (PyLongObject*)w; Py_INCREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3741 if (PyLong_Check(x)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3742 c = (PyLongObject *)x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3743 Py_INCREF(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3744 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3745 else if (x == Py_None) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3746 c = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3747 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3748 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3749 Py_DECREF(b); |
|
71810
d0b0fcbb40db
Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED.
Brian Curtin <brian@python.org>
parents:
68586
diff
changeset
|
3750 Py_RETURN_NOTIMPLEMENTED; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3751 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3752 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3753 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
|
3754 if (c) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3755 PyErr_SetString(PyExc_TypeError, "pow() 2nd argument " |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3756 "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
|
3757 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3758 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3759 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3760 /* 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
|
3761 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
|
3762 arguments to double. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3763 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3764 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3765 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
|
3766 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3767 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3768 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3769 if (c) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3770 /* if modulus == 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3771 raise ValueError() */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3772 if (Py_SIZE(c) == 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3773 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3774 "pow() 3rd argument cannot be 0"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3775 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3776 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3777 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3778 /* if modulus < 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3779 negativeOutput = True |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3780 modulus = -modulus */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3781 if (Py_SIZE(c) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3782 negativeOutput = 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3783 temp = (PyLongObject *)_PyLong_Copy(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3784 if (temp == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3785 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3786 Py_DECREF(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3787 c = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3788 temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3789 NEGATE(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3790 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3791 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3792 /* if modulus == 1: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3793 return 0 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3794 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
|
3795 z = (PyLongObject *)PyLong_FromLong(0L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3796 goto Done; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3797 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3798 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3799 /* if base < 0: |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3800 base = base % modulus |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3801 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
|
3802 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3803 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
|
3804 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3805 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3806 a = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3807 temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3808 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3809 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3810 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3811 /* 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
|
3812 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
|
3813 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3814 z = (PyLongObject *)PyLong_FromLong(1L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3815 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3816 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3817 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3818 /* 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
|
3819 * is NULL. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3820 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3821 #define REDUCE(X) \ |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3822 do { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3823 if (c != NULL) { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3824 if (l_divmod(X, c, NULL, &temp) < 0) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3825 goto Error; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3826 Py_XDECREF(X); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3827 X = temp; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3828 temp = NULL; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3829 } \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3830 } while(0) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3831 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3832 /* 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
|
3833 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
|
3834 #define MULT(X, Y, result) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3835 do { \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3836 temp = (PyLongObject *)long_mul(X, Y); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3837 if (temp == NULL) \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3838 goto Error; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3839 Py_XDECREF(result); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3840 result = temp; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3841 temp = NULL; \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3842 REDUCE(result); \ |
|
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3843 } while(0) |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3844 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3845 if (Py_SIZE(b) <= FIVEARY_CUTOFF) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3846 /* 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
|
3847 /* 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
|
3848 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
|
3849 digit bi = b->ob_digit[i]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3850 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3851 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
|
3852 MULT(z, z, z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3853 if (bi & j) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3854 MULT(z, a, z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3855 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3856 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3857 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3858 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3859 /* 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
|
3860 Py_INCREF(z); /* still holds 1L */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3861 table[0] = z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3862 for (i = 1; i < 32; ++i) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3863 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
|
3864 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3865 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
|
3866 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
|
3867 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3868 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
|
3869 const int index = (bi >> j) & 0x1f; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3870 for (k = 0; k < 5; ++k) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3871 MULT(z, z, z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3872 if (index) |
|
61492
f1358aa33a6e
Merged revisions 81037 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61491
diff
changeset
|
3873 MULT(z, table[index], z); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3874 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3875 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3876 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3877 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3878 if (negativeOutput && (Py_SIZE(z) != 0)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3879 temp = (PyLongObject *)long_sub(z, c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3880 if (temp == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3881 goto Error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3882 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3883 z = temp; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3884 temp = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3885 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3886 goto Done; |
|
33327
5452d4ecddd0
SF patch 936813: fast modular exponentiation
Tim Peters <tim.peters@gmail.com>
parents:
33325
diff
changeset
|
3887 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3888 Error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3889 if (z != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3890 Py_DECREF(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3891 z = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3892 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3893 /* fall through */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3894 Done: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3895 if (Py_SIZE(b) > FIVEARY_CUTOFF) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3896 for (i = 0; i < 32; ++i) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3897 Py_XDECREF(table[i]); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3898 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3899 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3900 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3901 Py_XDECREF(c); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3902 Py_XDECREF(temp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3903 return (PyObject *)z; |
| 230 | 3904 } |
| 3905 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3906 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
|
3907 long_invert(PyLongObject *v) |
| 230 | 3908 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3909 /* Implement ~x as -(x+1) */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3910 PyLongObject *x; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3911 PyLongObject *w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3912 if (ABS(Py_SIZE(v)) <=1) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3913 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
|
3914 w = (PyLongObject *)PyLong_FromLong(1L); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3915 if (w == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3916 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3917 x = (PyLongObject *) long_add(v, w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3918 Py_DECREF(w); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3919 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3920 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3921 Py_SIZE(x) = -(Py_SIZE(x)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3922 return (PyObject *)maybe_small_long(x); |
| 230 | 3923 } |
| 3924 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3925 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
|
3926 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
|
3927 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3928 PyLongObject *z; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3929 if (ABS(Py_SIZE(v)) <= 1) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3930 return PyLong_FromLong(-MEDIUM_VALUE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3931 z = (PyLongObject *)_PyLong_Copy(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3932 if (z != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3933 Py_SIZE(z) = -(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3934 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
|
3935 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3936 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3937 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
|
3938 long_abs(PyLongObject *v) |
| 230 | 3939 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3940 if (Py_SIZE(v) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3941 return long_neg(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3942 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3943 return long_long((PyObject *)v); |
| 230 | 3944 } |
| 3945 | |
| 242 | 3946 static int |
|
40401
88133417dfd0
- patch #1600346 submitted by Tomer Filiba
Jack Diederich <jackdied@gmail.com>
parents:
39703
diff
changeset
|
3947 long_bool(PyLongObject *v) |
| 242 | 3948 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3949 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
|
3950 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
3951 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
3952 static PyObject * |
| 43313 | 3953 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
|
3954 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3955 PyLongObject *z = NULL; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3956 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
|
3957 digit lomask, himask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3958 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3959 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3960 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3961 if (Py_SIZE(a) < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3962 /* Right shifting negative numbers is harder */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3963 PyLongObject *a1, *a2; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3964 a1 = (PyLongObject *) long_invert(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3965 if (a1 == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3966 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3967 a2 = (PyLongObject *) long_rshift(a1, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3968 Py_DECREF(a1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3969 if (a2 == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3970 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3971 z = (PyLongObject *) long_invert(a2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3972 Py_DECREF(a2); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3973 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3974 else { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
3975 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
|
3976 if (shiftby == -1L && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3977 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3978 if (shiftby < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3979 PyErr_SetString(PyExc_ValueError, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3980 "negative shift count"); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3981 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3982 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3983 wordshift = shiftby / PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3984 newsize = ABS(Py_SIZE(a)) - wordshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3985 if (newsize <= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3986 return PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3987 loshift = shiftby % PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3988 hishift = PyLong_SHIFT - loshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3989 lomask = ((digit)1 << hishift) - 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3990 himask = PyLong_MASK ^ lomask; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3991 z = _PyLong_New(newsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3992 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3993 goto rshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3994 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3995 Py_SIZE(z) = -(Py_SIZE(z)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
3996 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
|
3997 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
|
3998 if (i+1 < newsize) |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
3999 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
|
4000 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4001 z = long_normalize(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4002 } |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4003 rshift_error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4004 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
|
4005 |
|
443
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4006 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4007 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4008 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
|
4009 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
|
4010 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4011 /* This version due to Tim Peters */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4012 PyLongObject *a = (PyLongObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4013 PyLongObject *b = (PyLongObject*)w; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4014 PyLongObject *z = NULL; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4015 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
|
4016 twodigits accum; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4017 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4018 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4019 |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4020 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
|
4021 if (shiftby == -1L && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4022 goto lshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4023 if (shiftby < 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4024 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
|
4025 goto lshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4026 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4027 /* 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
|
4028 wordshift = shiftby / PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4029 remshift = shiftby - wordshift * PyLong_SHIFT; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4030 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4031 oldsize = ABS(Py_SIZE(a)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4032 newsize = oldsize + wordshift; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4033 if (remshift) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4034 ++newsize; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4035 z = _PyLong_New(newsize); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4036 if (z == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4037 goto lshift_error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4038 if (Py_SIZE(a) < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4039 NEGATE(z); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4040 for (i = 0; i < wordshift; i++) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4041 z->ob_digit[i] = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4042 accum = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4043 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
|
4044 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
|
4045 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
|
4046 accum >>= PyLong_SHIFT; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4047 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4048 if (remshift) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4049 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
|
4050 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4051 assert(!accum); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4052 z = long_normalize(z); |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4053 lshift_error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4054 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
|
4055 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4056 |
|
56734
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
4057 /* 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
|
4058 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
|
4059 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
|
4060 |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
4061 static void |
|
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
4062 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
|
4063 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4064 Py_ssize_t i; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4065 digit carry = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4066 for (i = 0; i < m; ++i) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4067 carry += a[i] ^ PyLong_MASK; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4068 z[i] = carry & PyLong_MASK; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4069 carry >>= PyLong_SHIFT; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4070 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4071 assert(carry == 0); |
|
56734
4834a4285411
Merged revisions 75697 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
56264
diff
changeset
|
4072 } |
|
590
f11fae8ee1e4
Changed to 2's complement bitwise ops. Got rid of ZABS etc.
Guido van Rossum <guido@python.org>
parents:
546
diff
changeset
|
4073 |
|
f11fae8ee1e4
Changed to 2's complement bitwise ops. Got rid of ZABS etc.
Guido van Rossum <guido@python.org>
parents:
546
diff
changeset
|
4074 /* 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
|
4075 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4076 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
|
4077 long_bitwise(PyLongObject *a, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4078 int op, /* '&', '|', '^' */ |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4079 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
|
4080 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4081 int nega, negb, negz; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4082 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
|
4083 PyLongObject *z; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4084 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4085 /* 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
|
4086 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
|
4087 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
|
4088 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
|
4089 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4090 /* 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
|
4091 size_a = ABS(Py_SIZE(a)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4092 nega = Py_SIZE(a) < 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4093 if (nega) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4094 z = _PyLong_New(size_a); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4095 if (z == NULL) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4096 return NULL; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4097 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
|
4098 a = z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4099 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4100 else |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4101 /* Keep reference count consistent. */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4102 Py_INCREF(a); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4103 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4104 /* Same for b. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4105 size_b = ABS(Py_SIZE(b)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4106 negb = Py_SIZE(b) < 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4107 if (negb) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4108 z = _PyLong_New(size_b); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4109 if (z == NULL) { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4110 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4111 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4112 } |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4113 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
|
4114 b = z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4115 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4116 else |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4117 Py_INCREF(b); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4118 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4119 /* 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
|
4120 if (size_a < size_b) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4121 z = a; a = b; b = z; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4122 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
|
4123 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
|
4124 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4125 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4126 /* 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
|
4127 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
|
4128 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
|
4129 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
|
4130 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
|
4131 negative number. |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4132 */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4133 switch (op) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4134 case '^': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4135 negz = nega ^ negb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4136 size_z = size_a; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4137 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4138 case '&': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4139 negz = nega & negb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4140 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
|
4141 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4142 case '|': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4143 negz = nega | negb; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4144 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
|
4145 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4146 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4147 PyErr_BadArgument(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4148 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4149 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4150 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4151 /* 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
|
4152 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
|
4153 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
|
4154 if (z == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4155 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4156 Py_DECREF(b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4157 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4158 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4159 |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4160 /* 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
|
4161 switch(op) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4162 case '&': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4163 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
|
4164 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
|
4165 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4166 case '|': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4167 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
|
4168 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
|
4169 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4170 case '^': |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4171 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
|
4172 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
|
4173 break; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4174 default: |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4175 PyErr_BadArgument(); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4176 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4177 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4178 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4179 /* 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
|
4180 if (op == '^' && negb) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4181 for (; i < size_z; ++i) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4182 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
|
4183 else if (i < size_z) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4184 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
|
4185 (size_z-i)*sizeof(digit)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4186 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4187 /* Complement result if negative. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4188 if (negz) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4189 Py_SIZE(z) = -(Py_SIZE(z)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4190 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
|
4191 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
|
4192 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4193 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4194 Py_DECREF(a); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4195 Py_DECREF(b); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4196 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
|
4197 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4198 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4199 static PyObject * |
| 43313 | 4200 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
|
4201 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4202 PyObject *c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4203 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4204 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
|
4205 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
|
4206 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4207 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4208 static PyObject * |
| 43313 | 4209 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
|
4210 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4211 PyObject *c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4212 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4213 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
|
4214 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
|
4215 } |
|
9f85beb1f7c8
Made the sign use one's complement; implemented shifting and masking operators.
Guido van Rossum <guido@python.org>
parents:
406
diff
changeset
|
4216 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4217 static PyObject * |
| 43313 | 4218 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
|
4219 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4220 PyObject *c; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4221 CHECK_BINOP(a, b); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4222 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
|
4223 return c; |
| 242 | 4224 } |
| 4225 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4226 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
|
4227 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
|
4228 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4229 if (PyLong_CheckExact(v)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4230 Py_INCREF(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4231 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4232 v = _PyLong_Copy((PyLongObject *)v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4233 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
|
4234 } |
|
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4235 |
|
d31ddc66b1b5
Change int() so that passing a string, unicode, float or long argument
Walter Dörwald <walter@livinglogic.de>
parents:
26081
diff
changeset
|
4236 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
|
4237 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
|
4238 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4239 double result; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4240 result = PyLong_AsDouble(v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4241 if (result == -1.0 && PyErr_Occurred()) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4242 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4243 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
|
4244 } |
|
2ed511171809
Made builtins int(), long(), float(), oct() and hex() more generic.
Guido van Rossum <guido@python.org>
parents:
958
diff
changeset
|
4245 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4246 static PyObject * |
|
19552
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4247 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
|
4248 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4249 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4250 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
|
4251 { |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4252 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
|
4253 long base; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4254 int overflow; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4255 static char *kwlist[] = {"x", "base", 0}; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4256 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4257 if (type != &PyLong_Type) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4258 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
|
4259 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
|
4260 &x, &obase)) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4261 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4262 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4263 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
|
4264 if (obase == NULL) |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4265 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
|
4266 |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4267 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
|
4268 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
|
4269 return NULL; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4270 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
|
4271 PyErr_SetString(PyExc_ValueError, |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4272 "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
|
4273 return NULL; |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4274 } |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4275 |
|
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4276 if (PyUnicode_Check(x)) |
| 72475 | 4277 return PyLong_FromUnicodeObject(x, (int)base); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4278 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
|
4279 /* 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
|
4280 * 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
|
4281 char *string; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4282 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
|
4283 if (PyByteArray_Check(x)) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4284 string = PyByteArray_AS_STRING(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4285 else |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4286 string = PyBytes_AS_STRING(x); |
|
79004
3d5db784821f
Fix out of bounds read in long_new() for empty bytes with an explicit base. int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359
Christian Heimes <christian@cheimes.de>
parents:
76440
diff
changeset
|
4287 if (strlen(string) != (size_t)size || !size) { |
|
3d5db784821f
Fix out of bounds read in long_new() for empty bytes with an explicit base. int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359
Christian Heimes <christian@cheimes.de>
parents:
76440
diff
changeset
|
4288 /* We only see this if there's a null byte in x or x is empty, |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4289 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
|
4290 PyErr_Format(PyExc_ValueError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4291 "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
|
4292 (int)base, x); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4293 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4294 } |
|
61940
c42ffb3d63af
Issue #2844: Make int('42', n) consistently raise ValueError for
Mark Dickinson <dickinsm@gmail.com>
parents:
61924
diff
changeset
|
4295 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
|
4296 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4297 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4298 PyErr_SetString(PyExc_TypeError, |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4299 "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
|
4300 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4301 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4302 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4303 |
|
19552
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4304 /* 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
|
4305 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
|
4306 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
|
4307 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
|
4308 */ |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4309 static PyObject * |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4310 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
|
4311 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4312 PyLongObject *tmp, *newobj; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4313 Py_ssize_t i, n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4314 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4315 assert(PyType_IsSubtype(type, &PyLong_Type)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4316 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
|
4317 if (tmp == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4318 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4319 assert(PyLong_CheckExact(tmp)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4320 n = Py_SIZE(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4321 if (n < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4322 n = -n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4323 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
|
4324 if (newobj == NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4325 Py_DECREF(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4326 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4327 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4328 assert(PyLong_Check(newobj)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4329 Py_SIZE(newobj) = Py_SIZE(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4330 for (i = 0; i < n; i++) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4331 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
|
4332 Py_DECREF(tmp); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4333 return (PyObject *)newobj; |
|
19552
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4334 } |
|
6c30d20d27f2
Make int, long and float subclassable.
Guido van Rossum <guido@python.org>
parents:
19343
diff
changeset
|
4335 |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4336 static PyObject * |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4337 long_getnewargs(PyLongObject *v) |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4338 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4339 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
|
4340 } |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4341 |
|
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
|
4342 static PyObject * |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4343 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
|
4344 return PyLong_FromLong(0L); |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4345 } |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4346 |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4347 static PyObject * |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4348 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
|
4349 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
|
4350 } |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4351 |
|
42753
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4352 static PyObject * |
|
42817
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4353 long__format__(PyObject *self, PyObject *args) |
|
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4354 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4355 PyObject *format_spec; |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4356 _PyUnicodeWriter writer; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4357 int ret; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4358 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4359 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
|
4360 return NULL; |
|
77223
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4361 |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4362 _PyUnicodeWriter_Init(&writer, 0); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4363 ret = _PyLong_FormatAdvancedWriter( |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4364 &writer, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4365 self, |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4366 format_spec, 0, PyUnicode_GET_LENGTH(format_spec)); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4367 if (ret == -1) { |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4368 _PyUnicodeWriter_Dealloc(&writer); |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4369 return NULL; |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4370 } |
|
22b56b0b8619
Issue #14744: Use the new _PyUnicodeWriter internal API to speed up str%args and str.format(args)
Victor Stinner <victor.stinner@gmail.com>
parents:
76560
diff
changeset
|
4371 return _PyUnicodeWriter_Finish(&writer); |
|
42817
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4372 } |
|
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4373 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4374 /* 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
|
4375 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
|
4376 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
|
4377 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
|
4378 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4379 PyObject * |
|
62154
0d9347934cc5
Fix naming inconsistency.
Mark Dickinson <dickinsm@gmail.com>
parents:
61940
diff
changeset
|
4380 _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
|
4381 { |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4382 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
|
4383 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
|
4384 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
|
4385 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4386 /* 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
|
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 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
|
4389 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
|
4390 # 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
|
4391 # 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
|
4392 # 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
|
4393 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
|
4394 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
|
4395 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
|
4396 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
|
4397 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
|
4398 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
|
4399 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4400 */ |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4401 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
|
4402 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
|
4403 "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
|
4404 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
|
4405 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4406 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4407 /* 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
|
4408 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
|
4409 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4410 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
|
4411 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
|
4412 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
|
4413 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4414 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
|
4415 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
|
4416 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4417 /* 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
|
4418 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
|
4419 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
|
4420 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
|
4421 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
|
4422 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
|
4423 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
|
4424 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
|
4425 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
|
4426 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
|
4427 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
|
4428 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4429 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
|
4430 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
|
4431 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4432 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
|
4433 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
|
4434 /* 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
|
4435 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
|
4436 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
|
4437 else |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4438 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
|
4439 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
|
4440 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
|
4441 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
|
4442 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
|
4443 /* 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
|
4444 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
|
4445 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
|
4446 else |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4447 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
|
4448 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
|
4449 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
|
4450 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
|
4451 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
|
4452 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4453 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4454 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
|
4455 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
|
4456 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
|
4457 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4458 /* 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
|
4459 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
|
4460 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
|
4461 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
|
4462 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
|
4463 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4464 error: |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4465 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
|
4466 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
|
4467 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
|
4468 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
|
4469 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4470 |
|
42817
5355337709e1
Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
42753
diff
changeset
|
4471 static PyObject * |
|
42753
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4472 long_round(PyObject *self, PyObject *args) |
|
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4473 { |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4474 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
|
4475 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4476 /* 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
|
4477 * 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
|
4478 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4479 * 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
|
4480 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4481 * 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
|
4482 * 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
|
4483 * 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
|
4484 * 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
|
4485 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4486 * 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
|
4487 * |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4488 * 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
|
4489 */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4490 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
|
4491 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4492 if (o_ndigits == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4493 return long_long(self); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4494 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4495 ndigits = PyNumber_Index(o_ndigits); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4496 if (ndigits == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4497 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4498 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4499 /* 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
|
4500 if (Py_SIZE(ndigits) >= 0) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4501 Py_DECREF(ndigits); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4502 return long_long(self); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4503 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4504 |
|
61924
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4505 /* 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
|
4506 temp = long_neg((PyLongObject*)ndigits); |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4507 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
|
4508 ndigits = temp; |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4509 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
|
4510 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
|
4511 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4512 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
|
4513 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
|
4514 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
|
4515 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
|
4516 } |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4517 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4518 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
|
4519 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
|
4520 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
|
4521 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
|
4522 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
|
4523 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
|
4524 |
|
62154
0d9347934cc5
Fix naming inconsistency.
Mark Dickinson <dickinsm@gmail.com>
parents:
61940
diff
changeset
|
4525 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
|
4526 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
|
4527 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
|
4528 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
|
4529 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
|
4530 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4531 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
|
4532 (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
|
4533 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
|
4534 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
|
4535 |
|
81a580d947ef
Issue #8817: Expose round-to-nearest variant of divmod in _PyLong_Divmod_Near
Mark Dickinson <dickinsm@gmail.com>
parents:
61873
diff
changeset
|
4536 return result; |
|
42753
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4537 } |
|
077fe7860cc9
Finish the work on __round__ and __trunc__.
Guido van Rossum <guido@python.org>
parents:
42719
diff
changeset
|
4538 |
|
47466
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4539 static PyObject * |
|
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4540 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
|
4541 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4542 Py_ssize_t res; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4543 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4544 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
|
4545 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
|
4546 } |
|
58f4b60773fe
Merged revisions 63856-63857,63859-63860 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
47393
diff
changeset
|
4547 |
|
50207
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4548 static PyObject * |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4549 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
|
4550 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4551 PyLongObject *result, *x, *y; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4552 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
|
4553 digit msd; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4554 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4555 assert(v != NULL); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4556 assert(PyLong_Check(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4557 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4558 ndigits = ABS(Py_SIZE(v)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4559 if (ndigits == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4560 return PyLong_FromLong(0); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4561 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4562 msd = v->ob_digit[ndigits-1]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4563 while (msd >= 32) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4564 msd_bits += 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4565 msd >>= 6; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4566 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4567 msd_bits += (long)(BitLengthTable[msd]); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4568 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4569 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
|
4570 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
|
4571 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4572 /* 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
|
4573 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
|
4574 if (result == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4575 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4576 x = (PyLongObject *)PyLong_FromLong(PyLong_SHIFT); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4577 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4578 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4579 y = (PyLongObject *)long_mul(result, x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4580 Py_DECREF(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4581 if (y == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4582 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4583 Py_DECREF(result); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4584 result = y; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4585 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4586 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
|
4587 if (x == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4588 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4589 y = (PyLongObject *)long_add(result, x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4590 Py_DECREF(x); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4591 if (y == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4592 goto error; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4593 Py_DECREF(result); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4594 result = y; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4595 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4596 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
|
4597 |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4598 error: |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4599 Py_DECREF(result); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4600 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
|
4601 } |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4602 |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4603 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
|
4604 "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
|
4605 \n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4606 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
|
4607 >>> 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
|
4608 '0b100101'\n\ |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4609 >>> (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
|
4610 6"); |
|
92e21652f2f4
Forward merge of r67822 to py3k: add bit_length method to int.
Mark Dickinson <dickinsm@gmail.com>
parents:
50026
diff
changeset
|
4611 |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4612 #if 0 |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4613 static PyObject * |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4614 long_is_finite(PyObject *v) |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4615 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4616 Py_RETURN_TRUE; |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4617 } |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4618 #endif |
|
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4619 |
|
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
|
4620 |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4621 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
|
4622 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
|
4623 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4624 PyObject *byteorder_str; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4625 PyObject *is_signed_obj = NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4626 Py_ssize_t length; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4627 int little_endian; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4628 int is_signed; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4629 PyObject *bytes; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4630 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
|
4631 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4632 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
|
4633 &length, &byteorder_str, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4634 &is_signed_obj)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4635 return NULL; |
|
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 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
|
4638 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4639 "'signed' is a keyword-only argument"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4640 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4641 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4642 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4643 if (!PyUnicode_CompareWithASCIIString(byteorder_str, "little")) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4644 little_endian = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4645 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
|
4646 little_endian = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4647 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4648 PyErr_SetString(PyExc_ValueError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4649 "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
|
4650 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4651 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4652 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4653 if (is_signed_obj != NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4654 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
|
4655 if (cmp < 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4656 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4657 is_signed = cmp ? 1 : 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4658 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4659 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4660 /* 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
|
4661 default. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4662 is_signed = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4663 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4664 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4665 if (length < 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4666 PyErr_SetString(PyExc_ValueError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4667 "length argument must be non-negative"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4668 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4669 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4670 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4671 bytes = PyBytes_FromStringAndSize(NULL, length); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4672 if (bytes == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4673 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4674 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4675 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
|
4676 length, little_endian, is_signed) < 0) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4677 Py_DECREF(bytes); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4678 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4679 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4680 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4681 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
|
4682 } |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4683 |
|
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
|
4684 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
|
4685 "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
|
4686 \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
|
4687 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
|
4688 \n\ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4689 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
|
4690 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
|
4691 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
|
4692 \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
|
4693 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
|
4694 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
|
4695 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
|
4696 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
|
4697 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
|
4698 \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
|
4699 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
|
4700 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
|
4701 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
|
4702 |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4703 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
|
4704 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
|
4705 { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4706 PyObject *byteorder_str; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4707 PyObject *is_signed_obj = NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4708 int little_endian; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4709 int is_signed; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4710 PyObject *obj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4711 PyObject *bytes; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4712 PyObject *long_obj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4713 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
|
4714 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4715 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
|
4716 &obj, &byteorder_str, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4717 &is_signed_obj)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4718 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4719 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4720 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
|
4721 PyErr_SetString(PyExc_TypeError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4722 "'signed' is a keyword-only argument"); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4723 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4724 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4725 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4726 if (!PyUnicode_CompareWithASCIIString(byteorder_str, "little")) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4727 little_endian = 1; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4728 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
|
4729 little_endian = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4730 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4731 PyErr_SetString(PyExc_ValueError, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4732 "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
|
4733 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4734 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4735 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4736 if (is_signed_obj != NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4737 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
|
4738 if (cmp < 0) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4739 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4740 is_signed = cmp ? 1 : 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4741 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4742 else { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4743 /* 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
|
4744 default. */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4745 is_signed = 0; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4746 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4747 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4748 bytes = PyObject_Bytes(obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4749 if (bytes == NULL) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4750 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4751 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4752 long_obj = _PyLong_FromByteArray( |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4753 (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
|
4754 little_endian, is_signed); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4755 Py_DECREF(bytes); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4756 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4757 /* 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
|
4758 * 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
|
4759 */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4760 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
|
4761 PyLongObject *newobj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4762 int i; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4763 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
|
4764 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4765 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
|
4766 if (newobj == NULL) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4767 Py_DECREF(long_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4768 return NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4769 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4770 assert(PyLong_Check(newobj)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4771 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
|
4772 for (i = 0; i < n; i++) { |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4773 newobj->ob_digit[i] = |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4774 ((PyLongObject *)long_obj)->ob_digit[i]; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4775 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4776 Py_DECREF(long_obj); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4777 return (PyObject *)newobj; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4778 } |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4779 |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4780 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
|
4781 } |
|
f9c0c411f80c
Issue #1023290: Added API for the conversion of longs to bytes and vice-versa.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
58088
diff
changeset
|
4782 |
|
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
|
4783 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
|
4784 "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
|
4785 \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
|
4786 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
|
4787 \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
|
4788 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
|
4789 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
|
4790 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
|
4791 \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
|
4792 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
|
4793 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
|
4794 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
|
4795 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
|
4796 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
|
4797 \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
|
4798 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
|
4799 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
|
4800 |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4801 static PyMethodDef long_methods[] = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4802 {"conjugate", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4803 "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
|
4804 {"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
|
4805 long_bit_length_doc}, |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4806 #if 0 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4807 {"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
|
4808 "Returns always True."}, |
|
46477
b69f443ef480
Merged revisions 62380,62382-62383 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46460
diff
changeset
|
4809 #endif |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4810 {"to_bytes", (PyCFunction)long_to_bytes, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4811 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
|
4812 {"from_bytes", (PyCFunction)long_from_bytes, |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4813 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
|
4814 {"__trunc__", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4815 "Truncating an Integral returns itself."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4816 {"__floor__", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4817 "Flooring an Integral returns itself."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4818 {"__ceil__", (PyCFunction)long_long, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4819 "Ceiling of an Integral returns itself."}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4820 {"__round__", (PyCFunction)long_round, METH_VARARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4821 "Rounding an Integral returns itself.\n" |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4822 "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
|
4823 {"__getnewargs__", (PyCFunction)long_getnewargs, METH_NOARGS}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4824 {"__format__", (PyCFunction)long__format__, METH_VARARGS}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4825 {"__sizeof__", (PyCFunction)long_sizeof, METH_NOARGS, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4826 "Returns size in memory, in bytes"}, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4827 {NULL, NULL} /* sentinel */ |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4828 }; |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27487
diff
changeset
|
4829 |
|
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
|
4830 static PyGetSetDef long_getset[] = { |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4831 {"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
|
4832 (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
|
4833 "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
|
4834 NULL}, |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4835 {"imag", |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4836 (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
|
4837 "the imaginary part of a complex number", |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4838 NULL}, |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4839 {"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
|
4840 (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
|
4841 "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
|
4842 NULL}, |
|
53676
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4843 {"denominator", |
|
903e80f3e811
Merged revisions 72202 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
53541
diff
changeset
|
4844 (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
|
4845 "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
|
4846 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
|
4847 {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
|
4848 }; |
|
d3a5c796c8ba
Changes to long and float by Jeffrey Jasskin to conform to PEP 3141.
Guido van Rossum <guido@python.org>
parents:
42334
diff
changeset
|
4849 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23248
diff
changeset
|
4850 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
|
4851 "int(x[, base]) -> integer\n\ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4852 \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
|
4853 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
|
4854 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
|
4855 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
|
4856 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
|
4857 converting a non-string."); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18607
diff
changeset
|
4858 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4859 static PyNumberMethods long_as_number = { |
|
61491
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4860 (binaryfunc)long_add, /*nb_add*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4861 (binaryfunc)long_sub, /*nb_subtract*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4862 (binaryfunc)long_mul, /*nb_multiply*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4863 long_mod, /*nb_remainder*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4864 long_divmod, /*nb_divmod*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4865 long_pow, /*nb_power*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4866 (unaryfunc)long_neg, /*nb_negative*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4867 (unaryfunc)long_long, /*tp_positive*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4868 (unaryfunc)long_abs, /*tp_absolute*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4869 (inquiry)long_bool, /*tp_bool*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4870 (unaryfunc)long_invert, /*nb_invert*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4871 long_lshift, /*nb_lshift*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4872 (binaryfunc)long_rshift, /*nb_rshift*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4873 long_and, /*nb_and*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4874 long_xor, /*nb_xor*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4875 long_or, /*nb_or*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4876 long_long, /*nb_int*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4877 0, /*nb_reserved*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4878 long_float, /*nb_float*/ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4879 0, /* nb_inplace_add */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4880 0, /* nb_inplace_subtract */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4881 0, /* nb_inplace_multiply */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4882 0, /* nb_inplace_remainder */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4883 0, /* nb_inplace_power */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4884 0, /* nb_inplace_lshift */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4885 0, /* nb_inplace_rshift */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4886 0, /* nb_inplace_and */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4887 0, /* nb_inplace_xor */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4888 0, /* nb_inplace_or */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4889 long_div, /* nb_floor_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4890 long_true_divide, /* nb_true_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4891 0, /* nb_inplace_floor_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4892 0, /* nb_inplace_true_divide */ |
|
829a86e11bd7
Merged revisions 81036 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
61466
diff
changeset
|
4893 long_long, /* nb_index */ |
| 230 | 4894 }; |
| 4895 | |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
5288
diff
changeset
|
4896 PyTypeObject PyLong_Type = { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4897 PyVarObject_HEAD_INIT(&PyType_Type, 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4898 "int", /* tp_name */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4899 offsetof(PyLongObject, ob_digit), /* tp_basicsize */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4900 sizeof(digit), /* tp_itemsize */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4901 long_dealloc, /* tp_dealloc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4902 0, /* tp_print */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4903 0, /* tp_getattr */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4904 0, /* tp_setattr */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4905 0, /* tp_reserved */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4906 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
|
4907 &long_as_number, /* tp_as_number */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4908 0, /* tp_as_sequence */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4909 0, /* tp_as_mapping */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4910 (hashfunc)long_hash, /* tp_hash */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4911 0, /* tp_call */ |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61397
diff
changeset
|
4912 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
|
4913 PyObject_GenericGetAttr, /* tp_getattro */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4914 0, /* tp_setattro */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4915 0, /* tp_as_buffer */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4916 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4917 Py_TPFLAGS_LONG_SUBCLASS, /* tp_flags */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4918 long_doc, /* tp_doc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4919 0, /* tp_traverse */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4920 0, /* tp_clear */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4921 long_richcompare, /* tp_richcompare */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4922 0, /* tp_weaklistoffset */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4923 0, /* tp_iter */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4924 0, /* tp_iternext */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4925 long_methods, /* tp_methods */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4926 0, /* tp_members */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4927 long_getset, /* tp_getset */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4928 0, /* tp_base */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4929 0, /* tp_dict */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4930 0, /* tp_descr_get */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4931 0, /* tp_descr_set */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4932 0, /* tp_dictoffset */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4933 0, /* tp_init */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4934 0, /* tp_alloc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4935 long_new, /* tp_new */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4936 PyObject_Del, /* tp_free */ |
| 230 | 4937 }; |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4938 |
|
52215
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4939 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
|
4940 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4941 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
|
4942 "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
|
4943 \n\ |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4944 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
|
4945 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
|
4946 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4947 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
|
4948 {"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
|
4949 {"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
|
4950 {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
|
4951 }; |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4952 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4953 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
|
4954 "sys.int_info", /* name */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4955 int_info__doc__, /* doc */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4956 int_info_fields, /* fields */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4957 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
|
4958 }; |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4959 |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4960 PyObject * |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4961 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
|
4962 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4963 PyObject* int_info; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4964 int field = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4965 int_info = PyStructSequence_New(&Int_InfoType); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4966 if (int_info == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4967 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4968 PyStructSequence_SET_ITEM(int_info, field++, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4969 PyLong_FromLong(PyLong_SHIFT)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4970 PyStructSequence_SET_ITEM(int_info, field++, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4971 PyLong_FromLong(sizeof(digit))); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4972 if (PyErr_Occurred()) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4973 Py_CLEAR(int_info); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4974 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4975 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4976 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
|
4977 } |
|
bb5de24a343f
Issue #4258: Make it possible to use 30-bit digits for PyLongs:
Mark Dickinson <dickinsm@gmail.com>
parents:
51855
diff
changeset
|
4978 |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4979 int |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4980 _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
|
4981 { |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
4982 #if NSMALLNEGINTS + NSMALLPOSINTS > 0 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4983 int ival, size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4984 PyLongObject *v = small_ints; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4985 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4986 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
|
4987 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
|
4988 if (Py_TYPE(v) == &PyLong_Type) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4989 /* 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
|
4990 * the Python interpreter was initialized before. |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4991 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4992 Py_ssize_t refcnt; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4993 PyObject* op = (PyObject*)v; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4994 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4995 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
|
4996 _Py_NewReference(op); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
4997 /* _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
|
4998 * 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
|
4999 * to the original refcnt + 1 */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5000 Py_REFCNT(op) = refcnt + 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5001 assert(Py_SIZE(op) == size); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5002 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
|
5003 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5004 else { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5005 PyObject_INIT(v, &PyLong_Type); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5006 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5007 Py_SIZE(v) = size; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5008 v->ob_digit[0] = abs(ival); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5009 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
5010 #endif |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5011 /* initialize int_info */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5012 if (Int_InfoType.tp_name == 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5013 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
|
5014 |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5015 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
|
5016 } |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
5017 |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
5018 void |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
5019 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
|
5020 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5021 /* 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
|
5022 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
|
5023 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
|
5024 #if NSMALLNEGINTS + NSMALLPOSINTS > 0 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5025 int i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5026 PyLongObject *v = small_ints; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5027 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
|
5028 _Py_DEC_REFTOTAL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5029 _Py_ForgetReference((PyObject*)v); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60446
diff
changeset
|
5030 } |
|
40626
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
5031 #endif |
|
4aee3f672f77
Merged the int/long unification branch, by very crude means (sorry Thomas!).
Guido van Rossum <guido@python.org>
parents:
40450
diff
changeset
|
5032 } |