Commit 860ffb0a authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

Convert many object types structs to use C99 tagged initializer syntax.

parent 12e26564
......@@ -41,7 +41,7 @@ const mp_obj_type_t bool_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
static const mp_obj_bool_t false_obj = {{&bool_type}, false};
......
......@@ -43,7 +43,7 @@ const mp_obj_type_t bound_meth_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_bound_meth(mp_obj_t self, mp_obj_t meth) {
......
......@@ -33,7 +33,7 @@ const mp_obj_type_t cell_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_cell(mp_obj_t obj) {
......
......@@ -70,7 +70,7 @@ const mp_obj_type_t class_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_class(mp_map_t *class_locals) {
......
......@@ -42,7 +42,7 @@ const mp_obj_type_t closure_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_closure(mp_obj_t fun, mp_obj_t closure_tuple) {
......
......@@ -125,7 +125,7 @@ const mp_obj_type_t complex_type = {
complex_binary_op, // binary_op
NULL, // getiter
NULL, // iternext
{ { NULL, NULL }, }, // method list
.methods = { { NULL, NULL }, },
};
mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag) {
......
......@@ -63,14 +63,11 @@ static mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
const mp_obj_type_t dict_type = {
{ &mp_const_type },
"dict",
dict_print, // print
dict_make_new, // make_new
NULL, // call_n
NULL, // unary_op
dict_binary_op, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.print = dict_print,
.make_new = dict_make_new,
.binary_op = dict_binary_op,
.getiter = NULL,
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_dict(int n_args) {
......
......@@ -45,7 +45,7 @@ const mp_obj_type_t exception_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_exception(qstr id) {
......
......@@ -79,14 +79,11 @@ static mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
const mp_obj_type_t float_type = {
{ &mp_const_type },
"float",
float_print,
float_make_new, // make_new
NULL, // call_n
float_unary_op,
float_binary_op,
NULL, // getiter
NULL, // iternext
{ { NULL, NULL }, }, // method list
.print = float_print,
.make_new = float_make_new,
.unary_op = float_unary_op,
.binary_op = float_binary_op,
.methods = { { NULL, NULL }, },
};
mp_obj_t mp_obj_new_float(mp_float_t value) {
......
......@@ -76,7 +76,7 @@ const mp_obj_type_t fun_native_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.methods = {
{NULL, NULL}, // end-of-list sentinel
},
};
......@@ -169,7 +169,7 @@ const mp_obj_type_t fun_bc_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.methods = {
{NULL, NULL}, // end-of-list sentinel
},
};
......@@ -283,7 +283,7 @@ static const mp_obj_type_t fun_asm_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.methods = {
{NULL, NULL}, // end-of-list sentinel
},
};
......
......@@ -46,7 +46,7 @@ const mp_obj_type_t gen_wrap_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_gen_wrap(uint n_locals, uint n_stack, mp_obj_t fun) {
......@@ -101,7 +101,7 @@ const mp_obj_type_t gen_instance_type = {
NULL, // binary_op
gen_instance_getiter, // getiter
gen_instance_iternext, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
// args are in reverse order in the array
......
......@@ -99,7 +99,7 @@ const mp_obj_type_t instance_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_instance(mp_obj_t class) {
......
......@@ -33,14 +33,8 @@ static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args)
const mp_obj_type_t int_type = {
{ &mp_const_type },
"int",
NULL,
int_make_new, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ { NULL, NULL }, }, // method list
.make_new = int_make_new,
.methods = { { NULL, NULL }, },
};
mp_obj_t mp_obj_new_int(machine_int_t value) {
......
......@@ -208,14 +208,12 @@ static MP_DEFINE_CONST_FUN_OBJ_2(list_sort_obj, list_sort);
const mp_obj_type_t list_type = {
{ &mp_const_type },
"list",
list_print, // print
list_make_new, // make_new
NULL, // call_n
NULL, // unary_op
list_binary_op, // binary_op
list_getiter, // getiter
NULL, // iternext
{ // method list
.print = list_print,
.make_new = list_make_new,
.unary_op = NULL,
.binary_op = list_binary_op,
.getiter = list_getiter,
.methods = {
{ "append", &list_append_obj },
{ "clear", &list_clear_obj },
{ "copy", &list_copy_obj },
......@@ -287,14 +285,8 @@ mp_obj_t list_it_iternext(mp_obj_t self_in) {
static const mp_obj_type_t list_it_type = {
{ &mp_const_type },
"list_iterator",
NULL, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
list_it_iternext, // iternext
{ { NULL, NULL }, }, // method list
.iternext = list_it_iternext,
.methods = { { NULL, NULL }, },
};
mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur) {
......
......@@ -31,7 +31,7 @@ const mp_obj_type_t module_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_module(qstr module_name) {
......
......@@ -17,14 +17,8 @@ void none_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_ob
const mp_obj_type_t none_type = {
{ &mp_const_type },
"NoneType",
none_print, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.print = none_print,
.methods = {{NULL, NULL},},
};
static const mp_obj_none_t none_obj = {{&none_type}};
......
......@@ -32,7 +32,7 @@ static const mp_obj_type_t range_type = {
NULL, // binary_op
range_getiter,
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
// range is a class and instances are immutable sequence objects
......@@ -77,7 +77,7 @@ static const mp_obj_type_t range_it_type = {
NULL, // binary_op
NULL, // getiter
range_it_iternext,
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
mp_obj_t mp_obj_new_range_iterator(int cur, int stop, int step) {
......
......@@ -64,7 +64,7 @@ const mp_obj_type_t set_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ { NULL, NULL }, }, // method list
.methods = { { NULL, NULL }, },
};
mp_obj_t mp_obj_new_set(int n_args, mp_obj_t *items) {
......
......@@ -30,7 +30,7 @@ const mp_obj_type_t ellipsis_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.methods = {{NULL, NULL},},
};
static const mp_obj_ellipsis_t ellipsis_obj = {{&ellipsis_type}};
......@@ -57,14 +57,8 @@ void slice_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_o
const mp_obj_type_t slice_type = {
{ &mp_const_type },
"slice",
slice_print,
NULL, // call_n
NULL, // make_new
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ { NULL, NULL }, }, // method list
.print = slice_print,
.methods = { { NULL, NULL }, },
};
// TODO: Make sure to handle "empty" values, which are signified by None in CPython
......
......@@ -187,14 +187,10 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, str_format);
const mp_obj_type_t str_type = {
{ &mp_const_type },
"str",
str_print, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
str_binary_op, // binary_op
str_getiter, // getiter
NULL, // iternext
{ // method list
.print = str_print,
.binary_op = str_binary_op,
.getiter = str_getiter,
.methods = {
{ "join", &str_join_obj },
{ "format", &str_format_obj },
{ NULL, NULL }, // end-of-list sentinel
......@@ -238,14 +234,8 @@ mp_obj_t str_it_iternext(mp_obj_t self_in) {
static const mp_obj_type_t str_it_type = {
{ &mp_const_type },
"str_iterator",
NULL, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
str_it_iternext, // iternext
{ { NULL, NULL }, }, // method str
.iternext = str_it_iternext,
.methods = { { NULL, NULL }, },
};
mp_obj_t mp_obj_new_str_iterator(mp_obj_str_t *str, int cur) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment