Remove mp_obj_type_t.methods entry and use .locals_dict instead.
Originally, .methods was used for methods in a ROM class, and
locals_dict for methods in a user-created class. That distinction is
unnecessary, and we can use locals_dict for ROM classes now that we have
ROMable maps.
This removes an entry in the bloated mp_obj_type_t struct, saving a word
for each ROM object and each RAM object. ROM objects that have a
methods table (now a locals_dict) need an extra word in total (removed
the methods pointer (1 word), no longer need the sentinel (2 words), but
now need an mp_obj_dict_t wrapper (4 words)). But RAM objects save a
word because they never used the methods entry.
Overall the ROM usage is down by a few hundred bytes, and RAM usage is
down 1 word per user-defined type/class.
There is less code (no need to check 2 tables), and now consistent with
the way ROM modules have their tables initialised.
Efficiency is very close to equivaluent.
diff --git a/py/objarray.c b/py/objarray.c
index 9d795c1..eed21d9 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -149,11 +149,12 @@
return 0;
}
-STATIC const mp_method_t array_type_methods[] = {
- { MP_QSTR_append, &array_append_obj },
- { MP_QSTR_NULL, NULL }, // end-of-list sentinel
+STATIC const mp_map_elem_t array_locals_dict_table[] = {
+ { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&array_append_obj },
};
+STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table);
+
const mp_obj_type_t mp_type_array = {
{ &mp_type_type },
.name = MP_QSTR_array,
@@ -163,8 +164,8 @@
.unary_op = array_unary_op,
.binary_op = array_binary_op,
.store_item = array_store_item,
- .methods = array_type_methods,
.buffer_p = { .get_buffer = array_get_buffer },
+ .locals_dict = (mp_obj_t)&array_locals_dict,
};
STATIC mp_obj_array_t *array_new(char typecode, uint n) {