djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add len() support for arrays.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-01-21 23:30:10 +02:00
parent 12eaccacda
commit 33996685df
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/obj.c
View File

@ -285,6 +285,8 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
len = seq_len; len = seq_len;
} else if (MP_OBJ_IS_TYPE(o_in, &dict_type)) { } else if (MP_OBJ_IS_TYPE(o_in, &dict_type)) {
len = mp_obj_dict_len(o_in); len = mp_obj_dict_len(o_in);
} else if (MP_OBJ_IS_TYPE(o_in, &array_type)) {
len = mp_obj_array_len(o_in);
} else { } else {
return MP_OBJ_NULL; return MP_OBJ_NULL;
} }

1
py/obj.h
View File

@ -334,6 +334,7 @@ extern const mp_obj_type_t zip_type;
// array // array
extern const mp_obj_type_t array_type; extern const mp_obj_type_t array_type;
uint mp_obj_array_len(mp_obj_t self_in);
// functions // functions
typedef struct _mp_obj_fun_native_t { // need this so we can define const objects (to go in ROM) typedef struct _mp_obj_fun_native_t { // need this so we can define const objects (to go in ROM)

4
py/objarray.c
View File

@ -255,6 +255,10 @@ static mp_obj_array_t *array_new(char typecode, uint n) {
return o; return o;
} }
uint mp_obj_array_len(mp_obj_t self_in) {
return ((mp_obj_array_t *)self_in)->len;
}
mp_obj_t mp_obj_new_bytearray(uint n, void *items) { mp_obj_t mp_obj_new_bytearray(uint n, void *items) {
mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n); mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n);
memcpy(o->items, items, n); memcpy(o->items, items, n);