Merged revisions 75440 via svnmerge from

mdickinson · mdickinson · commit 42e30556e569 · 2009-10-15T19:55:18.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75440 | mark.dickinson | 2009-10-15 18:45:39 +0100 (Thu, 15 Oct 2009) | 1 line

  Allow core Python build to succeed under WITHOUT_COMPLEX.  The module build stage still fails.
........
diff --git a/Python/compile.c b/Python/compile.c
@@ -895,10 +895,8 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 {
 	PyObject *t, *v;
 	Py_ssize_t arg;
-	unsigned char *p, *q;
-	Py_complex z;
+	unsigned char *p;
 	double d;
-	int real_part_zero, imag_part_zero;
 
 	/* necessary to make sure types aren't coerced (e.g., int and long) */
         /* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */
@@ -913,7 +911,11 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 		else
 			t = PyTuple_Pack(2, o, o->ob_type);
 	}
+#ifndef WITHOUT_COMPLEX
 	else if (PyComplex_Check(o)) {
+		Py_complex z;
+		int real_part_zero, imag_part_zero;
+		unsigned char *q;
 		/* complex case is even messier: we need to make complex(x,
 		   0.) different from complex(x, -0.) and complex(0., y)
 		   different from complex(-0., y), for any x and y.  In
@@ -943,6 +945,7 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 			t = PyTuple_Pack(2, o, o->ob_type);
 		}
         }
+#endif /* WITHOUT_COMPLEX */
 	else {
 		t = PyTuple_Pack(2, o, o->ob_type);
         }
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
@@ -9,6 +9,8 @@
 #define FORMAT_STRING  _PyUnicode_FormatAdvanced
 #define FORMAT_LONG    _PyLong_FormatAdvanced
 #define FORMAT_FLOAT   _PyFloat_FormatAdvanced
+#ifndef WITHOUT_COMPLEX
 #define FORMAT_COMPLEX _PyComplex_FormatAdvanced
+#endif
 
 #include "../Objects/stringlib/formatter.h"

Original file line number	Diff line number	Diff line change
`@@ -895,10 +895,8 @@ compiler_add_o(struct compiler c, PyObject dict, PyObject *o)`
`895`	`895`	`{`
`896`	`896`	`PyObject t, v;`
`897`	`897`	`Py_ssize_t arg;`
`898`		`- unsigned char p, q;`
`899`		`- Py_complex z;`
	`898`	`+ unsigned char *p;`
`900`	`899`	`double d;`
`901`		`- int real_part_zero, imag_part_zero;`
`902`	`900`
`903`	`901`	`/* necessary to make sure types aren't coerced (e.g., int and long) */`
`904`	`902`	`/* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */`
`@@ -913,7 +911,11 @@ compiler_add_o(struct compiler c, PyObject dict, PyObject *o)`
`913`	`911`	`else`
`914`	`912`	`t = PyTuple_Pack(2, o, o->ob_type);`
`915`	`913`	`}`
	`914`	`+#ifndef WITHOUT_COMPLEX`
`916`	`915`	`else if (PyComplex_Check(o)) {`
	`916`	`+ Py_complex z;`
	`917`	`+ int real_part_zero, imag_part_zero;`
	`918`	`+ unsigned char *q;`
`917`	`919`	`/* complex case is even messier: we need to make complex(x,`
`918`	`920`	`0.) different from complex(x, -0.) and complex(0., y)`
`919`	`921`	`different from complex(-0., y), for any x and y. In`
`@@ -943,6 +945,7 @@ compiler_add_o(struct compiler c, PyObject dict, PyObject *o)`
`943`	`945`	`t = PyTuple_Pack(2, o, o->ob_type);`
`944`	`946`	`}`
`945`	`947`	`}`
	`948`	`+#endif /* WITHOUT_COMPLEX */`
`946`	`949`	`else {`
`947`	`950`	`t = PyTuple_Pack(2, o, o->ob_type);`
`948`	`951`	`}`