Skip to content

Commit 3391e19

Browse files
chipacachipaca
committed
A bit of stylistic cleanup (chose the wrong side during conflict resolution).
1 parent 270112f commit 3391e19

9 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎py/objdict.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ static mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
6161
}
6262

6363
const mp_obj_type_t dict_type = {
64-
.base = { &mp_const_type },
65-
.name = "dict",
64+
{ &mp_const_type },
65+
"dict",
6666
.print = dict_print,
6767
.make_new = dict_make_new,
6868
.binary_op = dict_binary_op,

‎py/objfloat.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ static mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
6262
}
6363

6464
const mp_obj_type_t float_type = {
65-
.base = { &mp_const_type },
66-
.name = "float",
65+
{ &mp_const_type },
66+
"float",
6767
.print = float_print,
6868
.make_new = float_make_new,
6969
.unary_op = float_unary_op,

‎py/objint.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args)
3131
}
3232

3333
const mp_obj_type_t int_type = {
34-
.base = { &mp_const_type },
35-
.name = "int",
34+
{ &mp_const_type },
35+
"int",
3636
.make_new = int_make_new,
3737
};
3838

‎py/objlist.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ static const mp_method_t list_type_methods[] = {
293293
};
294294

295295
const mp_obj_type_t list_type = {
296-
.base = { &mp_const_type },
297-
.name = "list",
296+
{ &mp_const_type },
297+
"list",
298298
.print = list_print,
299299
.make_new = list_make_new,
300300
.binary_op = list_binary_op,
@@ -360,8 +360,8 @@ mp_obj_t list_it_iternext(mp_obj_t self_in) {
360360
}
361361

362362
static const mp_obj_type_t list_it_type = {
363-
.base = { &mp_const_type },
364-
.name = "list_iterator",
363+
{ &mp_const_type },
364+
"list_iterator",
365365
.iternext = list_it_iternext,
366366
};
367367

‎py/objnone.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ void none_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_ob
1515
}
1616

1717
const mp_obj_type_t none_type = {
18-
.base = { &mp_const_type },
19-
.name = "NoneType",
18+
{ &mp_const_type },
19+
"NoneType",
2020
.print = none_print,
2121
};
2222

‎py/objslice.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ void slice_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_o
4848
}
4949

5050
const mp_obj_type_t slice_type = {
51-
.base = { &mp_const_type },
52-
.name = "slice",
51+
{ &mp_const_type },
52+
"slice",
5353
.print = slice_print,
5454
};
5555

‎py/objstr.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ static const mp_method_t str_type_methods[] = {
191191
};
192192

193193
const mp_obj_type_t str_type = {
194-
.base = { &mp_const_type },
195-
.name = "str",
194+
{ &mp_const_type },
195+
"str",
196196
.print = str_print,
197197
.binary_op = str_binary_op,
198198
.getiter = str_getiter,
@@ -234,8 +234,8 @@ mp_obj_t str_it_iternext(mp_obj_t self_in) {
234234
}
235235

236236
static const mp_obj_type_t str_it_type = {
237-
.base = { &mp_const_type },
238-
.name = "str_iterator",
237+
{ &mp_const_type },
238+
"str_iterator",
239239
.iternext = str_it_iternext,
240240
};
241241

‎py/objtuple.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ static mp_obj_t tuple_getiter(mp_obj_t o_in) {
9797
}
9898

9999
const mp_obj_type_t tuple_type = {
100-
.base = { &mp_const_type },
101-
.name = "tuple",
100+
{ &mp_const_type },
101+
"tuple",
102102
.print = tuple_print,
103103
.make_new = tuple_make_new,
104104
.binary_op = tuple_binary_op,
@@ -162,8 +162,8 @@ static mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
162162
}
163163

164164
static const mp_obj_type_t tuple_it_type = {
165-
.base = { &mp_const_type },
166-
.name = "tuple_iterator",
165+
{ &mp_const_type },
166+
"tuple_iterator",
167167
.iternext = tuple_it_iternext,
168168
};
169169

‎py/objtype.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ static mp_obj_t type_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args)
2323
}
2424

2525
const mp_obj_type_t mp_const_type = {
26-
.base = { &mp_const_type },
27-
.name = "type",
26+
{ &mp_const_type },
27+
"type",
2828
.print = type_print,
2929
.call_n = type_call_n,
3030
};

0 commit comments

Comments
 (0)