all: Reformat C and Python source code with tools/codeformat.py.
This is run with uncrustify 0.70.1, and black 19.10b0.
This commit is contained in:
Damien George
120
py/objmodule.c
120
py/objmodule.c
@@ -45,7 +45,7 @@ STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
|
||||
module_name = mp_obj_str_get_str(elem->value);
|
||||
}
|
||||
|
||||
#if MICROPY_PY___FILE__
|
||||
#if MICROPY_PY___FILE__
|
||||
// If we store __file__ to imported modules then try to lookup this
|
||||
// symbol to give more information about the module.
|
||||
elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___file__), MP_MAP_LOOKUP);
|
||||
@@ -53,7 +53,7 @@ STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
|
||||
mp_printf(print, "<module '%s' from '%s'>", module_name, mp_obj_str_get_str(elem->value));
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
mp_printf(print, "<module '%s'>", module_name);
|
||||
}
|
||||
@@ -140,93 +140,93 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
|
||||
|
||||
#if MICROPY_PY_IO
|
||||
#if MICROPY_PY_IO
|
||||
{ MP_ROM_QSTR(MP_QSTR_uio), MP_ROM_PTR(&mp_module_io) },
|
||||
#endif
|
||||
#if MICROPY_PY_COLLECTIONS
|
||||
#endif
|
||||
#if MICROPY_PY_COLLECTIONS
|
||||
{ MP_ROM_QSTR(MP_QSTR_ucollections), MP_ROM_PTR(&mp_module_collections) },
|
||||
#endif
|
||||
#if MICROPY_PY_STRUCT
|
||||
#endif
|
||||
#if MICROPY_PY_STRUCT
|
||||
{ MP_ROM_QSTR(MP_QSTR_ustruct), MP_ROM_PTR(&mp_module_ustruct) },
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_MATH
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_MATH
|
||||
{ MP_ROM_QSTR(MP_QSTR_math), MP_ROM_PTR(&mp_module_math) },
|
||||
#endif
|
||||
#if MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
|
||||
#endif
|
||||
#if MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
|
||||
{ MP_ROM_QSTR(MP_QSTR_cmath), MP_ROM_PTR(&mp_module_cmath) },
|
||||
#endif
|
||||
#endif
|
||||
#if MICROPY_PY_SYS
|
||||
#endif
|
||||
#endif
|
||||
#if MICROPY_PY_SYS
|
||||
{ MP_ROM_QSTR(MP_QSTR_sys), MP_ROM_PTR(&mp_module_sys) },
|
||||
#endif
|
||||
#if MICROPY_PY_GC && MICROPY_ENABLE_GC
|
||||
#endif
|
||||
#if MICROPY_PY_GC && MICROPY_ENABLE_GC
|
||||
{ MP_ROM_QSTR(MP_QSTR_gc), MP_ROM_PTR(&mp_module_gc) },
|
||||
#endif
|
||||
#if MICROPY_PY_THREAD
|
||||
#endif
|
||||
#if MICROPY_PY_THREAD
|
||||
{ MP_ROM_QSTR(MP_QSTR__thread), MP_ROM_PTR(&mp_module_thread) },
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// extmod modules
|
||||
|
||||
#if MICROPY_PY_UERRNO
|
||||
#if MICROPY_PY_UERRNO
|
||||
{ MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
|
||||
#endif
|
||||
#if MICROPY_PY_UCTYPES
|
||||
#endif
|
||||
#if MICROPY_PY_UCTYPES
|
||||
{ MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
|
||||
#endif
|
||||
#if MICROPY_PY_UZLIB
|
||||
#endif
|
||||
#if MICROPY_PY_UZLIB
|
||||
{ MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) },
|
||||
#endif
|
||||
#if MICROPY_PY_UJSON
|
||||
#endif
|
||||
#if MICROPY_PY_UJSON
|
||||
{ MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
|
||||
#endif
|
||||
#if MICROPY_PY_URE
|
||||
#endif
|
||||
#if MICROPY_PY_URE
|
||||
{ MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
|
||||
#endif
|
||||
#if MICROPY_PY_UHEAPQ
|
||||
#endif
|
||||
#if MICROPY_PY_UHEAPQ
|
||||
{ MP_ROM_QSTR(MP_QSTR_uheapq), MP_ROM_PTR(&mp_module_uheapq) },
|
||||
#endif
|
||||
#if MICROPY_PY_UTIMEQ
|
||||
#endif
|
||||
#if MICROPY_PY_UTIMEQ
|
||||
{ MP_ROM_QSTR(MP_QSTR_utimeq), MP_ROM_PTR(&mp_module_utimeq) },
|
||||
#endif
|
||||
#if MICROPY_PY_UHASHLIB
|
||||
#endif
|
||||
#if MICROPY_PY_UHASHLIB
|
||||
{ MP_ROM_QSTR(MP_QSTR_uhashlib), MP_ROM_PTR(&mp_module_uhashlib) },
|
||||
#endif
|
||||
#if MICROPY_PY_UCRYPTOLIB
|
||||
#endif
|
||||
#if MICROPY_PY_UCRYPTOLIB
|
||||
{ MP_ROM_QSTR(MP_QSTR_ucryptolib), MP_ROM_PTR(&mp_module_ucryptolib) },
|
||||
#endif
|
||||
#if MICROPY_PY_UBINASCII
|
||||
#endif
|
||||
#if MICROPY_PY_UBINASCII
|
||||
{ MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) },
|
||||
#endif
|
||||
#if MICROPY_PY_URANDOM
|
||||
#endif
|
||||
#if MICROPY_PY_URANDOM
|
||||
{ MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_module_urandom) },
|
||||
#endif
|
||||
#if MICROPY_PY_USELECT
|
||||
#endif
|
||||
#if MICROPY_PY_USELECT
|
||||
{ MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
|
||||
#endif
|
||||
#if MICROPY_PY_USSL
|
||||
#endif
|
||||
#if MICROPY_PY_USSL
|
||||
{ MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) },
|
||||
#endif
|
||||
#if MICROPY_PY_LWIP
|
||||
#endif
|
||||
#if MICROPY_PY_LWIP
|
||||
{ MP_ROM_QSTR(MP_QSTR_lwip), MP_ROM_PTR(&mp_module_lwip) },
|
||||
#endif
|
||||
#if MICROPY_PY_UWEBSOCKET
|
||||
#endif
|
||||
#if MICROPY_PY_UWEBSOCKET
|
||||
{ MP_ROM_QSTR(MP_QSTR_uwebsocket), MP_ROM_PTR(&mp_module_uwebsocket) },
|
||||
#endif
|
||||
#if MICROPY_PY_WEBREPL
|
||||
#endif
|
||||
#if MICROPY_PY_WEBREPL
|
||||
{ MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&mp_module_webrepl) },
|
||||
#endif
|
||||
#if MICROPY_PY_FRAMEBUF
|
||||
#endif
|
||||
#if MICROPY_PY_FRAMEBUF
|
||||
{ MP_ROM_QSTR(MP_QSTR_framebuf), MP_ROM_PTR(&mp_module_framebuf) },
|
||||
#endif
|
||||
#if MICROPY_PY_BTREE
|
||||
#endif
|
||||
#if MICROPY_PY_BTREE
|
||||
{ MP_ROM_QSTR(MP_QSTR_btree), MP_ROM_PTR(&mp_module_btree) },
|
||||
#endif
|
||||
#if MICROPY_PY_BLUETOOTH
|
||||
#endif
|
||||
#if MICROPY_PY_BLUETOOTH
|
||||
{ MP_ROM_QSTR(MP_QSTR_ubluetooth), MP_ROM_PTR(&mp_module_ubluetooth) },
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// extra builtin modules as defined by a port
|
||||
MICROPY_PORT_BUILTIN_MODULES
|
||||
@@ -247,7 +247,7 @@ mp_obj_t mp_module_get(qstr module_name) {
|
||||
|
||||
if (el == NULL) {
|
||||
// module not found, look for builtin module names
|
||||
el = mp_map_lookup((mp_map_t*)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
el = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
if (el == NULL) {
|
||||
return MP_OBJ_NULL;
|
||||
}
|
||||
@@ -267,7 +267,7 @@ void mp_module_register(qstr qst, mp_obj_t module) {
|
||||
// Search for u"foo" in built-in modules, return MP_OBJ_NULL if not found
|
||||
mp_obj_t mp_module_search_umodule(const char *module_str) {
|
||||
for (size_t i = 0; i < MP_ARRAY_SIZE(mp_builtin_module_table); ++i) {
|
||||
const mp_map_elem_t *entry = (const mp_map_elem_t*)&mp_builtin_module_table[i];
|
||||
const mp_map_elem_t *entry = (const mp_map_elem_t *)&mp_builtin_module_table[i];
|
||||
const char *key = qstr_str(MP_OBJ_QSTR_VALUE(entry->key));
|
||||
if (key[0] == 'u' && strcmp(&key[1], module_str) == 0) {
|
||||
return (mp_obj_t)entry->value;
|
||||
|
||||
Reference in New Issue
Block a user