Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
3b603f29
Commit
3b603f29
authored
Nov 29, 2014
by
Damien George
Browse files
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.
parent
e636279f
Changes
32
Hide whitespace changes
Inline
Side-by-side
esp8266/modpyb.c
View file @
3b603f29
...
...
@@ -155,16 +155,7 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_sync
),
(
mp_obj_t
)
&
pyb_sync_obj
},
};
STATIC
const
mp_obj_dict_t
pyb_module_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
pyb_module_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
pyb_module_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
pyb_module_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
pyb_module_globals
,
pyb_module_globals_table
);
const
mp_obj_module_t
pyb_module
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/modubinascii.c
View file @
3b603f29
...
...
@@ -68,16 +68,7 @@ STATIC const mp_map_elem_t mp_module_binascii_globals_table[] = {
// { MP_OBJ_NEW_QSTR(MP_QSTR_b2a_base64), (mp_obj_t)&mod_binascii_b2a_base64_obj },
};
STATIC
const
mp_obj_dict_t
mp_module_binascii_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_binascii_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_binascii_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_binascii_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_binascii_globals
,
mp_module_binascii_globals_table
);
const
mp_obj_module_t
mp_module_ubinascii
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/moductypes.c
View file @
3b603f29
...
...
@@ -649,16 +649,7 @@ STATIC const mp_map_elem_t mp_module_uctypes_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_ARRAY
),
MP_OBJ_NEW_SMALL_INT
(
TYPE2SMALLINT
(
ARRAY
,
AGG_TYPE_BITS
))
},
};
STATIC
const
mp_obj_dict_t
mp_module_uctypes_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_uctypes_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_uctypes_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_uctypes_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_uctypes_globals
,
mp_module_uctypes_globals_table
);
const
mp_obj_module_t
mp_module_uctypes
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/moduhashlib.c
View file @
3b603f29
...
...
@@ -105,16 +105,7 @@ STATIC const mp_map_elem_t mp_module_hashlib_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_sha256
),
(
mp_obj_t
)
&
sha256_type
},
};
STATIC
const
mp_obj_dict_t
mp_module_hashlib_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_hashlib_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_hashlib_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_hashlib_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_hashlib_globals
,
mp_module_hashlib_globals_table
);
const
mp_obj_module_t
mp_module_uhashlib
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/moduheapq.c
View file @
3b603f29
...
...
@@ -118,16 +118,7 @@ STATIC const mp_map_elem_t mp_module_uheapq_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_heapify
),
(
mp_obj_t
)
&
mod_uheapq_heapify_obj
},
};
STATIC
const
mp_obj_dict_t
mp_module_uheapq_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_uheapq_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_uheapq_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_uheapq_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_uheapq_globals
,
mp_module_uheapq_globals_table
);
const
mp_obj_module_t
mp_module_uheapq
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/modujson.c
View file @
3b603f29
...
...
@@ -259,16 +259,7 @@ STATIC const mp_map_elem_t mp_module_ujson_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_loads
),
(
mp_obj_t
)
&
mod_ujson_loads_obj
},
};
STATIC
const
mp_obj_dict_t
mp_module_ujson_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_ujson_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_ujson_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_ujson_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_ujson_globals
,
mp_module_ujson_globals_table
);
const
mp_obj_module_t
mp_module_ujson
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/modure.c
View file @
3b603f29
...
...
@@ -221,16 +221,7 @@ STATIC const mp_map_elem_t mp_module_re_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_DEBUG
),
MP_OBJ_NEW_SMALL_INT
(
FLAG_DEBUG
)
},
};
STATIC
const
mp_obj_dict_t
mp_module_re_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_re_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_re_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_re_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_re_globals
,
mp_module_re_globals_table
);
const
mp_obj_module_t
mp_module_ure
=
{
.
base
=
{
&
mp_type_module
},
...
...
extmod/moduzlib.c
View file @
3b603f29
...
...
@@ -87,16 +87,7 @@ STATIC const mp_map_elem_t mp_module_uzlib_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_decompress
),
(
mp_obj_t
)
&
mod_uzlib_decompress_obj
},
};
STATIC
const
mp_obj_dict_t
mp_module_uzlib_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_uzlib_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_uzlib_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_uzlib_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_uzlib_globals
,
mp_module_uzlib_globals_table
);
const
mp_obj_module_t
mp_module_uzlib
=
{
.
base
=
{
&
mp_type_module
},
...
...
py/modarray.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modcmath.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modcollections.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modgc.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modio.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modmath.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modmicropython.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modstruct.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/modsys.c
View file @
3b603f29
...
...
@@ -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
},
...
...
py/obj.h
View file @
3b603f29
...
...
@@ -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, \
}, \
}
...
...
stmhal/make-stmconst.py
View file @
3b603f29
...
...
@@ -145,23 +145,14 @@ STATIC const mp_map_elem_t stm_%s_globals_table[] = {
print
(
"""};
STATIC const mp_obj_dict_t stm_%s_globals = {
.base = {&mp_type_dict},
.map = {
.all_keys_are_qstrs = 1,
.table_is_fixed_array = 1,
.used = sizeof(stm_%s_globals_table) / sizeof(mp_map_elem_t),
.alloc = sizeof(stm_%s_globals_table) / sizeof(mp_map_elem_t),
.table = (mp_map_elem_t*)stm_%s_globals_table,
},
};
STATIC MP_DEFINE_CONST_DICT(stm_%s_globals, stm_%s_globals_table);
const mp_obj_module_t stm_%s_obj = {
.base = { &mp_type_module },
.name = MP_QSTR_%s,
.globals = (mp_obj_dict_t*)&stm_%s_globals,
};
"""
%
(
mod_name_lower
,
mod_name_lower
,
mod_name_lower
,
mod_name_lower
,
mod_name_lower
,
mod_name_upper
,
mod_name_lower
))
"""
%
(
mod_name_lower
,
mod_name_lower
,
mod_name_lower
,
mod_name_upper
,
mod_name_lower
))
def
main
():
cmd_parser
=
argparse
.
ArgumentParser
(
description
=
'Extract ST constants from a C header file.'
)
...
...
stmhal/modnetwork.c
View file @
3b603f29
...
...
@@ -79,16 +79,7 @@ STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_route
),
(
mp_obj_t
)
&
network_route_obj
},
};
STATIC
const
mp_obj_dict_t
mp_module_network_globals
=
{
.
base
=
{
&
mp_type_dict
},
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
MP_ARRAY_SIZE
(
mp_module_network_globals_table
),
.
alloc
=
MP_ARRAY_SIZE
(
mp_module_network_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_network_globals_table
,
},
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_network_globals
,
mp_module_network_globals_table
);
const
mp_obj_module_t
mp_module_network
=
{
.
base
=
{
&
mp_type_module
},
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment