summaryrefslogtreecommitdiff
path: root/py/builtintables.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-05 23:04:22 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-05 23:04:22 +0100
commit09af5364d4cb0f85e51e4193565e903ca192c98b (patch)
tree76a4401b1d5d32b1f4e541414a243e58d55ab1b9 /py/builtintables.c
parent27e735fd1870e24595eadb02164b164a3bb81b98 (diff)
parentcc0af3d727e9f675da233ac4fd9ddc15bc41fe76 (diff)
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/builtintables.c')
-rw-r--r--py/builtintables.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/py/builtintables.c b/py/builtintables.c
index bc3d0deb1..9a46be6e0 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -54,12 +54,14 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_eval), (mp_obj_t)&mp_builtin_eval_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_exec), (mp_obj_t)&mp_builtin_exec_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_getattr), (mp_obj_t)&mp_builtin_getattr_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_globals), (mp_obj_t)&mp_builtin_globals_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_hash), (mp_obj_t)&mp_builtin_hash_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_id), (mp_obj_t)&mp_builtin_id_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_isinstance), (mp_obj_t)&mp_builtin_isinstance_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_issubclass), (mp_obj_t)&mp_builtin_issubclass_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_iter), (mp_obj_t)&mp_builtin_iter_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_len), (mp_obj_t)&mp_builtin_len_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_locals), (mp_obj_t)&mp_builtin_locals_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_max), (mp_obj_t)&mp_builtin_max_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_min), (mp_obj_t)&mp_builtin_min_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_next), (mp_obj_t)&mp_builtin_next_obj },