Skip to content

Commit c9fc620

Browse files
dpgeorgedpgeorge
committed
py: Implement compile builtin, enabled only on unix port.
This should be pretty compliant with CPython, except perhaps for some corner cases to do with globals/locals context. Addresses issue adafruit#879.
1 parent e5a3759 commit c9fc620

7 files changed

Lines changed: 105 additions & 2 deletions

File tree

‎py/builtin.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_all_obj);
3535
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_any_obj);
3636
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_bin_obj);
3737
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_callable_obj);
38+
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_compile_obj);
3839
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_chr_obj);
3940
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_dir_obj);
4041
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_divmod_obj);

‎py/builtinevex.c‎

Lines changed: 82 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,87 @@
3434
#include "lexerunix.h"
3535
#include "parse.h"
3636
#include "obj.h"
37+
#include "objfun.h"
3738
#include "parsehelper.h"
3839
#include "compile.h"
3940
#include "runtime0.h"
4041
#include "runtime.h"
4142
#include "builtin.h"
4243

43-
STATIC mp_obj_t eval_exec_helper(mp_uint_t n_args, const mp_obj_t *args, mp_parse_input_kind_t parse_input_kind) {
44+
#if MICROPY_PY_BUILTINS_COMPILE
45+
46+
typedef struct _mp_obj_code_t {
47+
mp_obj_base_t base;
48+
mp_obj_t module_fun;
49+
} mp_obj_code_t;
50+
51+
STATIC const mp_obj_type_t mp_type_code = {
52+
{ &mp_type_type },
53+
.name = MP_QSTR_code,
54+
};
55+
56+
STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_t globals, mp_obj_t locals) {
57+
// save context and set new context
58+
mp_obj_dict_t *old_globals = mp_globals_get();
59+
mp_obj_dict_t *old_locals = mp_locals_get();
60+
mp_globals_set(globals);
61+
mp_locals_set(locals);
62+
63+
// a bit of a hack: fun_bc will re-set globals, so need to make sure it's
64+
// the correct one
65+
if (MP_OBJ_IS_TYPE(self->module_fun, &mp_type_fun_bc)) {
66+
mp_obj_fun_bc_t *fun_bc = self->module_fun;
67+
fun_bc->globals = globals;
68+
}
69+
70+
// execute code
71+
nlr_buf_t nlr;
72+
if (nlr_push(&nlr) == 0) {
73+
mp_obj_t ret = mp_call_function_0(self->module_fun);
74+
nlr_pop();
75+
mp_globals_set(old_globals);
76+
mp_locals_set(old_locals);
77+
return ret;
78+
} else {
79+
// exception; restore context and re-raise same exception
80+
mp_globals_set(old_globals);
81+
mp_locals_set(old_locals);
82+
nlr_raise(nlr.ret_val);
83+
}
84+
}
85+
86+
STATIC mp_obj_t mp_builtin_compile(mp_uint_t n_args, const mp_obj_t *args) {
87+
// get the source
4488
mp_uint_t str_len;
4589
const char *str = mp_obj_str_get_data(args[0], &str_len);
4690

91+
// get the filename
92+
qstr filename = mp_obj_str_get_qstr(args[1]);
93+
4794
// create the lexer
48-
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, str, str_len, 0);
95+
mp_lexer_t *lex = mp_lexer_new_from_str_len(filename, str, str_len, 0);
96+
97+
// get the compile mode
98+
qstr mode = mp_obj_str_get_qstr(args[2]);
99+
mp_parse_input_kind_t parse_input_kind;
100+
switch (mode) {
101+
case MP_QSTR_single: parse_input_kind = MP_PARSE_SINGLE_INPUT; break;
102+
case MP_QSTR_exec: parse_input_kind = MP_PARSE_FILE_INPUT; break;
103+
case MP_QSTR_eval: parse_input_kind = MP_PARSE_EVAL_INPUT; break;
104+
default:
105+
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad compile mode"));
106+
}
107+
108+
mp_obj_code_t *code = m_new_obj(mp_obj_code_t);
109+
code->base.type = &mp_type_code;
110+
code->module_fun = mp_parse_compile_execute(lex, parse_input_kind, NULL, NULL);
111+
return code;
112+
}
113+
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_compile_obj, 3, 6, mp_builtin_compile);
114+
115+
#endif // MICROPY_PY_BUILTINS_COMPILE
49116

