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

objstr: Make .split() support bytes.

This commit is contained in:
Paul Sokolovsky 2014-05-11 21:17:28 +03:00
parent 5e5d69b35e
commit bfb8819c0c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/objstr.c
View File

@ -411,6 +411,7 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
#define is_ws(c) ((c) == ' ' || (c) == '\t') #define is_ws(c) ((c) == ' ' || (c) == '\t')
STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) { STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
machine_int_t splits = -1; machine_int_t splits = -1;
mp_obj_t sep = mp_const_none; mp_obj_t sep = mp_const_none;
if (n_args > 1) { if (n_args > 1) {
@ -432,7 +433,7 @@ STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
while (s < top && splits != 0) { while (s < top && splits != 0) {
const byte *start = s; const byte *start = s;
while (s < top && !is_ws(*s)) s++; while (s < top && !is_ws(*s)) s++;
mp_obj_list_append(res, mp_obj_new_str(start, s - start, false)); mp_obj_list_append(res, str_new(self_type, start, s - start));
if (s >= top) { if (s >= top) {
break; break;
} }
@ -443,7 +444,7 @@ STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
} }
if (s < top) { if (s < top) {
mp_obj_list_append(res, mp_obj_new_str(s, top - s, false)); mp_obj_list_append(res, str_new(self_type, s, top - s));
} }
} else { } else {
@ -467,7 +468,7 @@ STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
} }
s++; s++;
} }
mp_obj_list_append(res, mp_obj_new_str(start, s - start, false)); mp_obj_list_append(res, str_new(self_type, start, s - start));
if (s >= top) { if (s >= top) {
break; break;
} }

2
tests/basics/string_split.py
View File

@ -26,3 +26,5 @@ print("abcabc".split("bc"))
print("abcabc".split("bc", 0)) print("abcabc".split("bc", 0))
print("abcabc".split("bc", 1)) print("abcabc".split("bc", 1))
print("abcabc".split("bc", 2)) print("abcabc".split("bc", 2))
print(b"abcabc".split(b"bc", 2))