@@ -204,6 +204,7 @@ STATIC void instance_print(void (*print)(void *env, const char *fmt, ...), void
204
204
.attr = meth ,
205
205
.meth_offset = offsetof(mp_obj_type_t , print ),
206
206
.dest = member ,
207
+ .is_type = false,
207
208
};
208
209
mp_obj_class_lookup (& lookup , self -> base .type );
209
210
if (member [0 ] == MP_OBJ_NULL && kind == PRINT_STR ) {
@@ -261,6 +262,7 @@ mp_obj_t instance_make_new(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, c
261
262
.attr = MP_QSTR___new__ ,
262
263
.meth_offset = offsetof(mp_obj_type_t , make_new ),
263
264
.dest = init_fn ,
265
+ .is_type = false,
264
266
};
265
267
mp_obj_class_lookup (& lookup , self );
266
268
@@ -341,6 +343,7 @@ STATIC mp_obj_t instance_unary_op(mp_uint_t op, mp_obj_t self_in) {
341
343
.attr = op_name ,
342
344
.meth_offset = offsetof(mp_obj_type_t , unary_op ),
343
345
.dest = member ,
346
+ .is_type = false,
344
347
};
345
348
mp_obj_class_lookup (& lookup , self -> base .type );
346
349
if (member [0 ] == MP_OBJ_SENTINEL ) {
@@ -437,6 +440,7 @@ STATIC mp_obj_t instance_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
437
440
.attr = op_name ,
438
441
.meth_offset = offsetof(mp_obj_type_t , binary_op ),
439
442
.dest = dest ,
443
+ .is_type = false,
440
444
};
441
445
mp_obj_class_lookup (& lookup , lhs -> base .type );
442
446
if (dest [0 ] == MP_OBJ_SENTINEL ) {
@@ -467,6 +471,7 @@ STATIC void instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
467
471
.attr = attr ,
468
472
.meth_offset = 0 ,
469
473
.dest = dest ,
474
+ .is_type = false,
470
475
};
471
476
mp_obj_class_lookup (& lookup , self -> base .type );
472
477
mp_obj_t member = dest [0 ];
@@ -514,6 +519,7 @@ STATIC bool instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
514
519
.attr = attr ,
515
520
.meth_offset = 0 ,
516
521
.dest = member ,
522
+ .is_type = false,
517
523
};
518
524
mp_obj_class_lookup (& lookup , self -> base .type );
519
525
if (member [0 ] != MP_OBJ_NULL && MP_OBJ_IS_TYPE (member [0 ], & mp_type_property )) {
@@ -549,6 +555,7 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
549
555
.obj = self ,
550
556
.meth_offset = offsetof(mp_obj_type_t , subscr ),
551
557
.dest = member ,
558
+ .is_type = false,
552
559
};
553
560
uint meth_args ;
554
561
if (value == MP_OBJ_NULL ) {
@@ -591,6 +598,7 @@ bool mp_obj_instance_is_callable(mp_obj_t self_in) {
591
598
.attr = MP_QSTR___call__ ,
592
599
.meth_offset = offsetof(mp_obj_type_t , call ),
593
600
.dest = member ,
601
+ .is_type = false,
594
602
};
595
603
mp_obj_class_lookup (& lookup , self -> base .type );
596
604
return member [0 ] != MP_OBJ_NULL ;
@@ -604,6 +612,7 @@ mp_obj_t mp_obj_instance_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw
604
612
.attr = MP_QSTR___call__ ,
605
613
.meth_offset = offsetof(mp_obj_type_t , call ),
606
614
.dest = member ,
615
+ .is_type = false,
607
616
};
608
617
mp_obj_class_lookup (& lookup , self -> base .type );
609
618
if (member [0 ] == MP_OBJ_NULL ) {
@@ -624,6 +633,7 @@ STATIC mp_obj_t instance_getiter(mp_obj_t self_in) {
624
633
.attr = MP_QSTR___iter__ ,
625
634
.meth_offset = offsetof(mp_obj_type_t , getiter ),
626
635
.dest = member ,
636
+ .is_type = false,
627
637
};
628
638
mp_obj_class_lookup (& lookup , self -> base .type );
629
639
if (member [0 ] == MP_OBJ_NULL ) {
@@ -863,6 +873,7 @@ STATIC void super_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
863
873
.attr = attr ,
864
874
.meth_offset = 0 ,
865
875
.dest = dest ,
876
+ .is_type = false,
866
877
};
867
878
for (uint i = 0 ; i < len ; i ++ ) {
868
879
assert (MP_OBJ_IS_TYPE (items [i ], & mp_type_type ));
0 commit comments