Py_complex; and WITHOUT_COMPLEX added to getargs.c

gvanrossum · gvanrossum · commit 530956d247fd · 1996-07-21T02:27:43.000Z
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -286,7 +286,7 @@ builtin_complex(self, args)
 {
 	object *r, *i;
 	number_methods *nbr, *nbi;
-	complex cr, ci;
+	Py_complex cr, ci;
 
 	i = NULL;
 	if (!newgetargs(args, "O|O:complex", &r, &i))
diff --git a/Python/compile.c b/Python/compile.c
@@ -565,7 +565,7 @@ parsenumber(s)
 	char *end;
 	long x;
 #ifndef WITHOUT_COMPLEX
-	complex c;
+	Py_complex c;
 	int imflag;
 #endif
 
@@ -2500,7 +2500,7 @@ com_arglist(c, n)
 			name = STR(fp);
 		else {
 			name = "";
-			complex= 1;
+			complex = 1;
 		}
 		com_newlocal(c, name);
 		c->c_argcount++;
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -498,16 +498,18 @@ convertsimple1(arg, p_format, p_va)
 			break;
 		}
 	
+#ifndef WITHOUT_COMPLEX
 	case 'D': /* complex double */
 		{
-			complex *p = va_arg(*p_va, complex *);
-			complex cval = PyComplex_AsCComplex(arg);
+			Py_complex *p = va_arg(*p_va, Py_complex *);
+			Py_complex cval = PyComplex_AsCComplex(arg);
 			if (err_occurred())
 				return "complex<D>";
 			else
 				*p = cval;
 			break;
 		}
+#endif /* WITHOUT_COMPLEX */
 	
 	case 'c': /* char */
 		{
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -359,7 +359,7 @@ r_object(p)
 		{
 			extern double atof PROTO((const char *));
 			char buf[256];
-			complex c;
+			Py_complex c;
 			n = r_byte(p);
 			if (r_string(buf, (int)n, p) != n) {
 				err_setstr(EOFError,

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ builtin_complex(self, args)`
`286`	`286`	`{`
`287`	`287`	`object r, i;`
`288`	`288`	`number_methods nbr, nbi;`
`289`		`- complex cr, ci;`
	`289`	`+ Py_complex cr, ci;`
`290`	`290`
`291`	`291`	`i = NULL;`
`292`	`292`	`if (!newgetargs(args, "O\|O:complex", &r, &i))`
Original file line number	Diff line number	Diff line change
`@@ -498,16 +498,18 @@ convertsimple1(arg, p_format, p_va)`
`498`	`498`	`break;`
`499`	`499`	`}`
`500`	`500`
	`501`	`+#ifndef WITHOUT_COMPLEX`
`501`	`502`	`case 'D': /* complex double */`
`502`	`503`	`{`
`503`		`- complex p = va_arg(p_va, complex *);`
`504`		`- complex cval = PyComplex_AsCComplex(arg);`
	`504`	`+ Py_complex p = va_arg(p_va, Py_complex *);`
	`505`	`+ Py_complex cval = PyComplex_AsCComplex(arg);`
`505`	`506`	`if (err_occurred())`
`506`	`507`	`return "complex<D>";`
`507`	`508`	`else`
`508`	`509`	`*p = cval;`
`509`	`510`	`break;`
`510`	`511`	`}`
	`512`	`+#endif /* WITHOUT_COMPLEX */`
`511`	`513`
`512`	`514`	`case 'c': /* char */`
`513`	`515`	`{`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ r_object(p)`
`359`	`359`	`{`
`360`	`360`	`extern double atof PROTO((const char *));`
`361`	`361`	`char buf[256];`
`362`		`- complex c;`
	`362`	`+ Py_complex c;`
`363`	`363`	`n = r_byte(p);`
`364`	`364`	`if (r_string(buf, (int)n, p) != n) {`
`365`	`365`	`err_setstr(EOFError,`