diff options
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtinimport.c | 19 | ||||
| -rw-r--r-- | py/objfun.c | 20 | ||||
| -rw-r--r-- | py/runtime.h | 2 |
3 files changed, 30 insertions, 11 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c index 0a730b031c..05b8eead57 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -132,13 +132,18 @@ void do_load(mp_obj_t module_obj, vstr_t *file) { mp_obj_t mp_builtin___import__(int n_args, mp_obj_t *args) { /* printf("import:\n"); - for (int i = 0; i < n; i++) { + for (int i = 0; i < n_args; i++) { printf(" "); - mp_obj_print(args[i]); + mp_obj_print(args[i], PRINT_REPR); printf("\n"); } */ + mp_obj_t fromtuple = mp_const_none; + if (n_args >= 4) { + fromtuple = args[3]; + } + uint mod_len; const char *mod_str = (const char*)mp_obj_str_get_data(args[0], &mod_len); @@ -150,8 +155,11 @@ mp_obj_t mp_builtin___import__(int n_args, mp_obj_t *args) { if (p == NULL) { return module_obj; } + // If fromlist is not empty, return leaf module + if (fromtuple != mp_const_none) { + return module_obj; + } // Otherwise, we need to return top-level package - // TODO: subject to fromlist arg qstr pkg_name = qstr_from_strn(mod_str, p - mod_str); return mp_obj_module_get(pkg_name); } @@ -227,6 +235,11 @@ mp_obj_t mp_builtin___import__(int n_args, mp_obj_t *args) { assert(0); } + // If fromlist is not empty, return leaf module + if (fromtuple != mp_const_none) { + return module_obj; + } + // Otherwise, we need to return top-level package return top_module_obj; } diff --git a/py/objfun.c b/py/objfun.c index 354d7ff9ca..7c89c47000 100644 --- a/py/objfun.c +++ b/py/objfun.c @@ -26,26 +26,30 @@ // mp_obj_fun_native_t defined in obj.h STATIC void check_nargs(mp_obj_fun_native_t *self, int n_args, int n_kw) { - if (n_kw && !self->is_kw) { + rt_check_nargs(n_args, self->n_args_min, self->n_args_max, n_kw, self->is_kw); +} + +void rt_check_nargs(int n_args, machine_uint_t n_args_min, machine_uint_t n_args_max, int n_kw, bool is_kw) { + if (n_kw && !is_kw) { nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "function does not take keyword arguments")); } - if (self->n_args_min == self->n_args_max) { - if (n_args != self->n_args_min) { + if (n_args_min == n_args_max) { + if (n_args != n_args_min) { nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "function takes %d positional arguments but %d were given", - self->n_args_min, n_args)); + n_args_min, n_args)); } } else { - if (n_args < self->n_args_min) { + if (n_args < n_args_min) { nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "<fun name>() missing %d required positional arguments: <list of names of params>", - self->n_args_min - n_args)); - } else if (n_args > self->n_args_max) { + n_args_min - n_args)); + } else if (n_args > n_args_max) { nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "<fun name> expected at most %d arguments, got %d", - self->n_args_max, n_args)); + n_args_max, n_args)); } } } diff --git a/py/runtime.h b/py/runtime.h index 1eef99d2ff..7215cc8890 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -1,3 +1,5 @@ +void rt_check_nargs(int n_args, machine_uint_t n_args_min, machine_uint_t n_args_max, int n_kw, bool is_kw); + int rt_is_true(mp_obj_t arg); mp_obj_t rt_load_const_dec(qstr qstr); |