From ca4767984b4f4412f43dc7759d1f1e84f860ec57 Mon Sep 17 00:00:00 2001 From: Damien George Date: Mon, 3 Feb 2014 22:44:10 +0000 Subject: py: Implement builtin exec. --- py/builtin.h | 1 + py/builtineval.c | 54 ----------------------------------------------- py/builtinevex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ py/py.mk | 2 +- py/qstrdefs.h | 1 + py/runtime.c | 1 + 6 files changed, 68 insertions(+), 55 deletions(-) delete mode 100644 py/builtineval.c create mode 100644 py/builtinevex.c (limited to 'py') diff --git a/py/builtin.h b/py/builtin.h index f0a1dd938..933776f53 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/builtineval.c deleted file mode 100644 index 49d2bf16a..000000000 --- a/py/builtineval.c +++ /dev/null @@ -1,54 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include "nlr.h" -#include "misc.h" -#include "mpconfig.h" -#include "qstr.h" -#include "lexer.h" -#include "lexerunix.h" -#include "parse.h" -#include "obj.h" -#include "compile.h" -#include "runtime0.h" -#include "runtime.h" -#include "map.h" -#include "builtin.h" - -static mp_obj_t mp_builtin_eval(mp_obj_t o_in) { - uint str_len; - const byte *str = mp_obj_str_get_data(o_in, &str_len); - - // create the lexer - mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, (const char*)str, str_len, 0); - qstr source_name = mp_lexer_source_name(lex); - - // 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_lexer_free(lex); - - if (pn == MP_PARSE_NODE_NULL) { - // parse error; raise exception - nlr_jump(mp_obj_new_exception_msg(parse_exc_id, parse_exc_msg)); - } - - // compile the string - mp_obj_t module_fun = mp_compile(pn, source_name, false); - mp_parse_node_free(pn); - - if (module_fun == mp_const_none) { - // TODO handle compile error correctly - return mp_const_none; - } - - // complied successfully, execute it - return rt_call_function_0(module_fun); -} - -MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_eval_obj, mp_builtin_eval); diff --git a/py/builtinevex.c b/py/builtinevex.c new file mode 100644 index 000000000..03db86273 --- /dev/null +++ b/py/builtinevex.c @@ -0,0 +1,64 @@ +#include +#include +#include +#include +#include +#include + +#include "nlr.h" +#include "misc.h" +#include "mpconfig.h" +#include "qstr.h" +#include "lexer.h" +#include "lexerunix.h" +#include "parse.h" +#include "obj.h" +#include "compile.h" +#include "runtime0.h" +#include "runtime.h" +#include "map.h" +#include "builtin.h" + +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); + + // create the lexer + mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, (const char*)str, str_len, 0); + qstr source_name = mp_lexer_source_name(lex); + + // parse the string + qstr parse_exc_id; + const char *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) { + // parse error; raise exception + nlr_jump(mp_obj_new_exception_msg(parse_exc_id, parse_exc_msg)); + } + + // compile the string + mp_obj_t module_fun = mp_compile(pn, source_name, false); + mp_parse_node_free(pn); + + if (module_fun == mp_const_none) { + // TODO handle compile error correctly + return mp_const_none; + } + + // complied successfully, execute it + 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); diff --git a/py/py.mk b/py/py.mk index 5cd2ef8b7..e29d7b6ca 100644 --- a/py/py.mk +++ b/py/py.mk @@ -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 592b84907..b273ac445 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 7a6a44475..836a07254 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); -- cgit v1.2.3