From 3b603f29ec093b77b6fad72d77becd5375310637 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 29 Nov 2014 14:39:27 +0000
Subject: Use MP_DEFINE_CONST_DICT macro to define module dicts.

This is just a clean-up of the code.  Generated code is exactly the
same.
---
 unix/modffi.c     | 11 +----------
 unix/modos.c      | 11 +----------
 unix/modsocket.c  | 11 +----------
 unix/modtermios.c | 11 +----------
 unix/modtime.c    | 11 +----------
 5 files changed, 5 insertions(+), 50 deletions(-)

(limited to 'unix')

diff --git a/unix/modffi.c b/unix/modffi.c
index 03b76e643..331219a14 100644
--- a/unix/modffi.c
+++ b/unix/modffi.c
@@ -433,16 +433,7 @@ STATIC const mp_map_elem_t mp_module_ffi_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_as_bytearray), (mp_obj_t)&mod_ffi_as_bytearray_obj },
 };
 
-STATIC const mp_obj_dict_t mp_module_ffi_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_ffi_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_ffi_globals_table),
-        .table = (mp_map_elem_t*)mp_module_ffi_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_ffi_globals, mp_module_ffi_globals_table);
 
 const mp_obj_module_t mp_module_ffi = {
     .base = { &mp_type_module },
diff --git a/unix/modos.c b/unix/modos.c
index 90998bcff..712c528b4 100644
--- a/unix/modos.c
+++ b/unix/modos.c
@@ -70,16 +70,7 @@ STATIC const mp_map_elem_t mp_module_os_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_stat), (mp_obj_t)&mod_os_stat_obj },
 };
 
-STATIC const mp_obj_dict_t mp_module_os_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_os_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_os_globals_table),
-        .table = (mp_map_elem_t*)mp_module_os_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_os_globals, mp_module_os_globals_table);
 
 const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
diff --git a/unix/modsocket.c b/unix/modsocket.c
index 82d833653..749e58328 100644
--- a/unix/modsocket.c
+++ b/unix/modsocket.c
@@ -453,16 +453,7 @@ STATIC const mp_map_elem_t mp_module_socket_globals_table[] = {
 #undef C
 };
 
-STATIC const mp_obj_dict_t mp_module_socket_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_socket_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_socket_globals_table),
-        .table = (mp_map_elem_t*)mp_module_socket_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
 const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
diff --git a/unix/modtermios.c b/unix/modtermios.c
index f9884da90..0fa0e1394 100644
--- a/unix/modtermios.c
+++ b/unix/modtermios.c
@@ -137,16 +137,7 @@ STATIC const mp_map_elem_t mp_module_termios_globals_table[] = {
 #undef C
 };
 
-STATIC const mp_obj_dict_t mp_module_termios_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_termios_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_termios_globals_table),
-        .table = (mp_map_elem_t*)mp_module_termios_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_termios_globals, mp_module_termios_globals_table);
 
 const mp_obj_module_t mp_module_termios = {
     .base = { &mp_type_module },
diff --git a/unix/modtime.c b/unix/modtime.c
index 15352735c..84f041fed 100644
--- a/unix/modtime.c
+++ b/unix/modtime.c
@@ -108,16 +108,7 @@ STATIC const mp_map_elem_t mp_module_time_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mod_time_time_obj },
 };
 
-STATIC const mp_obj_dict_t mp_module_time_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_time_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_time_globals_table),
-        .table = (mp_map_elem_t*)mp_module_time_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
 
 const mp_obj_module_t mp_module_time = {
     .base = { &mp_type_module },
-- 
cgit v1.2.3