Commit 80849dd7 authored by Stefan Behnel's avatar Stefan Behnel

implement '==' for new unicode object (PEP 393)

--HG--
extra : rebase_source : 9be73c313cb44d6c7485ca9288382c9ad2614a45
parent 113edaab
...@@ -7045,6 +7045,15 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int ...@@ -7045,6 +7045,15 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
if (s1 == s2) { /* as done by PyObject_RichCompareBool(); also catches the (interned) empty string */ if (s1 == s2) { /* as done by PyObject_RichCompareBool(); also catches the (interned) empty string */
return (equals == Py_EQ); return (equals == Py_EQ);
} else if (PyUnicode_CheckExact(s1) & PyUnicode_CheckExact(s2)) { } else if (PyUnicode_CheckExact(s1) & PyUnicode_CheckExact(s2)) {
#ifdef PyUnicode_GET_LENGTH /* PEP 393 */
if (PyUnicode_GET_LENGTH(s1) != PyUnicode_GET_LENGTH(s2)) {
return (equals == Py_NE);
} else if (PyUnicode_GET_LENGTH(s1) == 1) {
if (equals == Py_EQ)
return (PyUnicode_READ_CHAR(s1, 0) == PyUnicode_READ_CHAR(s2, 0));
else
return (PyUnicode_READ_CHAR(s1, 0) != PyUnicode_READ_CHAR(s2, 0));
#else
if (PyUnicode_GET_SIZE(s1) != PyUnicode_GET_SIZE(s2)) { if (PyUnicode_GET_SIZE(s1) != PyUnicode_GET_SIZE(s2)) {
return (equals == Py_NE); return (equals == Py_NE);
} else if (PyUnicode_GET_SIZE(s1) == 1) { } else if (PyUnicode_GET_SIZE(s1) == 1) {
...@@ -7052,6 +7061,7 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int ...@@ -7052,6 +7061,7 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
return (PyUnicode_AS_UNICODE(s1)[0] == PyUnicode_AS_UNICODE(s2)[0]); return (PyUnicode_AS_UNICODE(s1)[0] == PyUnicode_AS_UNICODE(s2)[0]);
else else
return (PyUnicode_AS_UNICODE(s1)[0] != PyUnicode_AS_UNICODE(s2)[0]); return (PyUnicode_AS_UNICODE(s1)[0] != PyUnicode_AS_UNICODE(s2)[0]);
#endif
} else { } else {
int result = PyUnicode_Compare(s1, s2); int result = PyUnicode_Compare(s1, s2);
if ((result == -1) && unlikely(PyErr_Occurred())) if ((result == -1) && unlikely(PyErr_Occurred()))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment