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

slice: Allow building with MICROPY_ENABLE_SLICE=0.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-01-04 01:34:23 +02:00
parent 26534cec85
commit e606cb6561
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/objstr.c
View File

@ -35,6 +35,7 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
if (MP_OBJ_IS_SMALL_INT(rhs_in)) {
// TODO: This implements byte string access for single index so far
return mp_obj_new_int(lhs_str[mp_obj_get_int(rhs_in)]);
#if MICROPY_ENABLE_SLICE
} else if (MP_OBJ_IS_TYPE(rhs_in, &slice_type)) {
int start, stop, step;
mp_obj_slice_get(rhs_in, &start, &stop, &step);
@ -47,6 +48,7 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
stop = len + stop;
}
return mp_obj_new_str(qstr_from_strn_copy(lhs_str + start, stop - start));
#endif
} else {
// Throw TypeError here
assert(0);

2
py/vm.c
View File

@ -410,6 +410,7 @@ bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t **
sp++;
break;
#if MICROPY_ENABLE_SLICE
case MP_BC_BUILD_SLICE:
DECODE_UINT;
if (unum == 2) {
@ -421,6 +422,7 @@ bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t **
assert(0);
}
break;
#endif
case MP_BC_UNPACK_SEQUENCE:
DECODE_UINT;