summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-01-13 16:29:14 +0200
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-01-13 22:41:16 +0200
commitca318bba0d97c66d8fb14a089d8fa269a0e1b424 (patch)
tree6c4858ca8184efb1332ac093de407667dc544aa1
parent76a90f2f6035a8b3c2c2064fbee658c6015d7cfe (diff)
downloadmicropython-ca318bba0d97c66d8fb14a089d8fa269a0e1b424.tar.gz
micropython-ca318bba0d97c66d8fb14a089d8fa269a0e1b424.zip
mp_obj_equal(): Compare small and long ints properly.
By dispatching to long int methods.
-rw-r--r--py/obj.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/py/obj.c b/py/obj.c
index 2759437fd7..206bf7a24a 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -108,9 +108,15 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2) {
return val == 0;
} else if (o2 == mp_const_true) {
return val == 1;
- } else {
- return false;
+ } else if (MP_OBJ_IS_TYPE(o2, &int_type)) {
+ // If o2 is long int, dispatch to its virtual methods
+ mp_obj_base_t *o = o2;
+ if (o->type->binary_op != NULL) {
+ mp_obj_t r = o->type->binary_op(RT_COMPARE_OP_EQUAL, o2, o1);
+ return r == mp_const_true ? true : false;
+ }
}
+ return false;
}
} else if (MP_OBJ_IS_QSTR(o1) || MP_OBJ_IS_QSTR(o2)) {
return false;