diff options
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtin.h | 1 | ||||
| -rw-r--r-- | py/builtinevex.c (renamed from py/builtineval.c) | 14 | ||||
| -rw-r--r-- | py/py.mk | 2 | ||||
| -rw-r--r-- | py/qstrdefs.h | 1 | ||||
| -rw-r--r-- | py/runtime.c | 1 |
5 files changed, 16 insertions, 3 deletions
diff --git a/py/builtin.h b/py/builtin.h index f0a1dd938a..933776f53b 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -11,6 +11,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_chr_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_dir_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_divmod_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_eval_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_exec_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_hash_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_id_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_isinstance_obj); diff --git a/py/builtineval.c b/py/builtinevex.c index 49d2bf16a2..03db862738 100644 --- a/py/builtineval.c +++ b/py/builtinevex.c @@ -19,7 +19,7 @@ #include "map.h" #include "builtin.h" -static mp_obj_t mp_builtin_eval(mp_obj_t o_in) { +static mp_obj_t parse_compile_execute(mp_obj_t o_in, mp_parse_input_kind_t parse_input_kind) { uint str_len; const byte *str = mp_obj_str_get_data(o_in, &str_len); @@ -30,7 +30,7 @@ static mp_obj_t mp_builtin_eval(mp_obj_t o_in) { // parse the string qstr parse_exc_id; const char *parse_exc_msg; - mp_parse_node_t pn = mp_parse(lex, MP_PARSE_EVAL_INPUT, &parse_exc_id, &parse_exc_msg); + mp_parse_node_t pn = mp_parse(lex, parse_input_kind, &parse_exc_id, &parse_exc_msg); mp_lexer_free(lex); if (pn == MP_PARSE_NODE_NULL) { @@ -51,4 +51,14 @@ static mp_obj_t mp_builtin_eval(mp_obj_t o_in) { return rt_call_function_0(module_fun); } +static mp_obj_t mp_builtin_eval(mp_obj_t o_in) { + return parse_compile_execute(o_in, MP_PARSE_EVAL_INPUT); +} + MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_eval_obj, mp_builtin_eval); + +static mp_obj_t mp_builtin_exec(mp_obj_t o_in) { + return parse_compile_execute(o_in, MP_PARSE_FILE_INPUT); +} + +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_exec_obj, mp_builtin_exec); @@ -65,7 +65,7 @@ PY_O_BASENAME = \ stream.o \ builtin.o \ builtinimport.o \ - builtineval.o \ + builtinevex.o \ builtinmp.o \ vm.o \ showbc.o \ diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 592b849076..b273ac4450 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -55,6 +55,7 @@ Q(dir) Q(divmod) Q(enumerate) Q(eval) +Q(exec) Q(filter) Q(float) Q(hash) diff --git a/py/runtime.c b/py/runtime.c index 7a6a44475f..836a07254c 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -144,6 +144,7 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_dir, (mp_obj_t)&mp_builtin_dir_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_divmod, (mp_obj_t)&mp_builtin_divmod_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_eval, (mp_obj_t)&mp_builtin_eval_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_exec, (mp_obj_t)&mp_builtin_exec_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_hash, (mp_obj_t)&mp_builtin_hash_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_id, (mp_obj_t)&mp_builtin_id_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_isinstance, (mp_obj_t)&mp_builtin_isinstance_obj); |