117+
STATIC mp_obj_t eval_exec_helper(mp_uint_t n_args, const mp_obj_t *args, mp_parse_input_kind_t parse_input_kind) {
50118
// work out the context
51119
mp_obj_dict_t *globals = mp_globals_get();
52120
mp_obj_dict_t *locals = mp_locals_get();
@@ -59,6 +127,18 @@ STATIC mp_obj_t eval_exec_helper(mp_uint_t n_args, const mp_obj_t *args, mp_pars
59127
}
60128
}
61129

130+
#if MICROPY_PY_BUILTINS_COMPILE
131+
if (MP_OBJ_IS_TYPE(args[0], &mp_type_code)) {
132+
return code_execute(args[0], globals, locals);
133+
}
134+
#endif
135+
136+
mp_uint_t str_len;
137+
const char *str = mp_obj_str_get_data(args[0], &str_len);
138+
139+
// create the lexer
140+
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, str, str_len, 0);
141+
62142
return mp_parse_compile_execute(lex, parse_input_kind, globals, locals);
63143
}
64144

‎py/builtintables.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
9191
{ MP_OBJ_NEW_QSTR(MP_QSTR_any), (mp_obj_t)&mp_builtin_any_obj },
9292
{ MP_OBJ_NEW_QSTR(MP_QSTR_bin), (mp_obj_t)&mp_builtin_bin_obj },
9393
{ MP_OBJ_NEW_QSTR(MP_QSTR_callable), (mp_obj_t)&mp_builtin_callable_obj },
94+
#if MICROPY_PY_BUILTINS_COMPILE
95+
{ MP_OBJ_NEW_QSTR(MP_QSTR_compile), (mp_obj_t)&mp_builtin_compile_obj },
96+
#endif
9497
{ MP_OBJ_NEW_QSTR(MP_QSTR_chr), (mp_obj_t)&mp_builtin_chr_obj },
9598
{ MP_OBJ_NEW_QSTR(MP_QSTR_dir), (mp_obj_t)&mp_builtin_dir_obj },
9699
{ MP_OBJ_NEW_QSTR(MP_QSTR_divmod), (mp_obj_t)&mp_builtin_divmod_obj },

‎py/mpconfig.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,11 @@ typedef double mp_float_t;
312312
#define MICROPY_PY_BUILTINS_PROPERTY (1)
313313
#endif
314314

315+
// Whether to support compile function
316+
#ifndef MICROPY_PY_BUILTINS_COMPILE
317+
#define MICROPY_PY_BUILTINS_COMPILE (0)
318+
#endif
319+
315320
// Whether to set __file__ for imported modules
316321
#ifndef MICROPY_PY___FILE__
317322
#define MICROPY_PY___FILE__ (1)

‎py/qstrdefs.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@ Q(value)
213213
Q(write)
214214
Q(zip)
215215

216+
#if MICROPY_PY_BUILTINS_COMPILE
217+
Q(compile)
218+
Q(code)
219+
Q(single)
220+
#endif
221+
216222
Q(sep)
217223
Q(end)
218224

‎py/runtime.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,6 +1189,13 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
11891189
nlr_raise(module_fun);
11901190
}
11911191

1192+
// for compile only
1193+
if (MICROPY_PY_BUILTINS_COMPILE && globals == NULL) {
1194+
mp_globals_set(old_globals);
1195+
mp_locals_set(old_locals);
1196+
return module_fun;
1197+
}
1198+
11921199
// complied successfully, execute it
11931200
nlr_buf_t nlr;
11941201
if (nlr_push(&nlr) == 0) {

‎unix/mpconfigport.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
4848
#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
4949
#define MICROPY_PY_BUILTINS_FROZENSET (1)
50+
#define MICROPY_PY_BUILTINS_COMPILE (1)
5051
#define MICROPY_PY_SYS_EXIT (1)
5152
#define MICROPY_PY_SYS_PLATFORM "linux"
5253
#define MICROPY_PY_SYS_MAXSIZE (1)

0 commit comments

Comments
 (0)