diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-11-27 13:38:15 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-11-29 14:25:04 +0000 |
| commit | cbf7674025814797f5c537d6d1c195efe58ccaaf (patch) | |
| tree | 7c1e5d7956d3766dad4c194ab00024e2a954bcf9 /extmod/modure.c | |
| parent | 94fe6e523d42ecc342c1f6a9734ed2edf232ddbd (diff) | |
py: Add MP_ROM_* macros and mp_rom_* types and use them.
Diffstat (limited to 'extmod/modure.c')
| -rw-r--r-- | extmod/modure.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/extmod/modure.c b/extmod/modure.c index 8c91648f1..ef946ea98 100644 --- a/extmod/modure.c +++ b/extmod/modure.c @@ -73,8 +73,8 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) { } MP_DEFINE_CONST_FUN_OBJ_2(match_group_obj, match_group); -STATIC const mp_map_elem_t match_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_group), (mp_obj_t) &match_group_obj }, +STATIC const mp_rom_map_elem_t match_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_group), MP_ROM_PTR(&match_group_obj) }, }; STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table); @@ -167,10 +167,10 @@ STATIC mp_obj_t re_split(mp_uint_t n_args, const mp_obj_t *args) { } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split); -STATIC const mp_map_elem_t re_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_match), (mp_obj_t) &re_match_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_search), (mp_obj_t) &re_search_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t) &re_split_obj }, +STATIC const mp_rom_map_elem_t re_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) }, + { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) }, + { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&re_split_obj) }, }; STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table); @@ -225,12 +225,12 @@ STATIC mp_obj_t mod_re_search(mp_uint_t n_args, const mp_obj_t *args) { } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_search_obj, 2, 4, mod_re_search); -STATIC const mp_map_elem_t mp_module_re_globals_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_ure) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_compile), (mp_obj_t)&mod_re_compile_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_match), (mp_obj_t)&mod_re_match_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_search), (mp_obj_t)&mod_re_search_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG), MP_OBJ_NEW_SMALL_INT(FLAG_DEBUG) }, +STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ure) }, + { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) }, + { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&mod_re_match_obj) }, + { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&mod_re_search_obj) }, + { MP_ROM_QSTR(MP_QSTR_DEBUG), MP_ROM_INT(FLAG_DEBUG) }, }; STATIC MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table); |