summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
Diffstat (limited to 'py')
-rw-r--r--py/modarray.c11
-rw-r--r--py/modcmath.c11
-rw-r--r--py/modcollections.c11
-rw-r--r--py/modgc.c11
-rw-r--r--py/modio.c11
-rw-r--r--py/modmath.c11
-rw-r--r--py/modmicropython.c11
-rw-r--r--py/modstruct.c11
-rw-r--r--py/modsys.c11
-rw-r--r--py/obj.h4
10 files changed, 11 insertions, 92 deletions
diff --git a/py/modarray.c b/py/modarray.c
index c0fe331643..360fe8a5f1 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -37,16 +37,7 @@ STATIC const mp_map_elem_t mp_module_array_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&mp_type_array },
};
-STATIC const mp_obj_dict_t mp_module_array_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_array_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_array_globals_table),
- .table = (mp_map_elem_t*)mp_module_array_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_array_globals, mp_module_array_globals_table);
const mp_obj_module_t mp_module_array = {
.base = { &mp_type_module },
diff --git a/py/modcmath.c b/py/modcmath.c
index a147a754b8..4cd3a82359 100644
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -162,16 +162,7 @@ STATIC const mp_map_elem_t mp_module_cmath_globals_table[] = {
//{ MP_OBJ_NEW_QSTR(MP_QSTR_isnan), (mp_obj_t)&mp_cmath_isnan_obj },
};
-STATIC const mp_obj_dict_t mp_module_cmath_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_cmath_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_cmath_globals_table),
- .table = (mp_map_elem_t*)mp_module_cmath_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_cmath_globals, mp_module_cmath_globals_table);
const mp_obj_module_t mp_module_cmath = {
.base = { &mp_type_module },
diff --git a/py/modcollections.c b/py/modcollections.c
index 5cd0b317a1..8035b72d59 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -37,16 +37,7 @@ STATIC const mp_map_elem_t mp_module_collections_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_namedtuple), (mp_obj_t)&mp_namedtuple_obj },
};
-STATIC const mp_obj_dict_t mp_module_collections_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_collections_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_collections_globals_table),
- .table = (mp_map_elem_t*)mp_module_collections_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_collections_globals, mp_module_collections_globals_table);
const mp_obj_module_t mp_module_collections = {
.base = { &mp_type_module },
diff --git a/py/modgc.c b/py/modgc.c
index a27ef7eed9..8c9be70688 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -100,16 +100,7 @@ STATIC const mp_map_elem_t mp_module_gc_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem_alloc), (mp_obj_t)&gc_mem_alloc_obj },
};
-STATIC const mp_obj_dict_t mp_module_gc_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_gc_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_gc_globals_table),
- .table = (mp_map_elem_t*)mp_module_gc_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_gc_globals, mp_module_gc_globals_table);
const mp_obj_module_t mp_module_gc = {
.base = { &mp_type_module },
diff --git a/py/modio.c b/py/modio.c
index ef3b29b53f..6a273b39b7 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -52,16 +52,7 @@ STATIC const mp_map_elem_t mp_module_io_globals_table[] = {
#endif
};
-STATIC const mp_obj_dict_t mp_module_io_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_io_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_io_globals_table),
- .table = (mp_map_elem_t*)mp_module_io_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_io_globals, mp_module_io_globals_table);
const mp_obj_module_t mp_module_io = {
.base = { &mp_type_module },
diff --git a/py/modmath.c b/py/modmath.c
index 7124820041..0111dc5523 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -221,16 +221,7 @@ STATIC const mp_map_elem_t mp_module_math_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_lgamma), (mp_obj_t)&mp_math_lgamma_obj },
};
-STATIC const mp_obj_dict_t mp_module_math_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_math_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_math_globals_table),
- .table = (mp_map_elem_t*)mp_module_math_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_math_globals, mp_module_math_globals_table);
const mp_obj_module_t mp_module_math = {
.base = { &mp_type_module },
diff --git a/py/modmicropython.c b/py/modmicropython.c
index 87bab0a33e..b23758291d 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -67,16 +67,7 @@ STATIC const mp_map_elem_t mp_module_micropython_globals_table[] = {
#endif
};
-STATIC const mp_obj_dict_t mp_module_micropython_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_micropython_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_micropython_globals_table),
- .table = (mp_map_elem_t*)mp_module_micropython_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_micropython_globals, mp_module_micropython_globals_table);
const mp_obj_module_t mp_module_micropython = {
.base = { &mp_type_module },
diff --git a/py/modstruct.c b/py/modstruct.c
index 8c0cafda07..f29c8c1f96 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -205,16 +205,7 @@ STATIC const mp_map_elem_t mp_module_struct_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_unpack), (mp_obj_t)&struct_unpack_obj },
};
-STATIC const mp_obj_dict_t mp_module_struct_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_struct_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_struct_globals_table),
- .table = (mp_map_elem_t*)mp_module_struct_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table);
const mp_obj_module_t mp_module_struct = {
.base = { &mp_type_module },
diff --git a/py/modsys.c b/py/modsys.c
index 8ef66af052..d9be7d1bc1 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -120,16 +120,7 @@ STATIC const mp_map_elem_t mp_module_sys_globals_table[] = {
#endif
};
-STATIC const mp_obj_dict_t mp_module_sys_globals = {
- .base = {&mp_type_dict},
- .map = {
- .all_keys_are_qstrs = 1,
- .table_is_fixed_array = 1,
- .used = MP_ARRAY_SIZE(mp_module_sys_globals_table),
- .alloc = MP_ARRAY_SIZE(mp_module_sys_globals_table),
- .table = (mp_map_elem_t*)mp_module_sys_globals_table,
- },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_sys_globals, mp_module_sys_globals_table);
const mp_obj_module_t mp_module_sys = {
.base = { &mp_type_module },
diff --git a/py/obj.h b/py/obj.h
index 8a8a1eb211..febff67c29 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -106,8 +106,8 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
.map = { \
.all_keys_are_qstrs = 1, \
.table_is_fixed_array = 1, \
- .used = sizeof(table_name) / sizeof(mp_map_elem_t), \
- .alloc = sizeof(table_name) / sizeof(mp_map_elem_t), \
+ .used = MP_ARRAY_SIZE(table_name), \
+ .alloc = MP_ARRAY_SIZE(table_name), \
.table = (mp_map_elem_t*)table_name, \
}, \
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-31 16:57:35 +0000