A static swapped_op[] array was defined in 3 different C files, & I think

tim-one · tim-one · commit f4aca755bc9f · 2004-09-23T02:39:37.000Z
I need to define it again.  Bite the bullet and define it once as an
extern, _Py_SwappedOp[].
diff --git a/Include/object.h b/Include/object.h
@@ -667,6 +667,11 @@ PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */
 #define Py_GT 4
 #define Py_GE 5
 
+/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
+ * Defined in object.c.
+ */
+PyAPI_DATA(int) _Py_SwappedOp[];
+
 /*
 Define staticforward and statichere for source compatibility with old
 C extensions.
diff --git a/Objects/classobject.c b/Objects/classobject.c
@@ -1873,9 +1873,6 @@ half_richcompare(PyObject *v, PyObject *w, int op)
 	return res;
 }
 
-/* Map rich comparison operators to their swapped version, e.g. LT --> GT */
-static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
-
 static PyObject *
 instance_richcompare(PyObject *v, PyObject *w, int op)
 {
@@ -1889,7 +1886,7 @@ instance_richcompare(PyObject *v, PyObject *w, int op)
 	}
 
 	if (PyInstance_Check(w)) {
-		res = half_richcompare(w, v, swapped_op[op]);
+		res = half_richcompare(w, v, _Py_SwappedOp[op]);
 		if (res != Py_NotImplemented)
 			return res;
 		Py_DECREF(res);
diff --git a/Objects/object.c b/Objects/object.c
@@ -476,7 +476,7 @@ adjust_tp_compare(int c)
                          ? (t)->tp_richcompare : NULL)
 
 /* Map rich comparison operators to their swapped version, e.g. LT --> GT */
-static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
+extern int _Py_SwappedOp[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
 
 /* Try a genuine rich comparison, returning an object.  Return:
    NULL for exception;
@@ -494,7 +494,7 @@ try_rich_compare(PyObject *v, PyObject *w, int op)
 	if (v->ob_type != w->ob_type &&
 	    PyType_IsSubtype(w->ob_type, v->ob_type) &&
 	    (f = RICHCOMPARE(w->ob_type)) != NULL) {
-		res = (*f)(w, v, swapped_op[op]);
+		res = (*f)(w, v, _Py_SwappedOp[op]);
 		if (res != Py_NotImplemented)
 			return res;
 		Py_DECREF(res);
@@ -506,7 +506,7 @@ try_rich_compare(PyObject *v, PyObject *w, int op)
 		Py_DECREF(res);
 	}
 	if ((f = RICHCOMPARE(w->ob_type)) != NULL) {
-		return (*f)(w, v, swapped_op[op]);
+		return (*f)(w, v, _Py_SwappedOp[op]);
 	}
 	res = Py_NotImplemented;
 	Py_INCREF(res);
@@ -1703,7 +1703,7 @@ PyObject_Dir(PyObject *arg)
 
 	assert(result);
 	if (!PyList_Check(result)) {
-		PyErr_SetString(PyExc_TypeError, 
+		PyErr_SetString(PyExc_TypeError,
 			"Expected keys() to be a list.");
 		goto error;
 	}
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -4638,9 +4638,6 @@ half_richcompare(PyObject *self, PyObject *other, int op)
 	return res;
 }
 
-/* Map rich comparison operators to their swapped version, e.g. LT --> GT */
-static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
-
 static PyObject *
 slot_tp_richcompare(PyObject *self, PyObject *other, int op)
 {
@@ -4653,7 +4650,7 @@ slot_tp_richcompare(PyObject *self, PyObject *other, int op)
 		Py_DECREF(res);
 	}
 	if (other->ob_type->tp_richcompare == slot_tp_richcompare) {
-		res = half_richcompare(other, self, swapped_op[op]);
+		res = half_richcompare(other, self, _Py_SwappedOp[op]);
 		if (res != Py_NotImplemented) {
 			return res;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1873,9 +1873,6 @@ half_richcompare(PyObject v, PyObject w, int op)`
`1873`	`1873`	`return res;`
`1874`	`1874`	`}`
`1875`	`1875`
`1876`		`-/* Map rich comparison operators to their swapped version, e.g. LT --> GT */`
`1877`		`-static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};`
`1878`		`-`
`1879`	`1876`	`static PyObject *`
`1880`	`1877`	`instance_richcompare(PyObject v, PyObject w, int op)`
`1881`	`1878`	`{`
`@@ -1889,7 +1886,7 @@ instance_richcompare(PyObject v, PyObject w, int op)`
`1889`	`1886`	`}`
`1890`	`1887`
`1891`	`1888`	`if (PyInstance_Check(w)) {`
`1892`		`- res = half_richcompare(w, v, swapped_op[op]);`
	`1889`	`+ res = half_richcompare(w, v, _Py_SwappedOp[op]);`
`1893`	`1890`	`if (res != Py_NotImplemented)`
`1894`	`1891`	`return res;`
`1895`	`1892`	`Py_DECREF(res);`
Original file line number	Diff line number	Diff line change
`@@ -4638,9 +4638,6 @@ half_richcompare(PyObject self, PyObject other, int op)`
`4638`	`4638`	`return res;`
`4639`	`4639`	`}`
`4640`	`4640`
`4641`		`-/* Map rich comparison operators to their swapped version, e.g. LT --> GT */`
`4642`		`-static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};`
`4643`		`-`
`4644`	`4641`	`static PyObject *`
`4645`	`4642`	`slot_tp_richcompare(PyObject self, PyObject other, int op)`
`4646`	`4643`	`{`
`@@ -4653,7 +4650,7 @@ slot_tp_richcompare(PyObject self, PyObject other, int op)`
`4653`	`4650`	`Py_DECREF(res);`
`4654`	`4651`	`}`
`4655`	`4652`	`if (other->ob_type->tp_richcompare == slot_tp_richcompare) {`
`4656`		`- res = half_richcompare(other, self, swapped_op[op]);`
	`4653`	`+ res = half_richcompare(other, self, _Py_SwappedOp[op]);`
`4657`	`4654`	`if (res != Py_NotImplemented) {`
`4658`	`4655`	`return res;`
`4659`	`4656`	`}`