djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequence: Further simplify sequence comparison.

This commit is contained in:
Paul Sokolovsky 2014-04-18 21:47:58 +03:00
parent 83eba5dec5
commit 0fc4775cd6
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
py/sequence.c
View File

@ -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;