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

objstr: str_uni_istype(): Codestyle.

This commit is contained in:
Paul Sokolovsky 2014-05-31 10:59:34 +03:00
parent 69a8b23651
commit f69b9d379c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
py/objstr.c
View File

@ -1507,7 +1507,9 @@ enum { IS_SPACE, IS_ALPHA, IS_DIGIT, IS_UPPER, IS_LOWER };
STATIC mp_obj_t str_uni_istype(int type, mp_obj_t self_in) {
GET_STR_DATA_LEN(self_in, self_data, self_len);
if (self_len == 0) return mp_const_false; // default to False for empty str
if (self_len == 0) {
return mp_const_false; // default to False for empty str
}
typedef bool (*check_function)(unichar);
check_function f;
@ -1522,7 +1524,9 @@ STATIC mp_obj_t str_uni_istype(int type, mp_obj_t self_in) {
}
for (int i = 0; i < self_len; i++) {
if (!f(*self_data++)) return mp_const_false;
if (!f(*self_data++)) {
return mp_const_false;
}
}
} else {
switch (type) {
@ -1537,11 +1541,15 @@ STATIC mp_obj_t str_uni_istype(int type, mp_obj_t self_in) {
for (int i = 0; i < self_len; i++) { // only check alphanumeric characters
if (unichar_isalpha(*self_data++)) {
contains_alpha = true;
if (!f(*(self_data-1))) return mp_const_false; // we already incremented
if (!f(*(self_data-1))) {
return mp_const_false; // we already incremented
}
}
}
if (!(contains_alpha)) return mp_const_false;
if (!contains_alpha) {
return mp_const_false;
}
}
return mp_const_true;