diff options
author | Damien George <damien.p.george@gmail.com> | 2014-05-06 16:52:35 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-05-06 16:52:35 +0000 |
commit | c53b408f28942bfc5b64fee86ac89a339dc06e3f (patch) | |
tree | 9d3710b79da47b0b9d664f6e6c453cac39798579 /py/argcheck.c | |
parent | 491cbd6a7cd0a212e28c548789db432b4e64327e (diff) | |
parent | b473d0ae86402c07cf0a72edebdfccfae7646d32 (diff) | |
download | micropython-c53b408f28942bfc5b64fee86ac89a339dc06e3f.tar.gz micropython-c53b408f28942bfc5b64fee86ac89a339dc06e3f.zip |
Merge branch 'master' of https://github.com/micropython/micropython
Conflicts:
py/argcheck.c
py/objenumerate.c
py/runtime.h
Diffstat (limited to 'py/argcheck.c')
-rw-r--r-- | py/argcheck.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/py/argcheck.c b/py/argcheck.c index bb26bd3aea..8343d7b279 100644 --- a/py/argcheck.c +++ b/py/argcheck.c @@ -109,3 +109,10 @@ void mp_arg_parse_all_kw_array(uint n_pos, uint n_kw, const mp_obj_t *args, uint mp_map_init_fixed_table(&kw_args, n_kw, args + n_pos); mp_arg_parse_all(n_pos, args, &kw_args, n_allowed, allowed, out_vals); } + +#if MICROPY_CPYTHON_COMPAT +NORETURN void mp_arg_error_unimpl_kw(void) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, + "keyword argument(s) not yet implemented - use normal args instead")); +} +#endif |