Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-03-10 19:00:30 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

py/objstr: Factor code with a helper function to create empty str/bytes.

Browse Source 
This reduces code duplication, and may help reduce code size.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2026-02-12 12:38:31 +11:00
parent 716aae8fb0
commit 65ddc2346c
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
py/objstr.c
View File

@@ -68,6 +68,14 @@ static void check_is_str_or_bytes(mp_obj_t self_in) {
mp_check_self(mp_obj_is_str_or_bytes(self_in));
}
static mp_obj_t make_empty_str_of_type(const mp_obj_type_t *type) {
if (type == &mp_type_str) {
return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str
} else {
return mp_const_empty_bytes;
}
}
static const byte *get_substring_data(const mp_obj_t obj, size_t n_args, const mp_obj_t *args, size_t *len) {
// Get substring data from obj, using args[0,1] to specify start and end indices.
GET_STR_DATA_LEN(obj, str, str_len);
@@ -383,11 +391,7 @@ mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
return MP_OBJ_NULL; // op not supported
}
if (n <= 0) {
if (lhs_type == &mp_type_str) {
return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str
} else {
return mp_const_empty_bytes;
}
return make_empty_str_of_type(lhs_type);
}
vstr_t vstr;
vstr_init_len(&vstr, lhs_len * n);
@@ -906,11 +910,7 @@ static mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
if (!first_good_char_pos_set) {
// string is all whitespace, return ''
if (self_type == &mp_type_str) {
return MP_OBJ_NEW_QSTR(MP_QSTR_);
} else {
return mp_const_empty_bytes;
}
return make_empty_str_of_type(self_type);
}
assert(last_good_char_pos >= first_good_char_pos);
@@ -1836,15 +1836,9 @@ static mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
}
mp_obj_t result[3];
if (self_type == &mp_type_str) {
result[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
result[1] = MP_OBJ_NEW_QSTR(MP_QSTR_);
result[2] = MP_OBJ_NEW_QSTR(MP_QSTR_);
} else {
result[0] = mp_const_empty_bytes;
result[1] = mp_const_empty_bytes;
result[2] = mp_const_empty_bytes;
}
result[0] = make_empty_str_of_type(self_type);
result[1] = make_empty_str_of_type(self_type);
result[2] = make_empty_str_of_type(self_type);
if (direction > 0) {
result[0] = self_in;