py: Make unichar_charlen() accept/return machine_uint_t.

pfalcon · pfalcon · commit 9e215fa4c277 · 2014-06-28T23:15:29.000+03:00
diff --git a/py/builtin.c b/py/builtin.c
@@ -372,7 +372,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
     uint len;
     const char *str = mp_obj_str_get_data(o_in, &len);
     #if MICROPY_PY_BUILTINS_STR_UNICODE
-    uint charlen = unichar_charlen(str, len);
+    machine_uint_t charlen = unichar_charlen(str, len);
     if (charlen == 1) {
         if (MP_OBJ_IS_STR(o_in) && UTF8_IS_NONASCII(*str)) {
             machine_int_t ord = *str++ & 0x7F;
diff --git a/py/misc.h b/py/misc.h
@@ -100,7 +100,7 @@ bool unichar_isupper(unichar c);
 bool unichar_islower(unichar c);
 unichar unichar_tolower(unichar c);
 unichar unichar_toupper(unichar c);
-uint unichar_charlen(const char *str, uint len); // TODO this should return machine_uint_t
+machine_uint_t unichar_charlen(const char *str, machine_uint_t len);
 #define UTF8_IS_NONASCII(ch) ((ch) & 0x80)
 #define UTF8_IS_CONT(ch) (((ch) & 0xC0) == 0x80)
 
diff --git a/py/objstr.c b/py/objstr.c
@@ -1448,7 +1448,7 @@ STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
 
     // if needle_len is zero then we count each gap between characters as an occurrence
     if (needle_len == 0) {
-        return MP_OBJ_NEW_SMALL_INT((machine_uint_t)unichar_charlen((const char*)start, end - start) + 1);
+        return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);
     }
 
     // count the occurrences
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
@@ -106,7 +106,7 @@ STATIC mp_obj_t uni_unary_op(int op, mp_obj_t self_in) {
         case MP_UNARY_OP_BOOL:
             return MP_BOOL(str_len != 0);
         case MP_UNARY_OP_LEN:
-            return MP_OBJ_NEW_SMALL_INT((machine_int_t)unichar_charlen((const char *)str_data, str_len));
+            return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char *)str_data, str_len));
         default:
             return MP_OBJ_NULL; // op not supported
     }
diff --git a/py/unicode.c b/py/unicode.c
@@ -107,11 +107,11 @@ machine_uint_t utf8_ptr_to_index(const char *s, const char *ptr) {
     return i;
 }
 
-// TODO: Rename to str_charlen; return machine_uint_t
-uint unichar_charlen(const char *str, uint len)
+// TODO: Rename to str_charlen
+machine_uint_t unichar_charlen(const char *str, machine_uint_t len)
 {
 #if MICROPY_PY_BUILTINS_STR_UNICODE
-    uint charlen = 0;
+    machine_uint_t charlen = 0;
     for (const char *top = str + len; str < top; ++str) {
         if (!UTF8_IS_CONT(*str)) {
             ++charlen;

Original file line number	Diff line number	Diff line change
`@@ -1448,7 +1448,7 @@ STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {`
`1448`	`1448`
`1449`	`1449`	`// if needle_len is zero then we count each gap between characters as an occurrence`
`1450`	`1450`	`if (needle_len == 0) {`
`1451`		`- return MP_OBJ_NEW_SMALL_INT((machine_uint_t)unichar_charlen((const char*)start, end - start) + 1);`
	`1451`	`+ return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);`
`1452`	`1452`	`}`
`1453`	`1453`
`1454`	`1454`	`// count the occurrences`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ STATIC mp_obj_t uni_unary_op(int op, mp_obj_t self_in) {`
`106`	`106`	`case MP_UNARY_OP_BOOL:`
`107`	`107`	`return MP_BOOL(str_len != 0);`
`108`	`108`	`case MP_UNARY_OP_LEN:`
`109`		`- return MP_OBJ_NEW_SMALL_INT((machine_int_t)unichar_charlen((const char *)str_data, str_len));`
	`109`	`+ return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char *)str_data, str_len));`
`110`	`110`	`default:`
`111`	`111`	`return MP_OBJ_NULL; // op not supported`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ machine_uint_t utf8_ptr_to_index(const char s, const char ptr) {`
`107`	`107`	`return i;`
`108`	`108`	`}`
`109`	`109`
`110`		`-// TODO: Rename to str_charlen; return machine_uint_t`
`111`		`-uint unichar_charlen(const char *str, uint len)`
	`110`	`+// TODO: Rename to str_charlen`
	`111`	`+machine_uint_t unichar_charlen(const char *str, machine_uint_t len)`
`112`	`112`	`{`
`113`	`113`	`#if MICROPY_PY_BUILTINS_STR_UNICODE`
`114`		`- uint charlen = 0;`
	`114`	`+ machine_uint_t charlen = 0;`
`115`	`115`	`for (const char *top = str + len; str < top; ++str) {`
`116`	`116`	`if (!UTF8_IS_CONT(*str)) {`
`117`	`117`	`++charlen;`