From 83eba5dec5b8ed7134a2a27a8824d271acee5711 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 18 Apr 2014 21:42:54 +0300 Subject: sequence: Fix glaring bug in sequence comparison. --- py/sequence.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'py/sequence.c') diff --git a/py/sequence.c b/py/sequence.c index 3a4d65d53b..7ea3f708f1 100644 --- a/py/sequence.c +++ b/py/sequence.c @@ -1,3 +1,4 @@ +#include #include #include @@ -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; + // If current elements equal, can't decide anything - go on + if (eq_status) { + continue; } - rel_status = (mp_binary_op(op, items1[i], items2[i]) == mp_const_true); - if (!eq_status && !rel_status) { + + // 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... -- cgit v1.2.3 From 0fc4775cd6e13360bfd622602b50de900dac6617 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 18 Apr 2014 21:47:58 +0300 Subject: sequence: Further simplify sequence comparison. --- py/sequence.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'py/sequence.c') diff --git a/py/sequence.c b/py/sequence.c index 7ea3f708f1..f91bf43c74 100644 --- a/py/sequence.c +++ b/py/sequence.c @@ -109,11 +109,9 @@ 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 for (int i = 0; i < len; i++) { - eq_status = mp_obj_equal(items1[i], items2[i]); // If current elements equal, can't decide anything - go on - if (eq_status) { + if (mp_obj_equal(items1[i], items2[i])) { continue; } @@ -127,19 +125,16 @@ bool mp_seq_cmp_objs(int op, const mp_obj_t *items1, uint len1, const mp_obj_t * 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... - if (len1 != len2) { - if (len1 < len2) { - // ... then longer list length wins (we deal only with >) - return false; - } - } else if (op == MP_BINARY_OP_MORE) { - // Otherwise, if we have strict relation, equality means failure + // ... and we have lists of different lengths... + if (len1 != len2) { + if (len1 < len2) { + // ... then longer list length wins (we deal only with >) return false; } + } else if (op == MP_BINARY_OP_MORE) { + // Otherwise, if we have strict relation, sequence equality means failure + return false; } return true; -- cgit v1.2.3