mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString

Browse source 
I moved the unicode_eq to stringlib/eq.h to keep the function static and possible inline for setobject.c and dictobject.h. I also removed the unused _PyString_Eq method. If it's required in the future it can be added to eq.h
This commit is contained in:
Christian Heimes 2007-12-10 15:50:56 +00:00
parent 110194048e
commit 0ded5b54bb
7 changed files with 85 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Objects/dictobject.c
View file

@ -8,6 +8,7 @@
*/
#include "Python.h"
#include "stringlib/eq.h"
/* Set a key error with the specified argument, wrapping it in a
@ -327,25 +328,6 @@ lookdict(PyDictObject *mp, PyObject *key, register long hash)
return 0;
}
/* Return 1 if two unicode objects are equal, 0 if not. */
static int
unicode_eq(PyObject *aa, PyObject *bb)
{
PyUnicodeObject *a = (PyUnicodeObject *)aa;
PyUnicodeObject *b = (PyUnicodeObject *)bb;
if (a->length != b->length)
return 0;
if (a->length == 0)
return 1;
if (a->str[0] != b->str[0])
return 0;
if (a->length == 1)
return 1;
return memcmp(a->str, b->str, a->length * sizeof(Py_UNICODE)) == 0;
}
/*
* Hacked up version of lookdict which can assume keys are always
* unicodes; this assumption allows testing for errors during