diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-05 21:53:54 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-05 21:53:54 +0100 |
| commit | 8b0535e23fb1c646103a060a4ae17e9ee6d5e887 (patch) | |
| tree | 515598a971774ffa77d65cc32acfd8e3a0a7e5de /py/builtin.c | |
| parent | 60be1cf3b923aad4cbfcdc4bf9dcb527c395c3fc (diff) | |
| download | micropython-8b0535e23fb1c646103a060a4ae17e9ee6d5e887.tar.gz micropython-8b0535e23fb1c646103a060a4ae17e9ee6d5e887.zip | |
py: Change module globals from mp_map_t* to mp_obj_dict_t*.
Towards addressing issue #424.
Had a small increase to ROM usage (order 60 bytes).
Diffstat (limited to 'py/builtin.c')
| -rw-r--r-- | py/builtin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/builtin.c b/py/builtin.c index 22c5ecfde3..11268aed18 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -157,7 +157,7 @@ STATIC mp_obj_t mp_builtin_dir(uint n_args, const mp_obj_t *args) { } else { // n_args == 1 // make a list of names in the given object if (MP_OBJ_IS_TYPE(args[0], &mp_type_module)) { - map = mp_obj_module_get_globals(args[0]); + map = mp_obj_dict_get_map(mp_obj_module_get_globals(args[0])); } else { mp_obj_type_t *type; if (MP_OBJ_IS_TYPE(args[0], &mp_type_type)) { @@ -174,7 +174,7 @@ STATIC mp_obj_t mp_builtin_dir(uint n_args, const mp_obj_t *args) { mp_obj_t dir = mp_obj_new_list(0, NULL); if (map != NULL) { for (uint i = 0; i < map->alloc; i++) { - if (map->table[i].key != MP_OBJ_NULL) { + if (MP_MAP_SLOT_IS_FILLED(map, i)) { mp_obj_list_append(dir, map->table[i].key); } } |