-
Notifications
You must be signed in to change notification settings - Fork 0
/
diff
56 lines (56 loc) · 2.17 KB
/
diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
< #include "fast_compares.c"
< PyObject* unsafe_unicode_compare(PyObject* left, PyObject* right, int not_used){
< /* Reference implementation: PyUnicode_Compare in Objects/unicodeobject.c
< * left and right are assumed to both be PyUnicode_Type
< */
< if (PyUnicode_READY(left) == -1 ||
< PyUnicode_READY(right) == -1)
< return NULL;
< return unicode_compare(left, right) == -1 ? Py_True : Py_False;
---
< PyObject* unsafe_long_compare(PyObject* left, PyObject* right, int not_used){
< /* Reference implementation: long_richcompare in Objects/longobject.c
< * left and right are assumed to both be PyLong_Type
< */
< return long_compare((PyLongObject*)left, (PyLongObject*)right) == -1 ? Py_True : Py_False;
---
< PyObject* (*compare_function)(PyObject* left, PyObject* right, int op) = PyObject_RichCompare;
< PyObject* cmp_result;
< #define ISLT(X, Y) ((*compare_function)(X,Y,Py_LT))
< #define IFLT(X, Y) if ((cmp_result = ISLT(X, Y)) == NULL) goto fail; \
< if (cmp_result == Py_True)
---
31c1912
< fast_listsort(FastListObject *self_fastlist, PyObject *args, PyObject *kwds)
---
> listsort(PyListObject *self, PyObject *args, PyObject *kwds)
33d1913
< PyListObject* self = (PyListObject*)self_fastlist;
92,94d1971
< //Get type of the first key
< keys[0] = PyObject_CallFunctionObjArgs(keyfunc, saved_ob_item[0], NULL);
<
98d1974
<
112,131d1987
< /* Turn off type checking if all keys are same type,
< * by replacing PyObject_RichCompare with lo.keys[0]->ob_type->tp_richcompare,
< * and possibly also use optimized comparison functions if keys are strings or ints.
< */
< int keys_are_all_same_type = 1;
< PyTypeObject* key_type = lo.keys[0]->ob_type;
< for (i=0; i< saved_ob_size; i++)
< if (lo.keys[i]->ob_type != key_type)
< keys_are_all_same_type = 0;
<
< if (keys_are_all_same_type){
< if (key_type == &PyUnicode_Type)
< compare_function = unsafe_unicode_compare;
< if (key_type == &PyLong_Type)
< compare_function = unsafe_long_compare;
< else
< compare_function = key_type->tp_richcompare;
< }
< /* End of evil type checking stuff */
<
230a2087,2992