djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Add generic mp_not_implemented() func to use instead of assert().

Browse Source 
Benefits: won't crash baremetal targets, will provide Python source location
when not implemented feature used (it will no longer provide C source
location, but just grep for error message).
This commit is contained in:
Paul Sokolovsky 2014-06-07 23:22:41 +03:00
parent aabd83ea20
commit 7e4a2b0edc
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/emitglue.c
View File

@ -120,7 +120,9 @@ mp_obj_t mp_make_function_from_raw_code(mp_raw_code_t *rc, mp_obj_t def_args, mp
assert(def_args == MP_OBJ_NULL || MP_OBJ_IS_TYPE(def_args, &mp_type_tuple)); assert(def_args == MP_OBJ_NULL || MP_OBJ_IS_TYPE(def_args, &mp_type_tuple));
// TODO implement default kw args // TODO implement default kw args
assert(def_kw_args == MP_OBJ_NULL); if (def_kw_args != MP_OBJ_NULL) {
mp_not_implemented("Default values for kw-only args");
}
// make the function, depending on the raw code kind // make the function, depending on the raw code kind
mp_obj_t fun; mp_obj_t fun;

4
py/runtime.c
View File

@ -1150,6 +1150,10 @@ void *m_malloc_fail(int num_bytes) {
nlr_raise((mp_obj_t)&mp_const_MemoryError_obj); nlr_raise((mp_obj_t)&mp_const_MemoryError_obj);
} }
NORETURN void mp_not_implemented(const char *msg) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, msg));
}
// these must correspond to the respective enum // these must correspond to the respective enum
void *const mp_fun_table[MP_F_NUMBER_OF] = { void *const mp_fun_table[MP_F_NUMBER_OF] = {
mp_load_const_int, mp_load_const_int,

3
py/runtime.h
View File

@ -112,6 +112,9 @@ mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level);
mp_obj_t mp_import_from(mp_obj_t module, qstr name); mp_obj_t mp_import_from(mp_obj_t module, qstr name);
void mp_import_all(mp_obj_t module); void mp_import_all(mp_obj_t module);
// Raise NotImplementedError with given message
NORETURN void mp_not_implemented(const char *msg);
extern struct _mp_obj_list_t mp_sys_path_obj; extern struct _mp_obj_list_t mp_sys_path_obj;
extern struct _mp_obj_list_t mp_sys_argv_obj; extern struct _mp_obj_list_t mp_sys_argv_obj;
#define mp_sys_path ((mp_obj_t)&mp_sys_path_obj) #define mp_sys_path ((mp_obj_t)&mp_sys_path_obj)