diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-05 23:04:22 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-05 23:04:22 +0100 |
| commit | 09af5364d4cb0f85e51e4193565e903ca192c98b (patch) | |
| tree | 76a4401b1d5d32b1f4e541414a243e58d55ab1b9 /py/builtin.c | |
| parent | 27e735fd1870e24595eadb02164b164a3bb81b98 (diff) | |
| parent | cc0af3d727e9f675da233ac4fd9ddc15bc41fe76 (diff) | |
| download | micropython-09af5364d4cb0f85e51e4193565e903ca192c98b.tar.gz micropython-09af5364d4cb0f85e51e4193565e903ca192c98b.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/builtin.c')
| -rw-r--r-- | py/builtin.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/py/builtin.c b/py/builtin.c index a6d14fa48c..fc037f12f3 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -410,3 +410,16 @@ STATIC mp_obj_t mp_builtin_getattr(uint n_args, const mp_obj_t *args) { } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr); + + +STATIC mp_obj_t mp_builtin_globals() { + return mp_globals_get(); +} + +MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_globals_obj, mp_builtin_globals); + +STATIC mp_obj_t mp_builtin_locals() { + return mp_locals_get(); +} + +MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_builtin_locals); |