all: Make all mp_obj_type_t defs use MP_DEFINE_CONST_OBJ_TYPE.

In preparation for upcoming rework of mp_obj_type_t layout.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

1 files changed, 32 insertions, 26 deletions

diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 6fa00731f..72f95b645 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -174,14 +174,16 @@ STATIC const mp_rom_map_elem_t jclass_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(jclass_locals_dict, jclass_locals_dict_table);
 
-STATIC const mp_obj_type_t jclass_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_jclass,
-    .print = jclass_print,
-    .attr = jclass_attr,
-    .call = jclass_call,
-    .locals_dict = (mp_obj_dict_t *)&jclass_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    jclass_type,
+    MP_QSTR_jclass,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, jclass_print,
+    attr, jclass_attr,
+    call, jclass_call,
+    locals_dict, (mp_obj_dict_t *)&jclass_locals_dict
+    );
 
 STATIC mp_obj_t new_jclass(jclass jc) {
     mp_obj_jclass_t *o = mp_obj_malloc(mp_obj_jclass_t, &jclass_type);
@@ -320,16 +322,18 @@ STATIC mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     return mp_obj_new_getitem_iter(dest, iter_buf);
 }
 
-STATIC const mp_obj_type_t jobject_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_jobject,
-    .print = jobject_print,
-    .unary_op = jobject_unary_op,
-    .attr = jobject_attr,
-    .subscr = jobject_subscr,
-    .getiter = subscr_getiter,
-//    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    jobject_type,
+    MP_QSTR_jobject,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, jobject_print,
+    unary_op, jobject_unary_op,
+    attr, jobject_attr,
+    subscr, jobject_subscr,
+    getiter, subscr_getiter,
+    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    );
 
 STATIC mp_obj_t new_jobject(jobject jo) {
     if (jo == NULL) {
@@ -567,14 +571,16 @@ STATIC mp_obj_t jmethod_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     return call_method(self->obj, name, methods, false, n_args, args);
 }
 
-STATIC const mp_obj_type_t jmethod_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_jmethod,
-    .print = jmethod_print,
-    .call = jmethod_call,
-//    .attr = jobject_attr,
-//    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    jmethod_type,
+    MP_QSTR_jmethod,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, jmethod_print,
+    call, jmethod_call,
+    //    .attr = jobject_attr,
+    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    );
 
 #ifdef __ANDROID__
 #define LIBJVM_SO "libdvm.so"