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

annotate Objects/complexobject.c @ 60174:255a401c19b0

(partially) Merged revisions 79534,79537,79539,79558,79606 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings. ........ r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines Fix typo ........ r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests. ........ r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote. ........ r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines Backport some robotparser test and skip the test if the external resource is not available. ........

author	Florent Xicluna <florent.xicluna@gmail.com>
date	Fri, 02 Apr 2010 18:52:12 +0000
parents	f65977dcf21a
children	cab14be0ada1

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
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	11 /* elementary operations on complex numbers */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	12
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	13 static Py_complex c_1 = {1., 0.};
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	14
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	15 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	16 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	17 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	18 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	19 r.real = a.real + b.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	20 r.imag = a.imag + b.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	21 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	22 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	23
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	24 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	25 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	26 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	27 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	28 r.real = a.real - b.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	29 r.imag = a.imag - b.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	30 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	31 }
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_neg(Py_complex a)
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;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	38 r.imag = -a.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_prod(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.realb.real - a.imagb.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	47 r.imag = a.realb.imag + a.imagb.real;
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_quot(Py_complex a, Py_complex b)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	53 {
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	54 /******************************************************************
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	55 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	56 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	57 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	58 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	59 one:
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	60
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	61 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	62 double d = b.realb.real + b.imagb.imag;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	63 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	64 errno = EDOM;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	65 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	66 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	67 return r;
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	68 ******************************************************************/
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	69
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	70 /* 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	71 * 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	72 * 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	73 * 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	74 * 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	75 * endcases.
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	76 */
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	77 Py_complex r; /* the result */
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	78 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	79 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	80
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	81 if (abs_breal >= abs_bimag) {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	82 /* 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	83 if (abs_breal == 0.0) {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	84 errno = EDOM;
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	85 r.real = r.imag = 0.0;
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 else {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	88 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	89 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	90 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	91 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	92 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	93 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	94 else {
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	95 /* 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	96 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	97 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	98 assert(b.imag != 0.0);
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	99 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	100 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	101 }
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	102 return r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	103 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	104
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	105 Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	106 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	107 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	108 Py_complex r;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	109 double vabs,len,at,phase;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	110 if (b.real == 0. && b.imag == 0.) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	111 r.real = 1.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	112 r.imag = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	113 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	114 else if (a.real == 0. && a.imag == 0.) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	115 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	116 errno = EDOM;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	117 r.real = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	118 r.imag = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	119 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	120 else {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	121 vabs = hypot(a.real,a.imag);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	122 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	123 at = atan2(a.imag, a.real);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	124 phase = at*b.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	125 if (b.imag != 0.0) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	126 len /= exp(at*b.imag);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	127 phase += b.imag*log(vabs);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	128 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	129 r.real = len*cos(phase);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	130 r.imag = len*sin(phase);
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 return r;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	133 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	134
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	135 static Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	136 c_powu(Py_complex x, long n)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	137 {
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	138 Py_complex r, p;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	139 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	140 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	141 p = x;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	142 while (mask > 0 && n >= mask) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	143 if (n & mask)
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	144 r = c_prod(r,p);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	145 mask <<= 1;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	146 p = c_prod(p,p);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	147 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	148 return r;
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
17066 2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	151 static Py_complex
2c1be7924b04 SF bug [ #409448 ] Complex division is braindead Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	152 c_powi(Py_complex x, long n)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	153 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	154 Py_complex cn;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	155
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	156 if (n > 100 \|\| n < -100) {
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	157 cn.real = (double) n;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	158 cn.imag = 0.;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	159 return c_pow(x,cn);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	160 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	161 else if (n > 0)
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	162 return c_powu(x,n);
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	163 else
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	164 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	165
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	166 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	167
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	168 double
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	169 c_abs(Py_complex z)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	170 {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	171 /* sets errno = ERANGE on overflow; otherwise errno = 0 */
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	172 double result;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	173
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	174 if (!Py_IS_FINITE(z.real) \|\| !Py_IS_FINITE(z.imag)) {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	175 /* C99 rules: if either the real or the imaginary part is an
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	176 infinity, return infinity, even if the other part is a
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	177 NaN. */
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	178 if (Py_IS_INFINITY(z.real)) {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	179 result = fabs(z.real);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	180 errno = 0;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	181 return result;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	182 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	183 if (Py_IS_INFINITY(z.imag)) {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	184 result = fabs(z.imag);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	185 errno = 0;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	186 return result;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	187 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	188 /* either the real or imaginary part is a NaN,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	189 and neither is infinite. Result should be NaN. */
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	190 return Py_NAN;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	191 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	192 result = hypot(z.real, z.imag);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	193 if (!Py_IS_FINITE(result))
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	194 errno = ERANGE;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	195 else
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	196 errno = 0;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	197 return result;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	198 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	199
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	200 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	201 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	202 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	203 PyObject *op;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	204
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	205 op = type->tp_alloc(type, 0);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	206 if (op != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	207 ((PyComplexObject *)op)->cval = cval;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	208 return op;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	209 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	210
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	211 PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	212 PyComplex_FromCComplex(Py_complex cval)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	213 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	214 register PyComplexObject *op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	215
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 23832 diff changeset	216 /* Inline PyObject_New */
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	217 op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	218 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	219 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	220 PyObject_INIT(op, &PyComplex_Type);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	221 op->cval = cval;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	222 return (PyObject *) op;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	223 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	224
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	225 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	226 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	227 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	228 Py_complex c;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	229 c.real = real;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	230 c.imag = imag;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	231 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	232 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	233
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	234 PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	235 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	236 {
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 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	238 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	239 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	240 return PyComplex_FromCComplex(c);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	241 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	242
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	243 double
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	244 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	245 {
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	246 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	247 return ((PyComplexObject *)op)->cval.real;
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	248 }
ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	249 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	250 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	251 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	252 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	253
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	254 double
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	255 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	256 {
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	257 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	258 return ((PyComplexObject *)op)->cval.imag;
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	259 }
ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	260 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	261 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	262 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	263 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	264
58143 6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	265 static PyObject *
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	266 try_complex_special_method(PyObject *op) {
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	267 PyObject *f;
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	268 static PyObject *complexstr;
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	269
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	270 f = _PyObject_LookupSpecial(op, "__complex__", &complexstr);
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	271 if (f) {
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	272 PyObject *res = PyObject_CallFunctionObjArgs(f, NULL);
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	273 Py_DECREF(f);
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	274 return res;
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	275 }
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	276 return NULL;
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	277 }
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	278
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	279 Py_complex
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	280 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	281 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	282 Py_complex cv;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	283 PyObject *newop = NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	284
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	285 assert(op);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	286 /* If op is already of type PyComplex_Type, return its value */
3328 4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	287 if (PyComplex_Check(op)) {
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	288 return ((PyComplexObject *)op)->cval;
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	289 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	290 /* If not, use op's __complex__ method, if it exists */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	291
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	292 /* return -1 on failure */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	293 cv.real = -1.;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	294 cv.imag = 0.;
45029 ef2d3bf8383d Merged revisions 60379-60382 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44767 diff changeset	295
58143 6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	296 newop = try_complex_special_method(op);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	297
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	298 if (newop) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	299 if (!PyComplex_Check(newop)) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	300 PyErr_SetString(PyExc_TypeError,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	301 "__complex__ should return a complex object");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	302 Py_DECREF(newop);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	303 return cv;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	304 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	305 cv = ((PyComplexObject *)newop)->cval;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	306 Py_DECREF(newop);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	307 return cv;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	308 }
58143 6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	309 else if (PyErr_Occurred()) {
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	310 return cv;
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	311 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	312 /* If neither of the above works, interpret op as a float giving the
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	313 real part of the result, and fill in the imaginary part as 0. */
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	314 else {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	315 /* PyFloat_AsDouble will return -1 on failure */
3328 4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	316 cv.real = PyFloat_AsDouble(op);
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	317 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	318 }
3328 4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	319 }
4c655115dfce Added PyComplex_AsCComplex Guido van Rossum <guido@python.org> parents: 3316 diff changeset	320
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	321 static void
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	322 complex_dealloc(PyObject *op)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	323 {
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20140 diff changeset	324 op->ob_type->tp_free(op);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	325 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	326
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	327
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 51271 diff changeset	328 static PyObject *
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	329 complex_format(PyComplexObject *v, int precision, char format_code)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	330 {
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	331 PyObject *result = NULL;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	332 Py_ssize_t len;
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 51271 diff changeset	333
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	334 /* If these are non-NULL, they'll need to be freed. */
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	335 char *pre = NULL;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	336 char *im = NULL;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	337 char *buf = NULL;
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 51271 diff changeset	338
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	339 /* These do not need to be freed. re is either an alias
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	340 for pre or a pointer to a constant. lead and tail
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	341 are pointers to constants. */
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	342 char *re = NULL;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	343 char *lead = "";
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	344 char *tail = "";
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 51271 diff changeset	345
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	346 if (v->cval.real == 0. && copysign(1.0, v->cval.real)==1.0) {
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	347 re = "";
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	348 im = PyOS_double_to_string(v->cval.imag, format_code,
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	349 precision, 0, NULL);
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	350 if (!im) {
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	351 PyErr_NoMemory();
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	352 goto done;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	353 }
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	354 } else {
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	355 /* Format imaginary part with sign, real part without */
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	356 pre = PyOS_double_to_string(v->cval.real, format_code,
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	357 precision, 0, NULL);
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	358 if (!pre) {
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	359 PyErr_NoMemory();
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	360 goto done;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	361 }
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	362 re = pre;
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 51271 diff changeset	363
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	364 im = PyOS_double_to_string(v->cval.imag, format_code,
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	365 precision, Py_DTSF_SIGN, NULL);
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	366 if (!im) {
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	367 PyErr_NoMemory();
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	368 goto done;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	369 }
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	370 lead = "(";
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	371 tail = ")";
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	372 }
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	373 /* Alloc the final buffer. Add one for the "j" in the format string,
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	374 and one for the trailing zero. */
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	375 len = strlen(lead) + strlen(re) + strlen(im) + strlen(tail) + 2;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	376 buf = PyMem_Malloc(len);
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	377 if (!buf) {
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	378 PyErr_NoMemory();
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	379 goto done;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	380 }
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	381 PyOS_snprintf(buf, len, "%s%s%sj%s", lead, re, im, tail);
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	382 result = PyUnicode_FromString(buf);
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	383 done:
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	384 PyMem_Free(im);
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	385 PyMem_Free(pre);
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	386 PyMem_Free(buf);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 51271 diff changeset	387
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	388 return result;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	389 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	390
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	391 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	392 complex_repr(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	393 {
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	394 return complex_format(v, 0, 'r');
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	395 }
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	396
65a638a24f7e When 1.6 boosted the # of digits produced by repr(float), repr(complex) Tim Peters <tim.peters@gmail.com> parents: 15976 diff changeset	397 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	398 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	399 {
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	400 return complex_format(v, PyFloat_STR_PRECISION, 'g');
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	401 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	402
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	403 static long
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	404 complex_hash(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	405 {
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	406 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	407 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	408 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	409 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	410 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	411 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	412 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	413 /* 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	414 * 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	415 * 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	416 * 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	417 * 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	418 */
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	419 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	420 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	421 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	422 return combined;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	423 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	424
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	425 /* This macro may return! */
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	426 #define TO_COMPLEX(obj, c) \
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	427 if (PyComplex_Check(obj)) \
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	428 c = ((PyComplexObject *)(obj))->cval; \
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	429 else if (to_complex(&(obj), &(c)) < 0) \
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	430 return (obj)
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	431
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	432 static int
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	433 to_complex(PyObject *pobj, Py_complex pc)
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	434 {
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	435 PyObject obj = pobj;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	436
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	437 pc->real = pc->imag = 0.0;
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	438 if (PyLong_Check(obj)) {
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	439 pc->real = PyLong_AsDouble(obj);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	440 if (pc->real == -1.0 && PyErr_Occurred()) {
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	441 *pobj = NULL;
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	442 return -1;
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	443 }
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	444 return 0;
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	445 }
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	446 if (PyFloat_Check(obj)) {
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	447 pc->real = PyFloat_AsDouble(obj);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	448 return 0;
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	449 }
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	450 Py_INCREF(Py_NotImplemented);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	451 *pobj = Py_NotImplemented;
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	452 return -1;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	453 }
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	454
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	455
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	456 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	457 complex_add(PyObject v, PyObject w)
3316 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 Py_complex result;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	460 Py_complex a, b;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	461 TO_COMPLEX(v, a);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	462 TO_COMPLEX(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	463 PyFPE_START_PROTECT("complex_add", return 0)
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	464 result = c_sum(a, b);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	465 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	466 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	467 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	468
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	469 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	470 complex_sub(PyObject v, PyObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	471 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	472 Py_complex result;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	473 Py_complex a, b;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	474 TO_COMPLEX(v, a);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	475 TO_COMPLEX(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	476 PyFPE_START_PROTECT("complex_sub", return 0)
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	477 result = c_diff(a, b);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	478 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	479 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	480 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	481
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	482 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	483 complex_mul(PyObject v, PyObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	484 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	485 Py_complex result;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	486 Py_complex a, b;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	487 TO_COMPLEX(v, a);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	488 TO_COMPLEX(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	489 PyFPE_START_PROTECT("complex_mul", return 0)
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	490 result = c_prod(a, b);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	491 PyFPE_END_PROTECT(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	492 return PyComplex_FromCComplex(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	493 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	494
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	495 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	496 complex_div(PyObject v, PyObject w)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	497 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	498 Py_complex quot;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	499 Py_complex a, b;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	500 TO_COMPLEX(v, a);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	501 TO_COMPLEX(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	502 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	503 errno = 0;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	504 quot = c_quot(a, b);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	505 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	506 if (errno == EDOM) {
59014 132d42348216 Merged revisions 78319 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58143 diff changeset	507 PyErr_SetString(PyExc_ZeroDivisionError, "complex division by zero");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	508 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	509 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	510 return PyComplex_FromCComplex(quot);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	511 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	512
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	513 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	514 complex_remainder(PyObject v, PyObject 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	515 {
42414 8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	516 PyErr_SetString(PyExc_TypeError,
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	517 "can't mod complex numbers.");
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	518 return NULL;
4275 cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	519 }
cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	520
cb841f1b022e Don't dump core on complex % or divmod -- raise a TypeError exception. Guido van Rossum <guido@python.org> parents: 4025 diff changeset	521
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	522 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	523 complex_divmod(PyObject v, PyObject w)
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	524 {
42414 8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	525 PyErr_SetString(PyExc_TypeError,
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	526 "can't take floor or mod of complex number.");
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	527 return NULL;
4304 95c31931b76a Properly(?) implemented remainder and divmod (Tim Hochberg) Guido van Rossum <guido@python.org> parents: 4290 diff changeset	528 }
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	529
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	530 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	531 complex_pow(PyObject v, PyObject w, PyObject *z)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	532 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	533 Py_complex p;
d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	534 Py_complex exponent;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	535 long int_exponent;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	536 Py_complex a, b;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	537 TO_COMPLEX(v, a);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	538 TO_COMPLEX(w, b);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	539
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	540 if (z != Py_None) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	541 PyErr_SetString(PyExc_ValueError, "complex modulo");
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	542 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	543 }
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	544 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	545 errno = 0;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	546 exponent = b;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	547 int_exponent = (long)exponent.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	548 if (exponent.imag == 0. && exponent.real == int_exponent)
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	549 p = c_powi(a, int_exponent);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	550 else
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	551 p = c_pow(a, exponent);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	552
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	553 PyFPE_END_PROTECT(p)
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	554 Py_ADJUST_ERANGE2(p.real, p.imag);
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	555 if (errno == EDOM) {
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	556 PyErr_SetString(PyExc_ZeroDivisionError,
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	557 "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	558 return NULL;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	559 }
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	560 else if (errno == ERANGE) {
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	561 PyErr_SetString(PyExc_OverflowError,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	562 "complex exponentiation");
22540 75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	563 return NULL;
75ef1f16725e backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21894 diff changeset	564 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	565 return PyComplex_FromCComplex(p);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	566 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	567
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	568 static PyObject *
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	569 complex_int_div(PyObject v, PyObject w)
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	570 {
42414 8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	571 PyErr_SetString(PyExc_TypeError,
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	572 "can't take floor of complex number.");
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	573 return NULL;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	574 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	575
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	576 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	577 complex_neg(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	578 {
3771 d0988318b756 complex -> Py_complex Guido van Rossum <guido@python.org> parents: 3608 diff changeset	579 Py_complex neg;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	580 neg.real = -v->cval.real;
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	581 neg.imag = -v->cval.imag;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	582 return PyComplex_FromCComplex(neg);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	583 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	584
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	585 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	586 complex_pos(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	587 {
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	588 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	589 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	590 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	591 }
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	592 else
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	593 return PyComplex_FromCComplex(v->cval);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	594 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	595
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	596 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	597 complex_abs(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	598 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	599 double result;
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	600
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	601 PyFPE_START_PROTECT("complex_abs", return 0)
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	602 result = c_abs(v->cval);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	603 PyFPE_END_PROTECT(result)
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	604
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	605 if (errno == ERANGE) {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	606 PyErr_SetString(PyExc_OverflowError,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	607 "absolute value too large");
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	608 return NULL;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	609 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	610 return PyFloat_FromDouble(result);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	611 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	612
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	613 static int
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39607 diff changeset	614 complex_bool(PyComplexObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	615 {
9940 93b9eafe1f1d Ai! complex_nonzero() has && which should be \|\|, else decidedly Guido van Rossum <guido@python.org> parents: 8261 diff changeset	616 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	617 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	618
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	619 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	620 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	621 {
39607 6f1020743077 Fix comparing complex to non-complex numbers. Guido van Rossum <guido@python.org> parents: 39603 diff changeset	622 PyObject *res;
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	623 Py_complex i, j;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	624 TO_COMPLEX(v, i);
a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	625 TO_COMPLEX(w, j);
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	626
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	627 if (op != Py_EQ && op != Py_NE) {
59563 f65977dcf21a Issue #7845: Make 1j.__le__(2j) return NotImplemented rather than raising TypeError. Mark Dickinson <dickinsm@gmail.com> parents: 59014 diff changeset	628 Py_INCREF(Py_NotImplemented);
f65977dcf21a Issue #7845: Make 1j.__le__(2j) return NotImplemented rather than raising TypeError. Mark Dickinson <dickinsm@gmail.com> parents: 59014 diff changeset	629 return Py_NotImplemented;
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	630 }
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	631
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	632 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	633 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	634 else
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	635 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	636
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	637 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	638 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	639 }
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	640
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	641 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	642 complex_int(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	643 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	644 PyErr_SetString(PyExc_TypeError,
54147 adbc662ff4c1 Merged revisions 72718 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	645 "can't convert complex to int");
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	646 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	647 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	648
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	649 static PyObject *
13452 ed4f7a22e928 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	650 complex_float(PyObject *v)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	651 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	652 PyErr_SetString(PyExc_TypeError,
54147 adbc662ff4c1 Merged revisions 72718 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	653 "can't convert complex to float");
4290 9c6eab0cf542 Raise exception instead of dropping imag part for conversion to int, Guido van Rossum <guido@python.org> parents: 4275 diff changeset	654 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	655 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	656
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	657 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	658 complex_conjugate(PyObject *self)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	659 {
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	660 Py_complex c;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	661 c = ((PyComplexObject *)self)->cval;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	662 c.imag = -c.imag;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	663 return PyComplex_FromCComplex(c);
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	664 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	665
42414 8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	666 PyDoc_STRVAR(complex_conjugate_doc,
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	667 "complex.conjugate() -> complex\n"
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	668 "\n"
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	669 "Returns the complex conjugate of its argument. (3-4j).conjugate() == 3+4j.");
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	670
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	671 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	672 complex_getnewargs(PyComplexObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	673 {
47555 7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 46477 diff changeset	674 Py_complex c = v->cval;
7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 46477 diff changeset	675 return Py_BuildValue("(dd)", c.real, c.imag);
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	676 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	677
53632 2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	678 PyDoc_STRVAR(complex__format__doc,
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	679 "complex.__format__() -> str\n"
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	680 "\n"
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	681 "Converts to a string according to format_spec.");
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	682
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	683 static PyObject *
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	684 complex__format__(PyObject* self, PyObject* args)
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	685 {
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	686 PyObject *format_spec;
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	687
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	688 if (!PyArg_ParseTuple(args, "U:__format__", &format_spec))
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	689 return NULL;
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	690 return _PyComplex_FormatAdvanced(self,
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	691 PyUnicode_AS_UNICODE(format_spec),
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	692 PyUnicode_GET_SIZE(format_spec));
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	693 }
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	694
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	695 #if 0
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	696 static PyObject *
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	697 complex_is_finite(PyObject *self)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	698 {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	699 Py_complex c;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	700 c = ((PyComplexObject *)self)->cval;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	701 return PyBool_FromLong((long)(Py_IS_FINITE(c.real) &&
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	702 Py_IS_FINITE(c.imag)));
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	703 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	704
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	705 PyDoc_STRVAR(complex_is_finite_doc,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	706 "complex.is_finite() -> bool\n"
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	707 "\n"
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	708 "Returns True if the real and the imaginary part is finite.");
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	709 #endif
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	710
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	711 static PyMethodDef complex_methods[] = {
42414 8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	712 {"conjugate", (PyCFunction)complex_conjugate, METH_NOARGS,
8c165d20709f Kill div, mod and divmod on complex (already deprecated in 2.x). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	713 complex_conjugate_doc},
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	714 #if 0
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	715 {"is_finite", (PyCFunction)complex_is_finite, METH_NOARGS,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	716 complex_is_finite_doc},
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	717 #endif
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25064 diff changeset	718 {"__getnewargs__", (PyCFunction)complex_getnewargs, METH_NOARGS},
53632 2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	719 {"__format__", (PyCFunction)complex__format__,
2cde0d003ffc Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53466 diff changeset	720 METH_VARARGS, complex__format__doc},
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	721 {NULL, NULL} /* sentinel */
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	722 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	723
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19974 diff changeset	724 static PyMemberDef complex_members[] = {
21894 f245955b3fbe Declare real and imag as read-only attributes. Guido van Rossum <guido@python.org> parents: 21399 diff changeset	725 {"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	726 "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	727 {"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	728 "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	729 {0},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	730 };
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	731
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	732 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	733 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	734 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	735 const char s, start;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	736 char *end;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	737 double x=0.0, y=0.0, z;
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	738 int got_bracket=0;
56769 4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	739 char *s_buffer = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	740 Py_ssize_t len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	741
42855 d5b52d56beba Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42477 diff changeset	742 if (PyUnicode_Check(v)) {
56769 4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	743 s_buffer = (char *)PyMem_MALLOC(PyUnicode_GET_SIZE(v) + 1);
4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	744 if (s_buffer == NULL)
4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	745 return PyErr_NoMemory();
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	746 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	747 PyUnicode_GET_SIZE(v),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	748 s_buffer,
56770 5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	749 NULL))
5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	750 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	751 s = s_buffer;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	752 len = strlen(s);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	753 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	754 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	755 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	756 "complex() arg is not a string");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	757 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	758 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	759
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	760 /* position on first nonblank */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	761 start = s;
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	762 while (Py_ISSPACE(*s))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	763 s++;
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	764 if (*s == '(') {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	765 /* Skip over possible bracket from repr(). */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	766 got_bracket = 1;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	767 s++;
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	768 while (Py_ISSPACE(*s))
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	769 s++;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	770 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	771
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	772 /* a valid complex string usually takes one of the three forms:
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	773
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	774 <float> - real part only
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	775 <float>j - imaginary part only
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	776 <float><signed-float>j - real and imaginary parts
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	777
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	778 where <float> represents any numeric string that's accepted by the
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	779 float constructor (including 'nan', 'inf', 'infinity', etc.), and
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	780 <signed-float> is any string of the form <float> whose first
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	781 character is '+' or '-'.
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	782
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	783 For backwards compatibility, the extra forms
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	784
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	785 <float><sign>j
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	786 <sign>j
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	787 j
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	788
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	789 are also accepted, though support for these forms may be removed from
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	790 a future version of Python.
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	791 */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	792
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	793 /* first look for forms starting with <float> */
54225 670fa0c0ff9a Issue #5829: complex('1e500') shouldn't raise OverflowError Mark Dickinson <dickinsm@gmail.com> parents: 54147 diff changeset	794 z = PyOS_string_to_double(s, &end, NULL);
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	795 if (z == -1.0 && PyErr_Occurred()) {
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	796 if (PyErr_ExceptionMatches(PyExc_ValueError))
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	797 PyErr_Clear();
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	798 else
56770 5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	799 goto error;
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	800 }
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	801 if (end != s) {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	802 /* all 4 forms starting with <float> land here */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	803 s = end;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	804 if (s == '+' \|\| s == '-') {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	805 /* <float><signed-float>j \| <float><sign>j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	806 x = z;
54225 670fa0c0ff9a Issue #5829: complex('1e500') shouldn't raise OverflowError Mark Dickinson <dickinsm@gmail.com> parents: 54147 diff changeset	807 y = PyOS_string_to_double(s, &end, NULL);
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	808 if (y == -1.0 && PyErr_Occurred()) {
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	809 if (PyErr_ExceptionMatches(PyExc_ValueError))
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	810 PyErr_Clear();
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	811 else
56770 5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	812 goto error;
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53632 diff changeset	813 }
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	814 if (end != s)
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	815 /* <float><signed-float>j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	816 s = end;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	817 else {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	818 /* <float><sign>j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	819 y = *s == '+' ? 1.0 : -1.0;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	820 s++;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	821 }
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	822 if (!(s == 'j' \|\| s == 'J'))
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	823 goto parse_error;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	824 s++;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	825 }
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	826 else if (s == 'j' \|\| s == 'J') {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	827 /* <float>j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	828 s++;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	829 y = z;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	830 }
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	831 else
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	832 /* <float> */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	833 x = z;
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	834 }
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	835 else {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	836 /* not starting with <float>; must be <sign>j or j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	837 if (s == '+' \|\| s == '-') {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	838 /* <sign>j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	839 y = *s == '+' ? 1.0 : -1.0;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	840 s++;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	841 }
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	842 else
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	843 /* j */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	844 y = 1.0;
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	845 if (!(s == 'j' \|\| s == 'J'))
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	846 goto parse_error;
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	847 s++;
330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	848 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	849
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	850 /* trailing whitespace and closing bracket */
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	851 while (Py_ISSPACE(*s))
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	852 s++;
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	853 if (got_bracket) {
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	854 /* if there was an opening parenthesis, then the corresponding
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	855 closing parenthesis should be right here */
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	856 if (*s != ')')
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	857 goto parse_error;
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	858 s++;
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	859 while (Py_ISSPACE(*s))
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	860 s++;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	861 }
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	862
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	863 /* we should now be at the end of the string */
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	864 if (s-start != len)
06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	865 goto parse_error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	866
56769 4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	867 if (s_buffer)
4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	868 PyMem_FREE(s_buffer);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	869 return complex_subtype_from_doubles(type, x, y);
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	870
53343 06db1d9d255f Make sure that complex parsing code and corresponding tests Mark Dickinson <dickinsm@gmail.com> parents: 53332 diff changeset	871 parse_error:
56770 5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	872 PyErr_SetString(PyExc_ValueError,
5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	873 "complex() arg is a malformed string");
5a8e81594f0f Make sure memory is freed on error in complex_subtype_from_string. Mark Dickinson <dickinsm@gmail.com> parents: 56769 diff changeset	874 error:
56769 4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	875 if (s_buffer)
4cbea9e78356 Remove length limitation on string arguments to complex() Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	876 PyMem_FREE(s_buffer);
53332 330115137414 Issue #5816: Simplify code for parsing and printing of complex numbers. Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	877 return NULL;
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	878 }
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	879
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	880 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	881 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	882 {
58143 6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	883 PyObject r, i, *tmp;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	884 PyNumberMethods nbr, nbi = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	885 Py_complex cr, ci;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	886 int own_r = 0;
44045 530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	887 int cr_is_complex = 0;
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	888 int ci_is_complex = 0;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	889 static char *kwlist[] = {"real", "imag", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	890
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	891 r = Py_False;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	892 i = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	893 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	894 &r, &i))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	895 return NULL;
25064 81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	896
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	897 /* Special-case for a single argument when type(arg) is complex. */
28134 cde444184336 Fix from Greg Chapman from SF bug #695651: a complex subclass Guido van Rossum <guido@python.org> parents: 27521 diff changeset	898 if (PyComplex_CheckExact(r) && i == NULL &&
cde444184336 Fix from Greg Chapman from SF bug #695651: a complex subclass Guido van Rossum <guido@python.org> parents: 27521 diff changeset	899 type == &PyComplex_Type) {
25064 81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	900 /* Note that we can't know whether it's safe to return
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	901 a complex subclass instance as-is, hence the restriction
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	902 to exact complexes here. If either the input or the
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	903 output is a complex subclass, it will be handled below
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	904 as a non-orthogonal vector. */
25064 81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	905 Py_INCREF(r);
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	906 return r;
81a36d2a2d13 complex() was the only numeric constructor that created a new instance Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	907 }
42855 d5b52d56beba Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42477 diff changeset	908 if (PyUnicode_Check(r)) {
21399 33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	909 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	910 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	911 "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	912 " 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	913 return NULL;
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	914 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	915 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	916 }
42855 d5b52d56beba Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42477 diff changeset	917 if (i != NULL && PyUnicode_Check(i)) {
21399 33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	918 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	919 "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	920 return NULL;
33d59e18b68d Ensure that complex() only accepts a string argument as the first arg, Fred Drake <fdrake@acm.org> parents: 21078 diff changeset	921 }
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	922
58143 6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	923 tmp = try_complex_special_method(r);
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	924 if (tmp) {
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	925 r = tmp;
23703 abe1bb76ee44 Close SF bug 563740. complex() now finds __complex__() in new style classes. Raymond Hettinger <python@rcn.com> parents: 23043 diff changeset	926 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	927 }
58143 6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	928 else if (PyErr_Occurred()) {
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	929 return NULL;
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	930 }
6049fe4022ff Merged revisions 77292-77293 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57487 diff changeset	931
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	932 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	933 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	934 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	935 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	936 ((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	937 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	938 "complex() argument must be a string or a number");
30155 e3281b0df6a4 complex_new(): This could leak when the argument was neither string nor Tim Peters <tim.peters@gmail.com> parents: 29520 diff changeset	939 if (own_r) {
e3281b0df6a4 complex_new(): This could leak when the argument was neither string nor Tim Peters <tim.peters@gmail.com> parents: 29520 diff changeset	940 Py_DECREF(r);
e3281b0df6a4 complex_new(): This could leak when the argument was neither string nor Tim Peters <tim.peters@gmail.com> parents: 29520 diff changeset	941 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	942 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	943 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	944
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	945 /* If we get this far, then the "real" and "imag" parts should
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	946 both be treated as numbers, and the constructor should return a
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	947 complex number equal to (real + imag*1j).
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	948
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	949 Note that we do NOT assume the input to already be in canonical
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	950 form; the "real" and "imag" parts might themselves be complex
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	951 numbers, which slightly complicates the code below. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	952 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	953 /* 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	954 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	955 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	956 cr = ((PyComplexObject*)r)->cval;
44045 530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	957 cr_is_complex = 1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	958 if (own_r) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	959 Py_DECREF(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	960 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	961 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	962 else {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	963 /* The "real" part really is entirely real, and contributes
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	964 nothing in the imaginary direction.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	965 Just treat it as a double. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	966 tmp = PyNumber_Float(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	967 if (own_r) {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	968 /* r was a newly created complex number, rather
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	969 than the original "real" argument. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	970 Py_DECREF(r);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	971 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	972 if (tmp == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	973 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	974 if (!PyFloat_Check(tmp)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	975 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	976 "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	977 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	978 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	979 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	980 cr.real = PyFloat_AsDouble(tmp);
44767 a6f9a2ba8962 Merged revisions 60053-60078 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44134 diff changeset	981 cr.imag = 0.0; /* Shut up compiler warning */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	982 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	983 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	984 if (i == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	985 ci.real = 0.0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	986 }
44045 530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	987 else if (PyComplex_Check(i)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	988 ci = ((PyComplexObject*)i)->cval;
44045 530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	989 ci_is_complex = 1;
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	990 } else {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	991 /* The "imag" part really is entirely imaginary, and
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	992 contributes nothing in the real direction.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	993 Just treat it as a double. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	994 tmp = (*nbi->nb_float)(i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	995 if (tmp == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	996 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	997 ci.real = PyFloat_AsDouble(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	998 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	999 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	1000 /* If the input was in canonical form, then the "real" and "imag"
44045 530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1001 parts are real numbers, so that ci.imag and cr.imag are zero.
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	1002 We need this correction in case they were not real numbers. */
44045 530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1003
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1004 if (ci_is_complex) {
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1005 cr.real -= ci.imag;
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1006 }
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1007 if (cr_is_complex) {
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1008 ci.real += cr.imag;
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1009 }
530fb9852c50 Merged revisions 59202-59211 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	1010 return complex_subtype_from_doubles(type, cr.real, ci.real);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1011 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1012
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23820 diff changeset	1013 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	1014 "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	1015 "\n"
733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19758 diff changeset	1016 "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	1017 "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	1018
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	1019 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	1020 (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	1021 (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	1022 (binaryfunc)complex_mul, /* nb_multiply */
51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1023 (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	1024 (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	1025 (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	1026 (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	1027 (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	1028 (unaryfunc)complex_abs, /* nb_absolute */
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39607 diff changeset	1029 (inquiry)complex_bool, /* nb_bool */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1030 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	1031 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	1032 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	1033 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	1034 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	1035 0, /* nb_or */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1036 complex_int, /* nb_int */
50829 af02b6e42142 Merged revisions 68650-68653 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50804 diff changeset	1037 0, /* nb_reserved */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1038 complex_float, /* nb_float */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1039 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1040 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1041 0, /* nb_inplace_multiply*/
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1042 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1043 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1044 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1045 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1046 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1047 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1048 0, /* nb_inplace_or */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1049 (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	1050 (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	1051 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1052 0, /* nb_inplace_true_divide */
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1053 };
e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1054
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	1055 PyTypeObject PyComplex_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42013 diff changeset	1056 PyVarObject_HEAD_INIT(&PyType_Type, 0)
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1057 "complex",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5286 diff changeset	1058 sizeof(PyComplexObject),
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1059 0,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1060 complex_dealloc, /* tp_dealloc */
42477 e7fd327e0c19 Kill all uses and definitions of tp_print under Objects/. (Others will follow.) Guido van Rossum <guido@python.org> parents: 42414 diff changeset	1061 0, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1062 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	1063 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50829 diff changeset	1064 0, /* tp_reserved */
15976 51fc45276a43 Use rich comparisons to fulfill an old wish: complex numbers now raise Guido van Rossum <guido@python.org> parents: 14869 diff changeset	1065 (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	1066 &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	1067 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	1068 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	1069 (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	1070 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	1071 (reprfunc)complex_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1072 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	1073 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	1074 0, /* tp_as_buffer */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1075 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	1076 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	1077 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	1078 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	1079 complex_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1080 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1081 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1082 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1083 complex_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1084 complex_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1085 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1086 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1087 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1088 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1089 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1090 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1091 0, /* tp_init */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1092 PyType_GenericAlloc, /* tp_alloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17066 diff changeset	1093 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	1094 PyObject_Del, /* tp_free */
3316 e5d1f242daf9 complex numbers a la Konrad Hinsen Guido van Rossum <guido@python.org> parents: diff changeset	1095 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/complexobject.c @ 60174:255a401c19b0