commit e7f2b4c875fa3130e4ad37721a7d231380456895
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Fri Jun 13 23:37:18 2014 +0300
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Fri Jun 27 00:04:18 2014 +0300
tree 11b053e49d893277e3522552ae5a16a1ab907c8f
parent 86d3898e709f32bef9e44dd558e7ea5569398011

objstrunicode: Revamp len() handling for unicode, and optimize bool().

py/obj.c

diff --git a/py/obj.c b/py/obj.c
index a0f55d6..d951abb 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -354,7 +354,12 @@
 
 // may return MP_OBJ_NULL
 mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
-    if (MP_OBJ_IS_STR(o_in) || MP_OBJ_IS_TYPE(o_in, &mp_type_bytes)) {
+    if (
+#if !MICROPY_PY_BUILTINS_STR_UNICODE
+        // It's simple - unicode is slow, non-unicode is fast
+        MP_OBJ_IS_STR(o_in) ||
+#endif
+        MP_OBJ_IS_TYPE(o_in, &mp_type_bytes)) {
         return MP_OBJ_NEW_SMALL_INT((machine_int_t)mp_obj_str_get_len(o_in));
     } else {
         mp_obj_type_t *type = mp_obj_get_type(o_in);