8000 top: Standardise mp_obj_type_t initialisation. · jimmo/micropython@b1ddddc · GitHub
[go: up one dir, main page]
Skip to content

Commit b1ddddc

Browse files
jimmojimmo
committed
top: Standardise mp_obj_type_t initialisation.
Remove setting unused slots. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
1 parent 47f8eb8 commit b1ddddc

File tree

4 files changed

+0
-60
lines changed

4 files changed

+0
-60
lines changed

‎extmod/vfs_fat.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,6 @@ const mp_obj_type_t mp_fat_vfs_type = {
437437
.make_new = fat_vfs_make_new,
438438
.protocol = &fat_vfs_proto,
439439
.locals_dict = (mp_obj_dict_t *)&fat_vfs_locals_dict,
440-
441440
};
442441

443442
#endif // MICROPY_VFS_FAT

‎ports/nrf/boards/microbit/modules/iters.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,8 @@ static mp_obj_t microbit_repeat_iter_next(mp_obj_t iter_in) {
4646
const mp_obj_type_t microbit_repeat_iterator_type = {
4747
{ &mp_type_type },
4848
.name = MP_QSTR_iterator,
49-
.print = NULL,
50-
.make_new = NULL,
51-
.call = NULL,
52-
.unary_op = NULL,
53-
.binary_op = NULL,
54-
.attr = NULL,
55-
.subscr = NULL,
5649
.getiter = mp_identity_getiter,
5750
.iternext = microbit_repeat_iter_next,
58-
MP_OBJ_NULL
5951
};
6052

6153
mp_obj_t microbit_repeat_iterator(mp_obj_t iterable) {

‎ports/nrf/boards/microbit/modules/microbitdisplay.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -545,15 +545,6 @@ STATIC MP_DEFINE_CONST_DICT(microbit_display_locals_dict, microbit_display_local
545545
const mp_obj_type_t microbit_display_type = {
546546
{ &mp_type_type },
547547
.name = MP_QSTR_MicroBitDisplay,
548-
.print = NULL,
549-
.make_new = NULL,
550-
.call = NULL,
551-
.unary_op = NULL,
552-
.binary_op = NULL,
553-
.attr = NULL,
554-
.subscr = NULL,
555-
.getiter = NULL,
556-
.iternext = NULL,
557548
.locals_dict = (mp_obj_dict_t*)&microbit_display_locals_dict,
558549
};
559550

‎ports/nrf/boards/microbit/modules/microbitimage.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -683,13 +683,7 @@ const mp_obj_type_t microbit_image_type = {
683683
.name = MP_QSTR_MicroBitImage,
684684
.print = microbit_image_print,
685685
.make_new = microbit_image_make_new,
686-
.call = NULL,
687-
.unary_op = NULL,
688686
.binary_op = image_binary_op,
689-
.attr = NULL,
690-
.subscr = NULL,
691-
.getiter = NULL,
692-
.iternext = NULL,
693687
.locals_dict = (mp_obj_dict_t*)&microbit_image_locals_dict,
694688
};
695689

@@ -829,33 +823,14 @@ STATIC mp_obj_t microbit_scrolling_string_iter_next(mp_obj_t o_in) {
829823
const mp_obj_type_t microbit_scrolling_string_type = {
830824
{ &mp_type_type },
831825
.name = MP_QSTR_ScrollingString,
832-
.print = NULL,
833-
.make_new = NULL,
834-
.call = NULL,
835-
.unary_op = NULL,
836-
.binary_op = NULL,
837-
.attr = NULL,
838-
.subscr = NULL,
839826
.getiter = get_microbit_scrolling_string_iter,
840-
.iternext = NULL,
841-
.buffer_p = {NULL},
842-
.locals_dict = NULL,
843827
};
844828

845829
const mp_obj_type_t microbit_scrolling_string_iterator_type = {
846830
{ &mp_type_type },
847831
.name = MP_QSTR_iterator,
848-
.print = NULL,
849-
.make_new = NULL,
850-
.call = NULL,
851-
.unary_op = NULL,
852-
.binary_op = NULL,
853-
.attr = NULL,
854-
.subscr = NULL,
855832
.getiter = mp_identity_getiter,
856833
.iternext = microbit_scrolling_string_iter_next,
857-
.buffer_p = {NULL},
858-
.locals_dict = NULL,
859834
};
860835

861836
/** Facade types to present a string as a sequence of images.
@@ -897,17 +872,9 @@ static mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t
897872
const mp_obj_type_t string_image_facade_type = {
898873
{ &mp_type_type },
899874
.name = MP_QSTR_Facade,
900-
.print E799 = NULL,
901-
.make_new = NULL,
902-
.call = NULL,
903875
.unary_op = facade_unary_op,
904-
.binary_op = NULL,
905-
.attr = NULL,
906876
.subscr = string_image_facade_subscr,
907877
.getiter = microbit_facade_iterator,
908-
.iternext = NULL,
909-
.buffer_p = {NULL},
910-
NULL
911878
};
912879

913880

@@ -940,17 +907,8 @@ static mp_obj_t microbit_facade_iter_next(mp_obj_t iter_in) {
940907
const mp_obj_type_t microbit_facade_iterator_type = {
941908
{ &mp_type_type },
942909
.name = MP_QSTR_iterator,
943-
.print = NULL,
944-
.make_new = NULL,
945-
.call = NULL,
946-
.unary_op = NULL,
947-
.binary_op = NULL,
948-
.attr = NULL,
949-
.subscr = NULL,
950910
.getiter = mp_identity_getiter,
951911
.iternext = microbit_facade_iter_next,
952-
.buffer_p = {NULL},
953-
NULL
954912
};
955913

956914
mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t *iter_buf) {

0 commit comments

Comments
 (0)
0