Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-08-14 14:40:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

sequence: Fix glaring bug in sequence comparison.

Browse Source
This commit is contained in:
Paul Sokolovsky
2014-04-18 21:42:54 +03:00
parent 7de5377ca7
commit 83eba5dec5
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
py/sequence.c
View File

@@ -1,3 +1,4 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
@@ -109,18 +110,24 @@ bool mp_seq_cmp_objs(int op, const mp_obj_t *items1, uint len1, const mp_obj_t *
int len = len1 < len2 ? len1 : len2;
bool eq_status = true; // empty lists are equal
bool rel_status;
for (int i = 0; i < len; i++) {
eq_status = mp_obj_equal(items1[i], items2[i]);
if (op == MP_BINARY_OP_EQUAL && !eq_status) {
return false;
}
rel_status = (mp_binary_op(op, items1[i], items2[i]) == mp_const_true);
if (!eq_status && !rel_status) {
// If current elements equal, can't decide anything - go on
if (eq_status) {
continue;
}
// Othewise, if they are not equal, we can have final decision based on them
if (op == MP_BINARY_OP_EQUAL) {
// In particular, if we are checking for equality, here're the answer
return false;
}
// Otherwise, application of relation op gives the answer
return (mp_binary_op(op, items1[i], items2[i]) == mp_const_true);
}
assert(eq_status);
// If we had tie in the last element...
if (eq_status) {
// ... and we have lists of different lengths...