mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91 from chipaca/list_index 

Fix off-by-one in non-default values of index's 2nd and 3rd arguments.
This commit is contained in:
Damien George 2014-01-05 15:55:55 -08:00
parent 73595feb75 c553162ebc
commit 17f4497d6d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
py/objlist.c
View File

@ -182,13 +182,17 @@ static mp_obj_t list_index(int n_args, const mp_obj_t *args) {
assert(MP_OBJ_IS_TYPE(args[0], &list_type));
mp_obj_list_t *self = args[0];
mp_obj_t *value = args[1];
uint start = 0;
uint stop = self->len;
uint start = mp_get_index(self->base.type, self->len,
n_args >= 3 ? args[2] : mp_obj_new_int(0));
uint stop = mp_get_index(self->base.type, self->len,
n_args >= 4 ? args[3] : mp_obj_new_int(-1));
if (n_args >= 3) {
start = mp_get_index(self->base.type, self->len, args[2]);
if (n_args >= 4) {
stop = mp_get_index(self->base.type, self->len, args[3]);
}
}
for (uint i = start; i <= stop; i++) {
for (uint i = start; i < stop; i++) {
if (mp_obj_equal(self->items[i], value)) {
return mp_obj_new_int(i);
}