commit 37067666ee24b018f260a011375f65aa69b49041
author Andrew Scheller <github@loowis.durge.org> Thu May 01 21:21:43 2014 +0100
committer Andrew Scheller <github@loowis.durge.org> Thu May 01 21:21:43 2014 +0100
tree 9b062622de8f0f35a6d4b3c909ad720d2668d847
parent 1f85d6255d6929edbcfc087e4e07c2fde39c3632

Fix the builtin min() and max() functions (and add tests).
Fixes #539

py/builtin.c

diff --git a/py/builtin.c b/py/builtin.c
index 250a355..b586792 100644
--- a/py/builtin.c
+++ b/py/builtin.c
@@ -245,7 +245,7 @@
         mp_obj_t max_obj = NULL;
         mp_obj_t item;
         while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            if (max_obj == NULL || mp_binary_op(MP_BINARY_OP_LESS, max_obj, item)) {
+            if (max_obj == NULL || (mp_binary_op(MP_BINARY_OP_LESS, max_obj, item) == mp_const_true)) {
                 max_obj = item;
             }
         }
@@ -257,7 +257,7 @@
         // given many args
         mp_obj_t max_obj = args[0];
         for (int i = 1; i < n_args; i++) {
-            if (mp_binary_op(MP_BINARY_OP_LESS, max_obj, args[i])) {
+            if (mp_binary_op(MP_BINARY_OP_LESS, max_obj, args[i]) == mp_const_true) {
                 max_obj = args[i];
             }
         }
@@ -274,7 +274,7 @@
         mp_obj_t min_obj = NULL;
         mp_obj_t item;
         while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            if (min_obj == NULL || mp_binary_op(MP_BINARY_OP_LESS, item, min_obj)) {
+            if (min_obj == NULL || (mp_binary_op(MP_BINARY_OP_LESS, item, min_obj) == mp_const_true)) {
                 min_obj = item;
             }
         }
@@ -286,7 +286,7 @@
         // given many args
         mp_obj_t min_obj = args[0];
         for (int i = 1; i < n_args; i++) {
-            if (mp_binary_op(MP_BINARY_OP_LESS, args[i], min_obj)) {
+            if (mp_binary_op(MP_BINARY_OP_LESS, args[i], min_obj) == mp_const_true) {
                 min_obj = args[i];
             }
         }