diff options
author | Damien George <damien.p.george@gmail.com> | 2014-05-11 18:37:21 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-05-11 18:37:21 +0100 |
commit | ee7a880d6e669423309c3a5f8c20b59027604572 (patch) | |
tree | d3b2f09d32316e60a77672c0650e32a81f2ee2d1 /py/objfloat.c | |
parent | 1d34e324319c3b9c22ea045d1fbe526bc05a48b4 (diff) | |
download | micropython-ee7a880d6e669423309c3a5f8c20b59027604572.tar.gz micropython-ee7a880d6e669423309c3a5f8c20b59027604572.zip |
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/objfloat.c')
-rw-r--r-- | py/objfloat.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/py/objfloat.c b/py/objfloat.c index 5260fadc1c..e27942143d 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -37,6 +37,7 @@ #include "obj.h" #include "parsenum.h" #include "runtime0.h" +#include "runtime.h" #if MICROPY_ENABLE_FLOAT @@ -66,13 +67,14 @@ STATIC void float_print(void (*print)(void *env, const char *fmt, ...), void *en } STATIC mp_obj_t float_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_obj_new_float(0); case 1: + default: if (MP_OBJ_IS_STR(args[0])) { // a string, parse it uint l; @@ -85,9 +87,6 @@ STATIC mp_obj_t float_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const m // something else, try to cast it to a float return mp_obj_new_float(mp_obj_get_float(args[0])); } - - default: - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "float takes at most 1 argument, %d given", n_args)); } } |