aboutsummaryrefslogtreecommitdiff
path: root/py/objbool.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-05-11 18:37:21 +0100
committerDamien George <damien.p.george@gmail.com>2014-05-11 18:37:21 +0100
commitee7a880d6e669423309c3a5f8c20b59027604572 (patch)
treed3b2f09d32316e60a77672c0650e32a81f2ee2d1 /py/objbool.c
parent1d34e324319c3b9c22ea045d1fbe526bc05a48b4 (diff)
py: Use mp_arg_check_num in more places.
Updated functions now do proper checking that n_kw==0, and are simpler because they don't have to explicitly raise an exception. Down side is that the error messages no longer include the function name, but that's acceptable. Saves order 300 text bytes on x64 and ARM.
Diffstat (limited to 'py/objbool.c')
-rw-r--r--py/objbool.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/py/objbool.c b/py/objbool.c
index 179ab7659..e31e7a2a4 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -49,12 +49,14 @@ STATIC void bool_print(void (*print)(void *env, const char *fmt, ...), void *env
}
STATIC mp_obj_t bool_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
- // TODO check n_kw == 0
+ mp_arg_check_num(n_args, n_kw, 0, 1, false);
switch (n_args) {
- case 0: return mp_const_false;
- case 1: if (mp_obj_is_true(args[0])) { return mp_const_true; } else { return mp_const_false; }
- default: nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "bool takes at most 1 argument, %d given", n_args));
+ case 0:
+ return mp_const_false;
+ case 1:
+ default: // must be 0 or 1
+ if (mp_obj_is_true(args[0])) { return mp_const_true; } else { return mp_const_false; }
}
}