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

annotate Objects/complexobject.c @ 24042:63fbbed10714 legacy-trunk

Simplify HTTPSConnection constructor. See discussion in SF bug 458463.

author	Jeremy Hylton <jeremy@alum.mit.edu>
date	Fri, 28 Jun 2002 23:38:14 +0000
parents	ed1ba37a46b7
children	a869d2de536f

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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	191 op = PyType_GenericAlloc(type, 0);
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
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	202 /* PyObject_New is inlined */
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 {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	275 if (v->cval.real == 0.)
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	276 PyOS_snprintf(buf, bufsz, "%.*gj",
025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	277 precision, v->cval.imag);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	278 else
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	279 PyOS_snprintf(buf, bufsz, "(%.g%+.gj)",
025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	280 precision, v->cval.real,
025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	281 precision, v->cval.imag);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	282 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	283
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	284 static int
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	285 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	286 {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	287 char buf[100];
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	288 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	289 (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	290 fputs(buf, fp);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	291 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	292 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	293
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	294 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	295 complex_repr(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	296 {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	297 char buf[100];
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	298 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	299 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	300 }
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	301
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	302 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	303 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	304 {
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	305 char buf[100];
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	306 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	307 return PyString_FromString(buf);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	308 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	309
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	310 static long
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	311 complex_hash(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	312 {
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	313 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	314 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	315 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	316 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	317 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	318 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	319 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	320 /* 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	321 * 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	322 * 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	323 * 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	324 * 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	325 */
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 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	327 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	328 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	329 return combined;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	330 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	331
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	332 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	333 complex_add(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	334 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	335 Py_complex result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	336 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	337 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	338 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	339 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	340 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	341
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	342 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	343 complex_sub(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	344 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	345 Py_complex result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	346 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	347 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	348 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	349 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	350 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	351
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	352 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	353 complex_mul(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	354 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	355 Py_complex result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	356 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	357 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	358 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	359 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	360 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	361
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	362 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	363 complex_div(PyComplexObject v, PyComplexObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	364 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	365 Py_complex quot;
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	366 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	367 errno = 0;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	368 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	369 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	370 if (errno == EDOM) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	371 PyErr_SetString(PyExc_ZeroDivisionError, "complex division");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	372 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	373 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	374 return PyComplex_FromCComplex(quot);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	375 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	376
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	377 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	378 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	379 {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	380 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	381
19673 b3271297b984 PEP 238 documented -Qwarn as warning only for classic int or long Guido van Rossum <guido@python.org> parents: 19633 diff changeset	382 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	383 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	384 "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	385 return NULL;
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 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	388 errno = 0;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	389 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	390 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	391 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	392 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	393 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	394 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	395 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	396 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	397
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	398 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	399 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	400 {
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	401 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	402
7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	403 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	404 "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	405 return NULL;
7fecd6d58f38 Deprecate % as well. The message for deprecation of //, % and divmod Guido van Rossum <guido@python.org> parents: 23039 diff changeset	406
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	407 errno = 0;
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	408 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	409 if (errno == EDOM) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	410 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	411 return NULL;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	412 }
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	413 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	414 div.imag = 0.0;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	415 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	416
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	417 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	418 }
cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	419
cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	420
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	421 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	422 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	423 {
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	424 Py_complex div, mod;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	425 PyObject d, m, *z;
23039 454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	426
454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	427 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	428 "complex divmod(), // and % are deprecated") < 0)
23039 454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	429 return NULL;
454351ef50f1 SF bug #543387. Guido van Rossum <guido@python.org> parents: 23031 diff changeset	430
5559 1eced1aaad5a Got rid of c_error in favor of errno (and EDOM/ERANGE). Guido van Rossum <guido@python.org> parents: 5396 diff changeset	431 errno = 0;
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	432 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	433 if (errno == EDOM) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	434 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	435 return NULL;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	436 }
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	437 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	438 div.imag = 0.0;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	439 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	440 d = PyComplex_FromCComplex(div);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	441 m = PyComplex_FromCComplex(mod);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	442 z = Py_BuildValue("(OO)", d, m);
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	443 Py_XDECREF(d);
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	444 Py_XDECREF(m);
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	445 return z;
95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	446 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	447
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	448 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	449 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	450 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	451 Py_complex p;
d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	452 Py_complex exponent;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	453 long int_exponent;
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 if ((PyObject *)z!=Py_None) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	456 PyErr_SetString(PyExc_ValueError, "complex modulo");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	457 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	458 }
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	459 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	460 errno = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	461 exponent = ((PyComplexObject*)w)->cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	462 int_exponent = (long)exponent.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	463 if (exponent.imag == 0. && exponent.real == int_exponent)
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	464 p = c_powi(v->cval,int_exponent);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	465 else
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	466 p = c_pow(v->cval,exponent);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	467
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	468 PyFPE_END_PROTECT(p)
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	469 Py_ADJUST_ERANGE2(p.real, p.imag);
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	470 if (errno == EDOM) {
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	471 PyErr_SetString(PyExc_ZeroDivisionError,
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	472 "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	473 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	474 }
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	475 else if (errno == ERANGE) {
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	476 PyErr_SetString(PyExc_OverflowError,
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	477 "complex exponentiaion");
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	478 return NULL;
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	479 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	480 return PyComplex_FromCComplex(p);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	481 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	482
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	483 static PyObject *
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	484 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	485 {
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	486 PyObject t, r;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	487
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	488 t = complex_divmod(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	489 if (t != NULL) {
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	490 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	491 Py_INCREF(r);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	492 Py_DECREF(t);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	493 return 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 return NULL;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	496 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	497
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	498 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	499 complex_neg(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	500 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	501 Py_complex neg;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	502 neg.real = -v->cval.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	503 neg.imag = -v->cval.imag;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	504 return PyComplex_FromCComplex(neg);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	505 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	506
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	507 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	508 complex_pos(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	509 {
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	510 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	511 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	512 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	513 }
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	514 else
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	515 return PyComplex_FromCComplex(v->cval);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	516 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	517
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	518 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	519 complex_abs(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	520 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	521 double result;
002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	522 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	523 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	524 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	525 return PyFloat_FromDouble(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	526 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	527
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	528 static int
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	529 complex_nonzero(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	530 {
9940 93b9eafe1f1d Ai! complex_nonzero() has && which should be \|\|, else decidedly Guido van Rossum <guido@python.org> parents: 8261 diff changeset	531 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	532 }
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 static int
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	535 complex_coerce(PyObject pv, PyObject pw)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	536 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	537 Py_complex cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	538 cval.imag = 0.;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	539 if (PyInt_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	540 cval.real = (double)PyInt_AsLong(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	541 *pw = PyComplex_FromCComplex(cval);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	542 Py_INCREF(*pv);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	543 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	544 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	545 else if (PyLong_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	546 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	547 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	548 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	549 *pw = PyComplex_FromCComplex(cval);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	550 Py_INCREF(*pv);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	551 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	552 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	553 else if (PyFloat_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	554 cval.real = PyFloat_AsDouble(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	555 *pw = PyComplex_FromCComplex(cval);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	556 Py_INCREF(*pv);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	557 return 0;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	558 }
19974 8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	559 else if (PyComplex_Check(*pw)) {
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	560 Py_INCREF(*pv);
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	561 Py_INCREF(*pw);
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	562 return 0;
8edc44bd0ac7 complex_coerce(): add explicit PyComplex_Check() test. Previously, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	563 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	564 return 1; /* Can't do it */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	565 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	566
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	567 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	568 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	569 {
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	570 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	571 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	572 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	573
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	574 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	575 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	576 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	577 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	578 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	579 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	580 }
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20061 diff changeset	581 /* 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	582 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	583 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	584 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	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 }
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	588
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	589 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	590 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	591 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	592 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	593
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	594 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	595 PyErr_SetString(PyExc_TypeError,
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	596 "cannot compare complex numbers using <, <=, >, >=");
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	597 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	598 }
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	599
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	600 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	601 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	602 else
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	603 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	604
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	605 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	606 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	607 }
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	608
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	609 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	610 complex_int(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	611 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	612 PyErr_SetString(PyExc_TypeError,
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	613 "can't convert complex to int; use e.g. int(abs(z))");
9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	614 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	615 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	616
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	617 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	618 complex_long(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	619 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	620 PyErr_SetString(PyExc_TypeError,
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	621 "can't convert complex to long; use e.g. long(abs(z))");
9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	622 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	623 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	624
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	625 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	626 complex_float(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	627 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	628 PyErr_SetString(PyExc_TypeError,
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	629 "can't convert complex to float; use e.g. abs(z)");
9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	630 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	631 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	632
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	633 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	634 complex_conjugate(PyObject *self)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	635 {
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	636 Py_complex c;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	637 c = ((PyComplexObject *)self)->cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	638 c.imag = -c.imag;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	639 return PyComplex_FromCComplex(c);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	640 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	641
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	642 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	643 {"conjugate", (PyCFunction)complex_conjugate, METH_NOARGS},
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	644 {NULL, NULL} /* sentinel */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	645 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	646
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19974 diff changeset	647 static PyMemberDef complex_members[] = {
21894 f245955b3fbe Declare real and imag as read-only attributes. Guido van Rossum <guido@python.org> parents: 21399 diff changeset	648 {"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	649 "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	650 {"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	651 "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	652 {0},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	653 };
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	654
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	655 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	656 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	657 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	658 extern double strtod(const char , char *);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	659 const char s, start;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	660 char *end;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	661 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	662 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	663 int digit_or_dot;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	664 int sw_error=0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	665 int sign;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	666 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	667 #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	668 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	669 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	670 int len;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	671
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	672 if (PyString_Check(v)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	673 s = PyString_AS_STRING(v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	674 len = PyString_GET_SIZE(v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	675 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	676 #ifdef Py_USING_UNICODE
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	677 else if (PyUnicode_Check(v)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	678 if (PyUnicode_GET_SIZE(v) >= sizeof(s_buffer)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	679 PyErr_SetString(PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	680 "complex() literal too large to convert");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	681 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	682 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	683 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	684 PyUnicode_GET_SIZE(v),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	685 s_buffer,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	686 NULL))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	687 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	688 s = s_buffer;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	689 len = (int)strlen(s);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	690 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	691 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	692 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	693 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	694 "complex() arg is not a string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	695 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	696 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	697
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	698 /* position on first nonblank */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	699 start = s;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	700 while (s && isspace(Py_CHARMASK(s)))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	701 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	702 if (s[0] == '\0') {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	703 PyErr_SetString(PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	704 "complex() arg is an empty string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	705 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	706 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	707
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	708 z = -1.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	709 sign = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	710 do {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	711
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	712 switch (*s) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	713
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	714 case '\0':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	715 if (s-start != len) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	716 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	717 PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	718 "complex() arg contains a null byte");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	719 return NULL;
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 if(!done) sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	722 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	723
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	724 case '-':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	725 sign = -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	726 /* Fallthrough */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	727 case '+':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	728 if (done) sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	729 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	730 if ( s=='\0'\|\|s=='+'\|\|*s=='-' \|\|
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	731 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	732 break;
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 case 'J':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	735 case 'j':
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	736 if (got_im \|\| done) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	737 sw_error = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	738 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	739 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	740 if (z<0.0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	741 y=sign;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	742 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	743 else{
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	744 y=sign*z;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	745 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	746 got_im=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	747 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	748 if (s!='+' && s!='-' )
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	749 done=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	750 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	751
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	752 default:
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	753 if (isspace(Py_CHARMASK(*s))) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	754 while (s && isspace(Py_CHARMASK(s)))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	755 s++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	756 if (s[0] != '\0')
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	757 sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	758 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	759 done = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	760 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	761 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	762 digit_or_dot =
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	763 (s=='.' \|\| isdigit(Py_CHARMASK(s)));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	764 if (done\|\|!digit_or_dot) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	765 sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	766 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	767 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	768 errno = 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	769 PyFPE_START_PROTECT("strtod", return 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	770 z = strtod(s, &end) ;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	771 PyFPE_END_PROTECT(z)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	772 if (errno != 0) {
21078 025ad27d4224 complex_to_buf(), complex_subtype_from_c_complex(): Conversion of Barry Warsaw <barry@python.org> parents: 20666 diff changeset	773 PyOS_snprintf(buffer, sizeof(buffer),
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	774 "float() out of range: %.150s", s);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	775 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	776 PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	777 buffer);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	778 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	779 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	780 s=end;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	781 if (s=='J' \|\| s=='j') {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	782
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	783 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	784 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	785 if (got_re) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	786 sw_error=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	787 break;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	788 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	789
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	790 /* accept a real part */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	791 x=sign*z;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	792 got_re=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	793 if (got_im) done=1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	794 z = -1.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	795 sign = 1;
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 } /* end of switch */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	799
23031 5bda546ebe24 SF bug 543840: complex(string) accepts strings with \0 Tim Peters <tim.peters@gmail.com> parents: 22974 diff changeset	800 } 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	801
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	802 if (sw_error) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	803 PyErr_SetString(PyExc_ValueError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	804 "complex() arg is a malformed string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	805 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	806 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	807
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	808 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	809 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	810
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	811 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	812 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	813 {
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	814 PyObject r, i, tmp, f;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	815 PyNumberMethods nbr, nbi = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	816 Py_complex cr, ci;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	817 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	818 static PyObject *complexstr;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	819 static char *kwlist[] = {"real", "imag", 0};
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 r = Py_False;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	822 i = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	823 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	824 &r, &i))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	825 return NULL;
21399 33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	826 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	827 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	828 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	829 "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	830 " 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	831 return NULL;
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	832 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	833 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	834 }
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	835 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	836 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	837 "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	838 return NULL;
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	839 }
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	840
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	841 /* 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	842 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	843 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	844 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	845 return NULL;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	846 }
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	847 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	848 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	849 PyErr_Clear();
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	850 else {
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	851 PyObject *args = Py_BuildValue("()");
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	852 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	853 return NULL;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	854 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	855 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	856 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	857 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	858 return NULL;
abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	859 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	860 }
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	861 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	862 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	863 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	864 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	865 ((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	866 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	867 "complex() argument must be a string or a number");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	868 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	869 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	870 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	871 /* 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	872 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	873 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	874 cr = ((PyComplexObject*)r)->cval;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	875 if (own_r) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	876 Py_DECREF(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	877 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	878 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	879 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	880 tmp = PyNumber_Float(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	881 if (own_r) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	882 Py_DECREF(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	883 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	884 if (tmp == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	885 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	886 if (!PyFloat_Check(tmp)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	887 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	888 "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	889 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	890 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	891 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	892 cr.real = PyFloat_AsDouble(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	893 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	894 cr.imag = 0.0;
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 (i == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	897 ci.real = 0.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	898 ci.imag = 0.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	899 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	900 else if (PyComplex_Check(i))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	901 ci = ((PyComplexObject*)i)->cval;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	902 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	903 tmp = (*nbi->nb_float)(i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	904 if (tmp == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	905 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	906 ci.real = PyFloat_AsDouble(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	907 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	908 ci.imag = 0.;
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 cr.real -= ci.imag;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	911 cr.imag += ci.real;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	912 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	913 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	914
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23820 diff changeset	915 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	916 "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	917 "\n"
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	918 "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	919 "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	920
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	921 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	922 (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	923 (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	924 (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	925 (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	926 (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	927 (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	928 (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	929 (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	930 (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	931 (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	932 (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	933 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	934 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	935 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	936 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	937 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	938 0, /* nb_or */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	939 (coercion)complex_coerce, /* nb_coerce */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	940 (unaryfunc)complex_int, /* nb_int */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	941 (unaryfunc)complex_long, /* nb_long */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	942 (unaryfunc)complex_float, /* nb_float */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	943 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	944 0, /* nb_hex */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	945 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	946 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	947 0, /* nb_inplace_multiply*/
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	948 0, /* nb_inplace_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	949 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	950 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	951 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	952 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	953 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	954 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	955 0, /* nb_inplace_or */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	956 (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	957 (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	958 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	959 0, /* nb_inplace_true_divide */
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	960 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	961
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	962 PyTypeObject PyComplex_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	963 PyObject_HEAD_INIT(&PyType_Type)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	964 0,
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	965 "complex",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	966 sizeof(PyComplexObject),
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	967 0,
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	968 (destructor)complex_dealloc, /* tp_dealloc */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	969 (printfunc)complex_print, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	970 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	971 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	972 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	973 (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	974 &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	975 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	976 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	977 (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	978 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	979 (reprfunc)complex_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	980 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	981 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	982 0, /* tp_as_buffer */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	983 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	984 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	985 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	986 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	987 complex_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	988 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	989 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	990 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	991 complex_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	992 complex_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	993 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	994 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	995 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	996 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	997 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	998 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	999 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1000 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1001 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	1002 PyObject_Del, /* tp_free */
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1003 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1004
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1005 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/complexobject.c @ 24042:63fbbed10714 legacy-trunk