diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-05 22:36:42 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-05 22:36:42 +0100 |
commit | 7efc5b3f346869cd4177760e6a6b2bb863b425da (patch) | |
tree | 04fbe840f20ab84bee79d28882601812279c8718 /py/builtinevex.c | |
parent | 8b0535e23fb1c646103a060a4ae17e9ee6d5e887 (diff) |
py: Make globals and locals proper dictionary objects.
Finishes addressing issue #424.
In the end this was a very neat refactor that now makes things a lot
more consistent across the py code base. It allowed some
simplifications in certain places, now that everything is a dict object.
Also converted builtins tables to dictionaries. This will be useful
when we need to turn builtins into a proper module.
Diffstat (limited to 'py/builtinevex.c')
-rw-r--r-- | py/builtinevex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/builtinevex.c b/py/builtinevex.c index 4aafbdbe6..0a928199f 100644 --- a/py/builtinevex.c +++ b/py/builtinevex.c @@ -54,8 +54,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_eval_obj, mp_builtin_eval); STATIC mp_obj_t mp_builtin_exec(uint n_args, const mp_obj_t *args) { // Unconditional getting/setting assumes that these operations // are cheap, which is the case when this comment was written. - mp_map_t *old_globals = mp_globals_get(); - mp_map_t *old_locals = mp_locals_get(); + mp_obj_dict_t *old_globals = mp_globals_get(); + mp_obj_dict_t *old_locals = mp_locals_get(); if (n_args > 1) { mp_obj_t globals = args[1]; mp_obj_t locals; @@ -64,8 +64,8 @@ STATIC mp_obj_t mp_builtin_exec(uint n_args, const mp_obj_t *args) { } else { locals = globals; } - mp_globals_set(mp_obj_dict_get_map(globals)); - mp_locals_set(mp_obj_dict_get_map(locals)); + mp_globals_set(globals); + mp_locals_set(locals); } mp_obj_t res = parse_compile_execute(args[0], MP_PARSE_FILE_INPUT); // TODO if the above call throws an exception, then we never get to reset the globals/locals |