cpython-lru_cache-weakref: Objects/complexobject.c annotate

annotate Objects/complexobject.c @ 39496:352ffe77b71d legacy-trunk

Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions.

author	Georg Brandl <georg@python.org>
date	Mon, 14 Aug 2006 21:42:55 +0000
parents	90d5d1fea4f2
children	f75457d7532c

rev	line source
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Complex object implementation */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	3
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	4 /* Borrows heavily from floatobject.c */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	5
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	6 /* Submitted by Jim Hugunin */
1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	7
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	8 #include "Python.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	9 #include "structmember.h"
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	10
23820 130fff486fa6 Rearrange the #ifndef WITHOUT_COMPLEX so it can be picked up from Guido van Rossum <guido@python.org> parents: 23703 diff changeset	11 #ifndef WITHOUT_COMPLEX
130fff486fa6 Rearrange the #ifndef WITHOUT_COMPLEX so it can be picked up from Guido van Rossum <guido@python.org> parents: 23703 diff changeset	12
17029 65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	13 /* Precisions used by repr() and str(), respectively.
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	14
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	15 The repr() precision (17 significant decimal digits) is the minimal number
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	16 that is guaranteed to have enough precision so that if the number is read
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	17 back in the exact same binary value is recreated. This is true for IEEE
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	18 floating point by design, and also happens to work for all other modern
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	19 hardware.
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	20
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	21 The str() precision is chosen so that in most cases, the rounding noise
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	22 created by various operations is suppressed, while giving plenty of
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	23 precision for practical use.
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	24 */
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	25
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	26 #define PREC_REPR 17
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	27 #define PREC_STR 12
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	28
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	29 /* elementary operations on complex numbers */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	30
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	31 static Py_complex c_1 = {1., 0.};
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	32
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	33 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	34 c_sum(Py_complex a, Py_complex b)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	35 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	36 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	37 r.real = a.real + b.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	38 r.imag = a.imag + b.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	39 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	40 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	41
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	42 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	43 c_diff(Py_complex a, Py_complex b)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	44 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	45 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	46 r.real = a.real - b.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	47 r.imag = a.imag - b.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	48 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	49 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	50
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	51 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	52 c_neg(Py_complex a)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	53 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	54 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	55 r.real = -a.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	56 r.imag = -a.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	57 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	58 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	59
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	60 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	61 c_prod(Py_complex a, Py_complex b)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	62 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	63 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	64 r.real = a.realb.real - a.imagb.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	65 r.imag = a.realb.imag + a.imagb.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	66 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	67 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	68
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	69 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	70 c_quot(Py_complex a, Py_complex b)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	71 {
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	72 /******************************************************************
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	73 This was the original algorithm. It's grossly prone to spurious
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	74 overflow and underflow errors. It also merrily divides by 0 despite
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	75 checking for that(!). The code still serves a doc purpose here, as
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	76 the algorithm following is a simple by-cases transformation of this
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	77 one:
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	78
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	79 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	80 double d = b.realb.real + b.imagb.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	81 if (d == 0.)
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	82 errno = EDOM;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	83 r.real = (a.realb.real + a.imagb.imag)/d;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	84 r.imag = (a.imagb.real - a.realb.imag)/d;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	85 return r;
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	86 ******************************************************************/
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	87
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	88 /* This algorithm is better, and is pretty obvious: first divide the
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	89 * numerators and denominator by whichever of {b.real, b.imag} has
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	90 * larger magnitude. The earliest reference I found was to CACM
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	91 * Algorithm 116 (Complex Division, Robert L. Smith, Stanford
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	92 * University). As usual, though, we're still ignoring all IEEE
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	93 * endcases.
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	94 */
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	95 Py_complex r; /* the result */
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	96 const double abs_breal = b.real < 0 ? -b.real : b.real;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	97 const double abs_bimag = b.imag < 0 ? -b.imag : b.imag;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	98
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	99 if (abs_breal >= abs_bimag) {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	100 /* divide tops and bottom by b.real */
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	101 if (abs_breal == 0.0) {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	102 errno = EDOM;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	103 r.real = r.imag = 0.0;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	104 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	105 else {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	106 const double ratio = b.imag / b.real;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	107 const double denom = b.real + b.imag * ratio;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	108 r.real = (a.real + a.imag * ratio) / denom;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	109 r.imag = (a.imag - a.real * ratio) / denom;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	110 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	111 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	112 else {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	113 /* divide tops and bottom by b.imag */
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	114 const double ratio = b.real / b.imag;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	115 const double denom = b.real * ratio + b.imag;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	116 assert(b.imag != 0.0);
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	117 r.real = (a.real * ratio + a.imag) / denom;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	118 r.imag = (a.imag * ratio - a.real) / denom;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	119 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	120 return r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	121 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	122
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	123 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	124 c_pow(Py_complex a, Py_complex b)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	125 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	126 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	127 double vabs,len,at,phase;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	128 if (b.real == 0. && b.imag == 0.) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	129 r.real = 1.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	130 r.imag = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	131 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	132 else if (a.real == 0. && a.imag == 0.) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	133 if (b.imag != 0. \|\| b.real < 0.)
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	134 errno = EDOM;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	135 r.real = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	136 r.imag = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	137 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	138 else {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	139 vabs = hypot(a.real,a.imag);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	140 len = pow(vabs,b.real);
19758 64bcef1702ad Revert parts of patch #453627, documenting the resulting test failures Martin v. Löwis <martin@v.loewis.de> parents: 19730 diff changeset	141 at = atan2(a.imag, a.real);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	142 phase = at*b.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	143 if (b.imag != 0.0) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	144 len /= exp(at*b.imag);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	145 phase += b.imag*log(vabs);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	146 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	147 r.real = len*cos(phase);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	148 r.imag = len*sin(phase);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	149 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	150 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	151 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	152
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	153 static Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	154 c_powu(Py_complex x, long n)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	155 {
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	156 Py_complex r, p;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	157 long mask = 1;
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	158 r = c_1;
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	159 p = x;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	160 while (mask > 0 && n >= mask) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	161 if (n & mask)
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	162 r = c_prod(r,p);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	163 mask <<= 1;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	164 p = c_prod(p,p);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	165 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	166 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	167 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	168
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	169 static Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	170 c_powi(Py_complex x, long n)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	171 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	172 Py_complex cn;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	173
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	174 if (n > 100 \|\| n < -100) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	175 cn.real = (double) n;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	176 cn.imag = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	177 return c_pow(x,cn);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	178 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	179 else if (n > 0)
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	180 return c_powu(x,n);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	181 else
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	182 return c_quot(c_1,c_powu(x,-n));
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	183
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	184 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	185
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	186 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	187 complex_subtype_from_c_complex(PyTypeObject *type, Py_complex cval)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	188 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	189 PyObject *op;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	190
38533 3031a7110da9 Correctly allocate complex types with tp_alloc. (bug #1498638) Georg Brandl <georg@python.org> parents: 37815 diff changeset	191 op = type->tp_alloc(type, 0);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	192 if (op != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	193 ((PyComplexObject *)op)->cval = cval;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	194 return op;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	195 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	196
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	197 PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	198 PyComplex_FromCComplex(Py_complex cval)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	199 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	200 register PyComplexObject *op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	201
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 23832 diff changeset	202 /* Inline PyObject_New */
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	203 op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	204 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	205 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	206 PyObject_INIT(op, &PyComplex_Type);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	207 op->cval = cval;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	208 return (PyObject *) op;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	209 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	210
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	211 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	212 complex_subtype_from_doubles(PyTypeObject *type, double real, double imag)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	213 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	214 Py_complex c;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	215 c.real = real;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	216 c.imag = imag;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	217 return complex_subtype_from_c_complex(type, c);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	218 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	219
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	220 PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	221 PyComplex_FromDoubles(double real, double imag)
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	222 {
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	223 Py_complex c;
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	224 c.real = real;
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	225 c.imag = imag;
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	226 return PyComplex_FromCComplex(c);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	227 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	228
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	229 double
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	230 PyComplex_RealAsDouble(PyObject *op)
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	231 {
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	232 if (PyComplex_Check(op)) {
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	233 return ((PyComplexObject *)op)->cval.real;
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	234 }
ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	235 else {
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	236 return PyFloat_AsDouble(op);
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	237 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	238 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	239
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	240 double
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	241 PyComplex_ImagAsDouble(PyObject *op)
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	242 {
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	243 if (PyComplex_Check(op)) {
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	244 return ((PyComplexObject *)op)->cval.imag;
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	245 }
ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	246 else {
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	247 return 0.0;
854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	248 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	249 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	250
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	251 Py_complex
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	252 PyComplex_AsCComplex(PyObject *op)
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	253 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	254 Py_complex cv;
3328 4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	255 if (PyComplex_Check(op)) {
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	256 return ((PyComplexObject *)op)->cval;
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	257 }
ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	258 else {
3328 4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	259 cv.real = PyFloat_AsDouble(op);
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	260 cv.imag = 0.;
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	261 return cv;
17029 65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	262 }
3328 4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	263 }
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	264
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	265 static void
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	266 complex_dealloc(PyObject *op)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	267 {
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20140 diff changeset	268 op->ob_type->tp_free(op);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	269 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	270
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	271
3608 8573e65fa948 make some things static Guido van Rossum <guido@python.org> parents: 3350 diff changeset	272 static void
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	273 complex_to_buf(char buf, int bufsz, PyComplexObject v, int precision)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	274 {
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	275 char format[32];
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	276 if (v->cval.real == 0.) {
39100 90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	277 PyOS_snprintf(format, sizeof(format), "%%.%ig", precision);
90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	278 PyOS_ascii_formatd(buf, bufsz - 1, format, v->cval.imag);
90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	279 strncat(buf, "j", 1);
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	280 } else {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	281 char re[64], im[64];
35580 f4c2c61cb560 backport patch [ 1118729 ] Error in representation of complex numbers(again) Georg Brandl <georg@python.org> parents: 34195 diff changeset	282 /* Format imaginary part with sign, real part without */
39100 90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	283 PyOS_snprintf(format, sizeof(format), "%%.%ig", precision);
90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	284 PyOS_ascii_formatd(re, sizeof(re), format, v->cval.real);
90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	285 PyOS_snprintf(format, sizeof(format), "%%+.%ig", precision);
90d5d1fea4f2 Use sizeof(buffer) instead of duplicating the constants to ensure they won't Neal Norwitz <nnorwitz@gmail.com> parents: 38533 diff changeset	286 PyOS_ascii_formatd(im, sizeof(im), format, v->cval.imag);
35580 f4c2c61cb560 backport patch [ 1118729 ] Error in representation of complex numbers(again) Georg Brandl <georg@python.org> parents: 34195 diff changeset	287 PyOS_snprintf(buf, bufsz, "(%s%sj)", re, im);
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	288 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	289 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	290
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	291 static int
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	292 complex_print(PyComplexObject v, FILE fp, int flags)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	293 {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	294 char buf[100];
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	295 complex_to_buf(buf, sizeof(buf), v,
17029 65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	296 (flags & Py_PRINT_RAW) ? PREC_STR : PREC_REPR);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	297 fputs(buf, fp);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	298 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	299 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	300
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	301 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	302 complex_repr(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	303 {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	304 char buf[100];
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	305 complex_to_buf(buf, sizeof(buf), v, PREC_REPR);
17029 65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	306 return PyString_FromString(buf);
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	307 }
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	308
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	309 static PyObject *
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	310 complex_str(PyComplexObject *v)
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	311 {
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	312 char buf[100];
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	313 complex_to_buf(buf, sizeof(buf), v, PREC_STR);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	314 return PyString_FromString(buf);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	315 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	316
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	317 static long
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	318 complex_hash(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	319 {
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	320 long hashreal, hashimag, combined;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	321 hashreal = _Py_HashDouble(v->cval.real);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	322 if (hashreal == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	323 return -1;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	324 hashimag = _Py_HashDouble(v->cval.imag);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	325 if (hashimag == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	326 return -1;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	327 /* Note: if the imaginary part is 0, hashimag is 0 now,
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	328 * so the following returns hashreal unchanged. This is
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	329 * important because numbers of different types that
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	330 * compare equal must have the same hash value, so that
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	331 * hash(x + 0*j) must equal hash(x).
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	332 */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	333 combined = hashreal + 1000003 * hashimag;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	334 if (combined == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	335 combined = -2;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	336 return combined;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	337 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	338
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	339 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	340 complex_add(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	341 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	342 Py_complex result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	343 PyFPE_START_PROTECT("complex_add", return 0)
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	344 result = c_sum(v->cval,w->cval);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	345 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	346 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	347 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	348
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	349 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	350 complex_sub(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	351 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	352 Py_complex result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	353 PyFPE_START_PROTECT("complex_sub", return 0)
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	354 result = c_diff(v->cval,w->cval);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	355 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	356 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	357 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	358
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	359 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	360 complex_mul(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	361 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	362 Py_complex result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	363 PyFPE_START_PROTECT("complex_mul", return 0)
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	364 result = c_prod(v->cval,w->cval);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	365 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	366 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	367 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	368
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	369 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	370 complex_div(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	371 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	372 Py_complex quot;
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	373 PyFPE_START_PROTECT("complex_div", return 0)
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	374 errno = 0;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	375 quot = c_quot(v->cval,w->cval);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	376 PyFPE_END_PROTECT(quot)
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	377 if (errno == EDOM) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	378 PyErr_SetString(PyExc_ZeroDivisionError, "complex division");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	379 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	380 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	381 return PyComplex_FromCComplex(quot);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	382 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	383
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	384 static PyObject *
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	385 complex_classic_div(PyComplexObject v, PyComplexObject w)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	386 {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	387 Py_complex quot;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	388
19673 b3271297b984 PEP 238 documented -Qwarn as warning only for classic int or long Guido van Rossum <guido@python.org> parents: 19633 diff changeset	389 if (Py_DivisionWarningFlag >= 2 &&
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	390 PyErr_Warn(PyExc_DeprecationWarning,
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	391 "classic complex division") < 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	392 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	393
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	394 PyFPE_START_PROTECT("complex_classic_div", return 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	395 errno = 0;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	396 quot = c_quot(v->cval,w->cval);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	397 PyFPE_END_PROTECT(quot)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	398 if (errno == EDOM) {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	399 PyErr_SetString(PyExc_ZeroDivisionError, "complex division");
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	400 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	401 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	402 return PyComplex_FromCComplex(quot);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	403 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	404
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	405 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	406 complex_remainder(PyComplexObject v, PyComplexObject w)
4275 cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	407 {
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	408 Py_complex div, mod;
23043 7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	409
7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	410 if (PyErr_Warn(PyExc_DeprecationWarning,
7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	411 "complex divmod(), // and % are deprecated") < 0)
7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	412 return NULL;
7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	413
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	414 errno = 0;
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	415 div = c_quot(v->cval,w->cval); /* The raw divisor value. */
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	416 if (errno == EDOM) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	417 PyErr_SetString(PyExc_ZeroDivisionError, "complex remainder");
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	418 return NULL;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	419 }
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	420 div.real = floor(div.real); /* Use the floor of the real part. */
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	421 div.imag = 0.0;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	422 mod = c_diff(v->cval, c_prod(w->cval, div));
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	423
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	424 return PyComplex_FromCComplex(mod);
4275 cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	425 }
cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	426
cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	427
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	428 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	429 complex_divmod(PyComplexObject v, PyComplexObject w)
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	430 {
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	431 Py_complex div, mod;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	432 PyObject d, m, *z;
23039 454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	433
454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	434 if (PyErr_Warn(PyExc_DeprecationWarning,
23043 7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	435 "complex divmod(), // and % are deprecated") < 0)
23039 454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	436 return NULL;
454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	437
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	438 errno = 0;
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	439 div = c_quot(v->cval,w->cval); /* The raw divisor value. */
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	440 if (errno == EDOM) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	441 PyErr_SetString(PyExc_ZeroDivisionError, "complex divmod()");
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	442 return NULL;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	443 }
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	444 div.real = floor(div.real); /* Use the floor of the real part. */
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	445 div.imag = 0.0;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	446 mod = c_diff(v->cval, c_prod(w->cval, div));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	447 d = PyComplex_FromCComplex(div);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	448 m = PyComplex_FromCComplex(mod);
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30252 diff changeset	449 z = PyTuple_Pack(2, d, m);
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	450 Py_XDECREF(d);
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	451 Py_XDECREF(m);
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	452 return z;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	453 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	454
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	455 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	456 complex_pow(PyComplexObject v, PyObject w, PyComplexObject *z)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	457 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	458 Py_complex p;
d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	459 Py_complex exponent;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	460 long int_exponent;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	461
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	462 if ((PyObject *)z!=Py_None) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	463 PyErr_SetString(PyExc_ValueError, "complex modulo");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	464 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	465 }
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	466 PyFPE_START_PROTECT("complex_pow", return 0)
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	467 errno = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	468 exponent = ((PyComplexObject*)w)->cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	469 int_exponent = (long)exponent.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	470 if (exponent.imag == 0. && exponent.real == int_exponent)
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	471 p = c_powi(v->cval,int_exponent);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	472 else
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	473 p = c_pow(v->cval,exponent);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	474
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	475 PyFPE_END_PROTECT(p)
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	476 Py_ADJUST_ERANGE2(p.real, p.imag);
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	477 if (errno == EDOM) {
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	478 PyErr_SetString(PyExc_ZeroDivisionError,
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	479 "0.0 to a negative or complex power");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	480 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	481 }
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	482 else if (errno == ERANGE) {
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	483 PyErr_SetString(PyExc_OverflowError,
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	484 "complex exponentiaion");
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	485 return NULL;
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	486 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	487 return PyComplex_FromCComplex(p);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	488 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	489
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	490 static PyObject *
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	491 complex_int_div(PyComplexObject v, PyComplexObject w)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	492 {
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	493 PyObject t, r;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	494
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	495 t = complex_divmod(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	496 if (t != NULL) {
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	497 r = PyTuple_GET_ITEM(t, 0);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	498 Py_INCREF(r);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	499 Py_DECREF(t);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	500 return r;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	501 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	502 return NULL;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	503 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	504
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	505 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	506 complex_neg(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	507 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	508 Py_complex neg;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	509 neg.real = -v->cval.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	510 neg.imag = -v->cval.imag;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	511 return PyComplex_FromCComplex(neg);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	512 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	513
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	514 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	515 complex_pos(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	516 {
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	517 if (PyComplex_CheckExact(v)) {
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	518 Py_INCREF(v);
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	519 return (PyObject *)v;
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	520 }
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	521 else
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	522 return PyComplex_FromCComplex(v->cval);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	523 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	524
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	525 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	526 complex_abs(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	527 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	528 double result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	529 PyFPE_START_PROTECT("complex_abs", return 0)
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	530 result = hypot(v->cval.real,v->cval.imag);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	531 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	532 return PyFloat_FromDouble(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	533 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	534
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	535 static int
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	536 complex_nonzero(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	537 {
9940 93b9eafe1f1d Ai! complex_nonzero() has && which should be \|\|, else decidedly Guido van Rossum <guido@python.org> parents: 8261 diff changeset	538 return v->cval.real != 0.0 \|\| v->cval.imag != 0.0;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	539 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	540
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	541 static int
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	542 complex_coerce(PyObject pv, PyObject pw)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	543 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	544 Py_complex cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	545 cval.imag = 0.;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	546 if (PyInt_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	547 cval.real = (double)PyInt_AsLong(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	548 *pw = PyComplex_FromCComplex(cval);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	549 Py_INCREF(*pv);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	550 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	551 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	552 else if (PyLong_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	553 cval.real = PyLong_AsDouble(*pw);
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	554 if (cval.real == -1.0 && PyErr_Occurred())
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	555 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	556 *pw = PyComplex_FromCComplex(cval);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	557 Py_INCREF(*pv);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	558 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	559 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	560 else if (PyFloat_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	561 cval.real = PyFloat_AsDouble(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	562 *pw = PyComplex_FromCComplex(cval);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	563 Py_INCREF(*pv);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	564 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	565 }
19974 8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	566 else if (PyComplex_Check(*pw)) {
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	567 Py_INCREF(*pv);
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	568 Py_INCREF(*pw);
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	569 return 0;
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	570 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	571 return 1; /* Can't do it */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	572 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	573
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	574 static PyObject *
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	575 complex_richcompare(PyObject v, PyObject w, int op)
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	576 {
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	577 int c;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	578 Py_complex i, j;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	579 PyObject *res;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	580
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	581 c = PyNumber_CoerceEx(&v, &w);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	582 if (c < 0)
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	583 return NULL;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	584 if (c > 0) {
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	585 Py_INCREF(Py_NotImplemented);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	586 return Py_NotImplemented;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	587 }
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20061 diff changeset	588 /* Make sure both arguments are complex. */
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20061 diff changeset	589 if (!(PyComplex_Check(v) && PyComplex_Check(w))) {
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	590 Py_DECREF(v);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	591 Py_DECREF(w);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	592 Py_INCREF(Py_NotImplemented);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	593 return Py_NotImplemented;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	594 }
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	595
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	596 i = ((PyComplexObject *)v)->cval;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	597 j = ((PyComplexObject *)w)->cval;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	598 Py_DECREF(v);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	599 Py_DECREF(w);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	600
20061 2caddb82ffea Do the same thing to complex that I did to str: the rich comparison Guido van Rossum <guido@python.org> parents: 20012 diff changeset	601 if (op != Py_EQ && op != Py_NE) {
2caddb82ffea Do the same thing to complex that I did to str: the rich comparison Guido van Rossum <guido@python.org> parents: 20012 diff changeset	602 PyErr_SetString(PyExc_TypeError,
34195 46fa0e20cbcf Bug #1079011: Incorrect error message (somewhat) Raymond Hettinger <python@rcn.com> parents: 33233 diff changeset	603 "no ordering relation is defined for complex numbers");
20061 2caddb82ffea Do the same thing to complex that I did to str: the rich comparison Guido van Rossum <guido@python.org> parents: 20012 diff changeset	604 return NULL;
2caddb82ffea Do the same thing to complex that I did to str: the rich comparison Guido van Rossum <guido@python.org> parents: 20012 diff changeset	605 }
2caddb82ffea Do the same thing to complex that I did to str: the rich comparison Guido van Rossum <guido@python.org> parents: 20012 diff changeset	606
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	607 if ((i.real == j.real && i.imag == j.imag) == (op == Py_EQ))
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	608 res = Py_True;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	609 else
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	610 res = Py_False;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	611
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	612 Py_INCREF(res);
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	613 return res;
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	614 }
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	615
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	616 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	617 complex_int(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	618 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	619 PyErr_SetString(PyExc_TypeError,
30252 66654ac69622 Remove 'e.g.' from error message Raymond Hettinger <python@rcn.com> parents: 30155 diff changeset	620 "can't convert complex to int; use int(abs(z))");
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	621 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	622 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	623
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	624 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	625 complex_long(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	626 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	627 PyErr_SetString(PyExc_TypeError,
30252 66654ac69622 Remove 'e.g.' from error message Raymond Hettinger <python@rcn.com> parents: 30155 diff changeset	628 "can't convert complex to long; use long(abs(z))");
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	629 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	630 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	631
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	632 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	633 complex_float(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	634 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	635 PyErr_SetString(PyExc_TypeError,
30252 66654ac69622 Remove 'e.g.' from error message Raymond Hettinger <python@rcn.com> parents: 30155 diff changeset	636 "can't convert complex to float; use abs(z)");
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	637 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	638 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	639
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	640 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	641 complex_conjugate(PyObject *self)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	642 {
4025 854f25fde8f4 Changes to make the file acceptable to K&R C compilers (HPUX, SunOS 4.x). Guido van Rossum <guido@python.org> parents: 3771 diff changeset	643 Py_complex c;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	644 c = ((PyComplexObject *)self)->cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	645 c.imag = -c.imag;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	646 return PyComplex_FromCComplex(c);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	647 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	648
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	649 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	650 complex_getnewargs(PyComplexObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	651 {
28134 cde444184336 Fix from Greg Chapman from SF bug #695651: a complex subclass Guido van Rossum <guido@python.org> parents: 27521 diff changeset	652 return Py_BuildValue("(D)", &v->cval);
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	653 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	654
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	655 static PyMethodDef complex_methods[] = {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	656 {"conjugate", (PyCFunction)complex_conjugate, METH_NOARGS},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	657 {"__getnewargs__", (PyCFunction)complex_getnewargs, METH_NOARGS},
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	658 {NULL, NULL} /* sentinel */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	659 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	660
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19974 diff changeset	661 static PyMemberDef complex_members[] = {
21894 f245955b3fbe Declare real and imag as read-only attributes. Guido van Rossum <guido@python.org> parents: 21399 diff changeset	662 {"real", T_DOUBLE, offsetof(PyComplexObject, cval.real), READONLY,
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19974 diff changeset	663 "the real part of a complex number"},
21894 f245955b3fbe Declare real and imag as read-only attributes. Guido van Rossum <guido@python.org> parents: 21399 diff changeset	664 {"imag", T_DOUBLE, offsetof(PyComplexObject, cval.imag), READONLY,
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19974 diff changeset	665 "the imaginary part of a complex number"},
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	666 {0},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	667 };
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	668
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	669 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	670 complex_subtype_from_string(PyTypeObject type, PyObject v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	671 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	672 const char s, start;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	673 char *end;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	674 double x=0.0, y=0.0, z;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	675 int got_re=0, got_im=0, done=0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	676 int digit_or_dot;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	677 int sw_error=0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	678 int sign;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	679 char buffer[256]; /* For errors */
20666 88a242bfb23a complex_subtype_from_string(): move the declaration of s_buffer[] out Guido van Rossum <guido@python.org> parents: 20277 diff changeset	680 #ifdef Py_USING_UNICODE
88a242bfb23a complex_subtype_from_string(): move the declaration of s_buffer[] out Guido van Rossum <guido@python.org> parents: 20277 diff changeset	681 char s_buffer[256];
88a242bfb23a complex_subtype_from_string(): move the declaration of s_buffer[] out Guido van Rossum <guido@python.org> parents: 20277 diff changeset	682 #endif
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	683 Py_ssize_t len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	684
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	685 if (PyString_Check(v)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	686 s = PyString_AS_STRING(v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	687 len = PyString_GET_SIZE(v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	688 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	689 #ifdef Py_USING_UNICODE
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	690 else if (PyUnicode_Check(v)) {
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37304 diff changeset	691 if (PyUnicode_GET_SIZE(v) >= (Py_ssize_t)sizeof(s_buffer)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	692 PyErr_SetString(PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	693 "complex() literal too large to convert");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	694 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	695 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	696 if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	697 PyUnicode_GET_SIZE(v),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	698 s_buffer,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	699 NULL))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	700 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	701 s = s_buffer;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	702 len = strlen(s);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	703 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	704 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	705 else if (PyObject_AsCharBuffer(v, &s, &len)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	706 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	707 "complex() arg is not a string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	708 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	709 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	710
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	711 /* position on first nonblank */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	712 start = s;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	713 while (s && isspace(Py_CHARMASK(s)))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	714 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	715 if (s[0] == '\0') {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	716 PyErr_SetString(PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	717 "complex() arg is an empty string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	718 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	719 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	720
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	721 z = -1.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	722 sign = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	723 do {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	724
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	725 switch (*s) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	726
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	727 case '\0':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	728 if (s-start != len) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	729 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	730 PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	731 "complex() arg contains a null byte");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	732 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	733 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	734 if(!done) sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	735 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	736
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	737 case '-':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	738 sign = -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	739 /* Fallthrough */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	740 case '+':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	741 if (done) sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	742 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	743 if ( s=='\0'\|\|s=='+'\|\|*s=='-' \|\|
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	744 isspace(Py_CHARMASK(*s)) ) sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	745 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	746
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	747 case 'J':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	748 case 'j':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	749 if (got_im \|\| done) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	750 sw_error = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	751 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	752 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	753 if (z<0.0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	754 y=sign;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	755 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	756 else{
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	757 y=sign*z;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	758 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	759 got_im=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	760 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	761 if (s!='+' && s!='-' )
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	762 done=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	763 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	764
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	765 default:
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	766 if (isspace(Py_CHARMASK(*s))) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	767 while (s && isspace(Py_CHARMASK(s)))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	768 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	769 if (s[0] != '\0')
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	770 sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	771 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	772 done = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	773 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	774 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	775 digit_or_dot =
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	776 (s=='.' \|\| isdigit(Py_CHARMASK(s)));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	777 if (done\|\|!digit_or_dot) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	778 sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	779 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	780 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	781 errno = 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	782 PyFPE_START_PROTECT("strtod", return 0)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	783 z = PyOS_ascii_strtod(s, &end) ;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	784 PyFPE_END_PROTECT(z)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	785 if (errno != 0) {
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	786 PyOS_snprintf(buffer, sizeof(buffer),
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	787 "float() out of range: %.150s", s);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	788 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	789 PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	790 buffer);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	791 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	792 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	793 s=end;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	794 if (s=='J' \|\| s=='j') {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	795
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	796 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	797 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	798 if (got_re) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	799 sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	800 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	801 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	802
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	803 /* accept a real part */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	804 x=sign*z;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	805 got_re=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	806 if (got_im) done=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	807 z = -1.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	808 sign = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	809 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	810
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	811 } /* end of switch */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	812
23031 5bda546ebe24 SF bug 543840: complex(string) accepts strings with \0 Tim Peters <tim.peters@gmail.com> parents: 22974 diff changeset	813 } while (s - start < len && !sw_error);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	814
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	815 if (sw_error) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	816 PyErr_SetString(PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	817 "complex() arg is a malformed string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	818 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	819 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	820
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	821 return complex_subtype_from_doubles(type, x, y);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	822 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	823
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	824 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	825 complex_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	826 {
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	827 PyObject r, i, tmp, f;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	828 PyNumberMethods nbr, nbi = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	829 Py_complex cr, ci;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	830 int own_r = 0;
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	831 static PyObject *complexstr;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	832 static char *kwlist[] = {"real", "imag", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	833
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	834 r = Py_False;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	835 i = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	836 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|OO:complex", kwlist,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	837 &r, &i))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	838 return NULL;
25064 81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	839
29520 5d11fdfa7c00 Fix typo in comment. Walter Dörwald <walter@livinglogic.de> parents: 28134 diff changeset	840 /* Special-case for single argument that is already complex */
28134 cde444184336 Fix from Greg Chapman from SF bug #695651: a complex subclass Guido van Rossum <guido@python.org> parents: 27521 diff changeset	841 if (PyComplex_CheckExact(r) && i == NULL &&
cde444184336 Fix from Greg Chapman from SF bug #695651: a complex subclass Guido van Rossum <guido@python.org> parents: 27521 diff changeset	842 type == &PyComplex_Type) {
25064 81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	843 /* Note that we can't know whether it's safe to return
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	844 a complex subclass instance as-is, hence the restriction
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	845 to exact complexes here. */
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	846 Py_INCREF(r);
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	847 return r;
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	848 }
21399 33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	849 if (PyString_Check(r) \|\| PyUnicode_Check(r)) {
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	850 if (i != NULL) {
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	851 PyErr_SetString(PyExc_TypeError,
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	852 "complex() can't take second arg"
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	853 " if first is a string");
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	854 return NULL;
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	855 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	856 return complex_subtype_from_string(type, r);
21399 33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	857 }
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	858 if (i != NULL && (PyString_Check(i) \|\| PyUnicode_Check(i))) {
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	859 PyErr_SetString(PyExc_TypeError,
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	860 "complex() second arg can't be a string");
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	861 return NULL;
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	862 }
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	863
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	864 /* XXX Hack to support classes with __complex__ method */
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	865 if (complexstr == NULL) {
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	866 complexstr = PyString_InternFromString("__complex__");
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	867 if (complexstr == NULL)
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	868 return NULL;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	869 }
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	870 f = PyObject_GetAttr(r, complexstr);
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	871 if (f == NULL)
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	872 PyErr_Clear();
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	873 else {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30252 diff changeset	874 PyObject *args = PyTuple_New(0);
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	875 if (args == NULL)
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	876 return NULL;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	877 r = PyEval_CallObject(f, args);
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	878 Py_DECREF(args);
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	879 Py_DECREF(f);
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	880 if (r == NULL)
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	881 return NULL;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	882 own_r = 1;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	883 }
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	884 nbr = r->ob_type->tp_as_number;
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	885 if (i != NULL)
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	886 nbi = i->ob_type->tp_as_number;
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	887 if (nbr == NULL \|\| nbr->nb_float == NULL \|\|
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	888 ((i != NULL) && (nbi == NULL \|\| nbi->nb_float == NULL))) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	889 PyErr_SetString(PyExc_TypeError,
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	890 "complex() argument must be a string or a number");
30155 e3281b0df6a4 complex_new(): This could leak when the argument was neither string nor Tim Peters <tim.peters@gmail.com> parents: 29520 diff changeset	891 if (own_r) {
e3281b0df6a4 complex_new(): This could leak when the argument was neither string nor Tim Peters <tim.peters@gmail.com> parents: 29520 diff changeset	892 Py_DECREF(r);
e3281b0df6a4 complex_new(): This could leak when the argument was neither string nor Tim Peters <tim.peters@gmail.com> parents: 29520 diff changeset	893 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	894 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	895 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	896 if (PyComplex_Check(r)) {
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	897 /* Note that if r is of a complex subtype, we're only
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	898 retaining its real & imag parts here, and the return
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	899 value is (properly) of the builtin complex type. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	900 cr = ((PyComplexObject*)r)->cval;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	901 if (own_r) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	902 Py_DECREF(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	903 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	904 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	905 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	906 tmp = PyNumber_Float(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	907 if (own_r) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	908 Py_DECREF(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	909 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	910 if (tmp == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	911 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	912 if (!PyFloat_Check(tmp)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	913 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	914 "float(r) didn't return a float");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	915 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	916 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	917 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	918 cr.real = PyFloat_AsDouble(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	919 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	920 cr.imag = 0.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	921 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	922 if (i == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	923 ci.real = 0.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	924 ci.imag = 0.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	925 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	926 else if (PyComplex_Check(i))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	927 ci = ((PyComplexObject*)i)->cval;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	928 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	929 tmp = (*nbi->nb_float)(i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	930 if (tmp == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	931 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	932 ci.real = PyFloat_AsDouble(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	933 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	934 ci.imag = 0.;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	935 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	936 cr.real -= ci.imag;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	937 cr.imag += ci.real;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	938 return complex_subtype_from_c_complex(type, cr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	939 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	940
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23820 diff changeset	941 PyDoc_STRVAR(complex_doc,
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	942 "complex(real[, imag]) -> complex number\n"
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	943 "\n"
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	944 "Create a complex number from a real part and an optional imaginary part.\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23820 diff changeset	945 "This is equivalent to (real + imag*1j) where imag defaults to 0.");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	946
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	947 static PyNumberMethods complex_as_number = {
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	948 (binaryfunc)complex_add, /* nb_add */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	949 (binaryfunc)complex_sub, /* nb_subtract */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	950 (binaryfunc)complex_mul, /* nb_multiply */
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	951 (binaryfunc)complex_classic_div, /* nb_divide */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	952 (binaryfunc)complex_remainder, /* nb_remainder */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	953 (binaryfunc)complex_divmod, /* nb_divmod */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	954 (ternaryfunc)complex_pow, /* nb_power */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	955 (unaryfunc)complex_neg, /* nb_negative */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	956 (unaryfunc)complex_pos, /* nb_positive */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	957 (unaryfunc)complex_abs, /* nb_absolute */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	958 (inquiry)complex_nonzero, /* nb_nonzero */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	959 0, /* nb_invert */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	960 0, /* nb_lshift */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	961 0, /* nb_rshift */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	962 0, /* nb_and */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	963 0, /* nb_xor */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	964 0, /* nb_or */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36675 diff changeset	965 complex_coerce, /* nb_coerce */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36675 diff changeset	966 complex_int, /* nb_int */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36675 diff changeset	967 complex_long, /* nb_long */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36675 diff changeset	968 complex_float, /* nb_float */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	969 0, /* nb_oct */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	970 0, /* nb_hex */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	971 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	972 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	973 0, /* nb_inplace_multiply*/
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	974 0, /* nb_inplace_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	975 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	976 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	977 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	978 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	979 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	980 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	981 0, /* nb_inplace_or */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	982 (binaryfunc)complex_int_div, /* nb_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	983 (binaryfunc)complex_div, /* nb_true_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	984 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	985 0, /* nb_inplace_true_divide */
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	986 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	987
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	988 PyTypeObject PyComplex_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	989 PyObject_HEAD_INIT(&PyType_Type)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	990 0,
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	991 "complex",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	992 sizeof(PyComplexObject),
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	993 0,
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36675 diff changeset	994 complex_dealloc, /* tp_dealloc */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	995 (printfunc)complex_print, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	996 0, /* tp_getattr */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	997 0, /* tp_setattr */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	998 0, /* tp_compare */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	999 (reprfunc)complex_repr, /* tp_repr */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1000 &complex_as_number, /* tp_as_number */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1001 0, /* tp_as_sequence */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1002 0, /* tp_as_mapping */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1003 (hashfunc)complex_hash, /* tp_hash */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1004 0, /* tp_call */
17029 65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	1005 (reprfunc)complex_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1006 PyObject_GenericGetAttr, /* tp_getattro */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1007 0, /* tp_setattro */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1008 0, /* tp_as_buffer */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1009 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1010 complex_doc, /* tp_doc */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1011 0, /* tp_traverse */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1012 0, /* tp_clear */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1013 complex_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1014 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1015 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1016 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1017 complex_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1018 complex_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1019 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1020 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1021 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1022 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1023 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1024 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1025 0, /* tp_init */
38533 3031a7110da9 Correctly allocate complex types with tp_alloc. (bug #1498638) Georg Brandl <georg@python.org> parents: 37815 diff changeset	1026 PyType_GenericAlloc, /* tp_alloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1027 complex_new, /* tp_new */
22974 72778ec94dec PyObject_Del can now be used as a function designator. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22540 diff changeset	1028 PyObject_Del, /* tp_free */
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1029 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1030
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1031 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/complexobject.c @ 39496:352ffe77b71d legacy-trunk