Skip to content

Commit 09af536

Browse files
dpgeorgedpgeorge
committed
Merge branch 'master' of github.com:micropython/micropython
2 parents 27e735f + cc0af3d commit 09af536

4 files changed

Lines changed: 19 additions & 0 deletions

File tree

‎py/builtin.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,3 +410,16 @@ STATIC mp_obj_t mp_builtin_getattr(uint n_args, const mp_obj_t *args) {
410410
}
411411

412412
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr);
413+
414+
415+
STATIC mp_obj_t mp_builtin_globals() {
416+
return mp_globals_get();
417+
}
418+
419+
MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_globals_obj, mp_builtin_globals);
420+
421+
STATIC mp_obj_t mp_builtin_locals() {
422+
return mp_locals_get();
423+
}
424+
425+
MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_builtin_locals);

‎py/builtin.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_divmod_obj);
1313
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_eval_obj);
1414
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_exec_obj);
1515
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_getattr_obj);
16+
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_globals_obj);
1617
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_hash_obj);
1718
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_id_obj);
1819
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_isinstance_obj);
1920
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_issubclass_obj);
2021
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_iter_obj);
2122
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_len_obj);
2223
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_list_obj);
24+
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_locals_obj);
2325
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_max_obj);
2426
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_min_obj);
2527
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_next_obj);

‎py/builtintables.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
5454
{ MP_OBJ_NEW_QSTR(MP_QSTR_eval), (mp_obj_t)&mp_builtin_eval_obj },
5555
{ MP_OBJ_NEW_QSTR(MP_QSTR_exec), (mp_obj_t)&mp_builtin_exec_obj },
5656
{ MP_OBJ_NEW_QSTR(MP_QSTR_getattr), (mp_obj_t)&mp_builtin_getattr_obj },
57+
{ MP_OBJ_NEW_QSTR(MP_QSTR_globals), (mp_obj_t)&mp_builtin_globals_obj },
5758
{ MP_OBJ_NEW_QSTR(MP_QSTR_hash), (mp_obj_t)&mp_builtin_hash_obj },
5859
{ MP_OBJ_NEW_QSTR(MP_QSTR_id), (mp_obj_t)&mp_builtin_id_obj },
5960
{ MP_OBJ_NEW_QSTR(MP_QSTR_isinstance), (mp_obj_t)&mp_builtin_isinstance_obj },
6061
{ MP_OBJ_NEW_QSTR(MP_QSTR_issubclass), (mp_obj_t)&mp_builtin_issubclass_obj },
6162
{ MP_OBJ_NEW_QSTR(MP_QSTR_iter), (mp_obj_t)&mp_builtin_iter_obj },
6263
{ MP_OBJ_NEW_QSTR(MP_QSTR_len), (mp_obj_t)&mp_builtin_len_obj },
64+
{ MP_OBJ_NEW_QSTR(MP_QSTR_locals), (mp_obj_t)&mp_builtin_locals_obj },
6365
{ MP_OBJ_NEW_QSTR(MP_QSTR_max), (mp_obj_t)&mp_builtin_max_obj },
6466
{ MP_OBJ_NEW_QSTR(MP_QSTR_min), (mp_obj_t)&mp_builtin_min_obj },
6567
{ MP_OBJ_NEW_QSTR(MP_QSTR_next), (mp_obj_t)&mp_builtin_next_obj },

‎py/qstrdefs.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Q(exec)
9797
Q(filter)
9898
Q(float)
9999
Q(getattr)
100+
Q(globals)
100101
Q(hash)
101102
Q(id)
102103
Q(io)
@@ -106,6 +107,7 @@ Q(issubclass)
106107
Q(iter)
107108
Q(len)
108109
Q(list)
110+
Q(locals)
109111
Q(map)
110112
Q(max)
111113
Q(min)

0 commit comments

Comments
 (0)