Skip to content

Commit 4ebdb1f

Browse files
dpgeorgedpgeorge
committed
py: Be more specific with MP_DECLARE_CONST_FUN_OBJ macros.
In order to have more fine-grained control over how builtin functions are constructed, the MP_DECLARE_CONST_FUN_OBJ macros are made more specific, with suffix of _0, _1, _2, _3, _VAR, _VAR_BETEEN or _KW. These names now match the MP_DEFINE_CONST_FUN_OBJ macros.
1 parent 5d0735b commit 4ebdb1f

31 files changed

Lines changed: 151 additions & 153 deletions

‎bare-arm/mpconfigport.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ typedef long mp_off_t;
6161
#define MP_PLAT_PRINT_STRN(str, len) (void)0
6262

6363
// extra built in names to add to the global namespace
64-
extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj;
6564
#define MICROPY_PORT_BUILTINS \
6665
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
6766

‎cc3200/util/random.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
void rng_init0 (void);
3131
uint32_t rng_get (void);
3232

33-
MP_DECLARE_CONST_FUN_OBJ(machine_rng_get_obj);
33+
MP_DECLARE_CONST_FUN_OBJ_0(machine_rng_get_obj);
3434

3535
#endif // __RANDOM_H

‎drivers/dht/dht.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "py/obj.h"
22

3-
MP_DECLARE_CONST_FUN_OBJ(dht_readinto_obj);
3+
MP_DECLARE_CONST_FUN_OBJ_2(dht_readinto_obj);

‎esp8266/modpyb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern const mp_obj_type_t pyb_spi_type;
1313
extern const mp_obj_type_t pyb_hspi_type;
1414
extern const mp_obj_type_t machine_spi_type;
1515

16-
MP_DECLARE_CONST_FUN_OBJ(pyb_info_obj);
16+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj);
1717

1818
typedef struct _pyb_pin_obj_t {
1919
mp_obj_base_t base;

‎extmod/fsusermount.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ typedef struct _fs_user_mount_t {
5757
fs_user_mount_t *fatfs_mount_mkfs(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, bool mkfs);
5858
mp_obj_t fatfs_umount(mp_obj_t bdev_or_path_in);
5959

60-
MP_DECLARE_CONST_FUN_OBJ(fsuser_mount_obj);
61-
MP_DECLARE_CONST_FUN_OBJ(fsuser_umount_obj);
62-
MP_DECLARE_CONST_FUN_OBJ(fsuser_mkfs_obj);
60+
MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mount_obj);
61+
MP_DECLARE_CONST_FUN_OBJ_1(fsuser_umount_obj);
62+
MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mkfs_obj);

‎extmod/machine_pulse.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232

3333
mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
3434

35-
MP_DECLARE_CONST_FUN_OBJ(machine_time_pulse_us_obj);
35+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
3636

3737
#endif // __MICROPY_INCLUDED_EXTMOD_MACHINE_PULSE_H__

‎extmod/machine_spi.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ typedef struct _mp_machine_soft_spi_obj_t {
4747

4848
void mp_machine_soft_spi_transfer(mp_obj_base_t *self, size_t len, const uint8_t *src, uint8_t *dest);
4949

50-
MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_read_obj);
51-
MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_readinto_obj);
52-
MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_write_obj);
53-
MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_write_readinto_obj);
50+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);
51+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj);
52+
MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
53+
MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
5454

5555
#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H

‎extmod/misc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <stddef.h>
3131
#include "py/runtime.h"
3232

33-
MP_DECLARE_CONST_FUN_OBJ(mp_uos_dupterm_obj);
33+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj);
3434

3535
#if MICROPY_PY_OS_DUPTERM
3636
void mp_uos_dupterm_tx_strn(const char *str, size_t len);

‎extmod/modubinascii.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ extern mp_obj_t mod_binascii_a2b_base64(mp_obj_t data);
3333
extern mp_obj_t mod_binascii_b2a_base64(mp_obj_t data);
3434
extern mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args);
3535

36-
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_hexlify_obj);
37-
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_unhexlify_obj);
38-
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_a2b_base64_obj);
39-
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_b2a_base64_obj);
40-
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_crc32_obj);
36+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_hexlify_obj);
37+
MP_DECLARE_CONST_FUN_OBJ_1(mod_binascii_unhexlify_obj);
38+
MP_DECLARE_CONST_FUN_OBJ_1(mod_binascii_a2b_base64_obj);
39+
MP_DECLARE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj);
40+
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj);
4141

4242
#endif /* MICROPY_EXTMOD_MODUBINASCII */

‎extmod/utime_mphal.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
#include "py/obj.h"
2929

30-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_sleep_obj);
31-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_sleep_ms_obj);
32-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_sleep_us_obj);
33-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_ms_obj);
34-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_us_obj);
35-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_cpu_obj);
36-
MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_diff_obj);
30+
MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_obj);
31+
MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj);
32+
MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj);
33+
MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj);
34+
MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj);
35+
MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_cpu_obj);
36+
MP_DECLARE_CONST_FUN_OBJ_2(mp_utime_ticks_diff_obj);

0 commit comments

Comments
 (0)