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

str: Throw TypeError for invalid index type and clean up comments.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-01-04 01:38:26 +02:00
parent e606cb6561
commit f8b9d3c41a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/objstr.c
View File

@ -27,13 +27,11 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
const char *lhs_str = qstr_str(lhs->qstr); const char *lhs_str = qstr_str(lhs->qstr);
switch (op) { switch (op) {
case RT_BINARY_OP_SUBSCR: case RT_BINARY_OP_SUBSCR:
// string access
// XXX a massive hack!
// TODO: need predicate to check for int-like type (bools are such for example) // TODO: need predicate to check for int-like type (bools are such for example)
// ["no", "yes"][1 == 2] is common idiom // ["no", "yes"][1 == 2] is common idiom
if (MP_OBJ_IS_SMALL_INT(rhs_in)) { if (MP_OBJ_IS_SMALL_INT(rhs_in)) {
// TODO: This implements byte string access for single index so far // TODO: This implements byte string access for single index so far
// TODO: Handle negative indexes.
return mp_obj_new_int(lhs_str[mp_obj_get_int(rhs_in)]); return mp_obj_new_int(lhs_str[mp_obj_get_int(rhs_in)]);
#if MICROPY_ENABLE_SLICE #if MICROPY_ENABLE_SLICE
} else if (MP_OBJ_IS_TYPE(rhs_in, &slice_type)) { } else if (MP_OBJ_IS_TYPE(rhs_in, &slice_type)) {
@ -50,8 +48,9 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
return mp_obj_new_str(qstr_from_strn_copy(lhs_str + start, stop - start)); return mp_obj_new_str(qstr_from_strn_copy(lhs_str + start, stop - start));
#endif #endif
} else { } else {
// Throw TypeError here // Message doesn't match CPython, but we don't have so much bytes as they
assert(0); // to spend them on verbose wording
nlr_jump(mp_obj_new_exception_msg(rt_q_TypeError, "index must be int"));
} }
case RT_BINARY_OP_ADD: case RT_BINARY_OP_ADD: