jebbatime
/
micropython
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

genexit-inst
Paul Sokolovsky 2014-01-05 22:34:09 +02:00
parent 12e2656472
commit 860ffb0a43
27 changed files with 73 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/objbool.c
View File

@ -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};

2
py/objboundmeth.c
View File

@ -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) {

2
py/objcell.c
View File

@ -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) {

2
py/objclass.c
View File

@ -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) {

2
py/objclosure.c
View File

@ -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) {

2
py/objcomplex.c
View File

@ -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) {

13
py/objdict.c
View File

@ -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) {

2
py/objexcept.c
View File

@ -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) {

13
py/objfloat.c
View File

@ -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) {

6
py/objfun.c
View File

@ -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
},
};

4
py/objgenerator.c
View File

@ -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

2
py/objinstance.c
View File

@ -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) {

10
py/objint.c
View File

@ -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) {

24
py/objlist.c
View File

@ -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) {

2
py/objmodule.c
View File

@ -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) {

10
py/objnone.c
View File

@ -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}};

4
py/objrange.c
View File

@ -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) {

2
py/objset.c
View File

@ -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) {

12
py/objslice.c
View File

@ -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

22
py/objstr.c
View File

@ -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) {

23
py/objtuple.c
View File

@ -99,14 +99,11 @@ static mp_obj_t tuple_getiter(mp_obj_t o_in) {
const mp_obj_type_t tuple_type = {
{ &mp_const_type },
"tuple",
tuple_print, // print
tuple_make_new, // make_new
NULL, // call_n
NULL, // unary_op
tuple_binary_op, // binary_op
tuple_getiter, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.print = tuple_print,
.make_new = tuple_make_new,
.binary_op = tuple_binary_op,
.getiter = tuple_getiter,
.methods = {{NULL, NULL},},
};
// the zero-length tuple
@ -168,14 +165,8 @@ static mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
static const mp_obj_type_t tuple_it_type = {
{ &mp_const_type },
"tuple_iterator",
NULL, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
tuple_it_iternext,
{{NULL, NULL},}, // method list
.iternext = tuple_it_iternext,
.methods = {{NULL, NULL},},
};
static mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur) {

11
py/objtype.c
View File

@ -25,12 +25,7 @@ static mp_obj_t type_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args)
const mp_obj_type_t mp_const_type = {
{ &mp_const_type },
"type",
type_print, // print
NULL, // make_new
type_call_n, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{{NULL, NULL},}, // method list
.print = type_print,
.call_n = type_call_n,
.methods = {{NULL, NULL},},
};

10
stm/i2c.c
View File

@ -329,14 +329,8 @@ static MP_DEFINE_CONST_FUN_OBJ_1(i2c_obj_stop_obj, i2c_obj_stop);
static const mp_obj_type_t i2c_obj_type = {
{ &mp_const_type },
"I2C",
i2c_obj_print, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.print = i2c_obj_print,
.methods = {
{ "start", &i2c_obj_start_obj },
{ "write", &i2c_obj_write_obj },
{ "read", &i2c_obj_read_obj },

10
stm/led.c
View File

@ -107,14 +107,8 @@ static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
static const mp_obj_type_t led_obj_type = {
{ &mp_const_type },
"Led",
led_obj_print, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.print = led_obj_print,
.methods = {
{ "on", &led_obj_on_obj },
{ "off", &led_obj_off_obj },
{ NULL, NULL },

2
stm/main.c
View File

@ -699,7 +699,7 @@ static const mp_obj_type_t file_obj_type = {
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.methods = {
{ "read", &file_obj_read_obj },
{ "write", &file_obj_write_obj },
{ "close", &file_obj_close_obj },

10
stm/servo.c
View File

@ -140,14 +140,8 @@ static MP_DEFINE_CONST_FUN_OBJ_2(servo_obj_angle_obj, servo_obj_angle);
static const mp_obj_type_t servo_obj_type = {
{ &mp_const_type },
"Servo",
servo_obj_print, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.print = servo_obj_print,
.methods = {
{ "angle", &servo_obj_angle_obj },
{ NULL, NULL },
}

16
unix/main.c
View File

@ -191,14 +191,14 @@ static MP_DEFINE_CONST_FUN_OBJ_2(test_set_obj, test_set);
static const mp_obj_type_t test_type = {
{ &mp_const_type },
"Test",
test_print, // print
NULL, // make_new
NULL, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
{ // method list
.print = test_print,
.make_new = NULL,
.call_n = NULL,
.unary_op = NULL,
.binary_op = NULL,
.getiter = NULL,
.iternext = NULL,
.methods = {
{ "get", &test_get_obj },
{ "set", &test_set_obj },
{ NULL, NULL },