Skip to content

Commit 0318a9a

Browse files
tannewttannewt
committed
More make_new fixes for unix build
1 parent 427766a commit 0318a9a

10 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎extmod/moductypes.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ STATIC NORETURN void syntax_error(void) {
122122
mp_raise_TypeError(translate("syntax error in uctypes descriptor"));
123123
}
124124

125-
STATIC mp_obj_t uctypes_struct_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
126-
mp_arg_check_num(n_args, n_kw, 2, 3, false);
125+
STATIC mp_obj_t uctypes_struct_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
126+
mp_arg_check_num(n_args, kw_args, 2, 3, false);
127127
mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
128128
o->base.type = type;
129129
o->addr = (void*)(uintptr_t)mp_obj_int_get_truncated(args[0]);

‎extmod/modutimeq.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ STATIC bool time_less_than(struct qentry *item, struct qentry *parent) {
7676
return res && res < (MODULO / 2);
7777
}
7878

79-
STATIC mp_obj_t utimeq_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
80-
mp_arg_check_num(n_args, n_kw, 1, 1, false);
79+
STATIC mp_obj_t utimeq_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
80+
mp_arg_check_num(n_args, kw_args, 1, 1, false);
8181
mp_uint_t alloc = mp_obj_get_int(args[0]);
8282
mp_obj_utimeq_t *o = m_new_obj_var(mp_obj_utimeq_t, struct qentry, alloc);
8383
o->base.type = type;

‎extmod/moduzlib.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ STATIC int read_src_stream(TINF_DATA *data) {
6969
return c;
7070
}
7171

72-
STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
73-
mp_arg_check_num(n_args, n_kw, 1, 2, false);
72+
STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
73+
mp_arg_check_num(n_args, kw_args, 1, 2, false);
7474
mp_get_stream_raise(args[0], MP_STREAM_OP_READ);
7575
mp_obj_decompio_t *o = m_new_obj(mp_obj_decompio_t);
7676
o->base.type = type;

‎extmod/modwebsocket.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ typedef struct _mp_obj_websocket_t {
5757

5858
STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode);
5959

60-
STATIC mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
61-
mp_arg_check_num(n_args, n_kw, 1, 2, false);
60+
STATIC mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
61+
mp_arg_check_num(n_args, kw_args, 1, 2, false);
6262
mp_get_stream_raise(args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
6363
mp_obj_websocket_t *o = m_new_obj(mp_obj_websocket_t);
6464
o->base.type = type;

‎ports/unix/file.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ STATIC mp_obj_t fdfile_open(const mp_obj_type_t *type, mp_arg_val_t *args) {
205205
return MP_OBJ_FROM_PTR(o);
206206
}
207207

208-
STATIC mp_obj_t fdfile_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
208+
STATIC mp_obj_t fdfile_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
209209
mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
210-
mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
210+
mp_arg_parse_all(n_args, args, kw_args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
211211
return fdfile_open(type, arg_vals);
212212
}
213213

‎ports/unix/modffi.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,9 @@ STATIC mp_obj_t ffimod_addr(mp_obj_t self_in, mp_obj_t symname_in) {
304304
}
305305
MP_DEFINE_CONST_FUN_OBJ_2(ffimod_addr_obj, ffimod_addr);
306306

307-
STATIC mp_obj_t ffimod_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
307+
STATIC mp_obj_t ffimod_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
308308
(void)n_args;
309-
(void)n_kw;
309+
(void)kw_args;
310310

311311
const char *fname = NULL;
312312
if (args[0] != mp_const_none) {
@@ -481,7 +481,7 @@ STATIC const mp_obj_type_t opaque_type = {
481481
*/
482482

483483
STATIC mp_obj_t mod_ffi_open(size_t n_args, const mp_obj_t *args) {
484-
return ffimod_make_new(&ffimod_type, n_args, 0, args);
484+
return ffimod_make_new(&ffimod_type, n_args, args, NULL);
485485
}
486486
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_ffi_open_obj, 1, 2, mod_ffi_open);
487487

‎ports/unix/modusocket.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
325325
}
326326
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
327327

328-
STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
328+
STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
329329
(void)type_in;
330-
(void)n_kw;
330+
(void)kw_args;
331331

332332
int family = AF_INET;
333333
int type = SOCK_STREAM;

‎py/modio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ STATIC const mp_obj_type_t mp_type_iobase;
4646

4747
STATIC mp_obj_base_t iobase_singleton = {&mp_type_iobase};
4848

49-
STATIC mp_obj_t iobase_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
49+
STATIC mp_obj_t iobase_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
5050
(void)type;
5151
(void)n_args;
52-
(void)n_kw;
5352
(void)args;
53+
(void)kw_args;
5454
return MP_OBJ_FROM_PTR(&iobase_singleton);
5555
}
5656

‎py/objdeque.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ typedef struct _mp_obj_deque_t {
4444
#define FLAG_CHECK_OVERFLOW 1
4545
} mp_obj_deque_t;
4646

47-
STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
48-
mp_arg_check_num(n_args, n_kw, 2, 3, false);
47+
STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
48+
mp_arg_check_num(n_args, kw_args, 2, 3, false);
4949

5050
/* Initialization from existing sequence is not supported, so an empty
5151
tuple must be passed as such. */

‎py/objfun.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ typedef mp_uint_t (*viper_fun_4_t)(mp_uint_t, mp_uint_t, mp_uint_t, mp_uint_t);
436436
STATIC mp_obj_t fun_viper_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
437437
mp_obj_fun_viper_t *self = self_in;
438438

439-
mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
439+
mp_arg_check_num_kw_array(n_args, n_kw, self->n_args, self->n_args, false);
440440

441441
void *fun = MICROPY_MAKE_POINTER_CALLABLE(self->fun_data);
442442

0 commit comments

Comments
 (0)