commit a71c83a1d1aeca1d81d7c673929f8e836dec131e
author Damien George <damien.p.george@gmail.com> Sat Feb 15 11:34:50 2014 +0000
committer Damien George <damien.p.george@gmail.com> Sat Feb 15 11:34:50 2014 +0000
tree 5c49441e19c3feffbc792eec7ecfbc3ca3036830
parent 8ac72b9d000ecc48a2d558bdb7c73c7f98d4be62

Change mp_obj_type_t.name from const char * to qstr.

Ultimately all static strings should be qstr.  This entry in the type
structure is only used for printing error messages (to tell the type of
the bad argument), and printing objects that don't supply a .print method.

py/obj.c

diff --git a/py/obj.c b/py/obj.c
index 4e0184a..86c0edc 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -26,7 +26,7 @@
 }
 
 const char *mp_obj_get_type_str(mp_obj_t o_in) {
-    return mp_obj_get_type(o_in)->name;
+    return qstr_str(mp_obj_get_type(o_in)->name);
 }
 
 void printf_wrapper(void *env, const char *fmt, ...) {
@@ -41,7 +41,7 @@
     if (type->print != NULL) {
         type->print(print, env, o_in, kind);
     } else {
-        print(env, "<%s>", type->name);
+        print(env, "<%s>", qstr_str(type->name));
     }
 }
 
@@ -226,11 +226,11 @@
             i += len;
         }
         if (i < 0 || i >= len) {
-            nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_IndexError, "%s index out of range", type->name));
+            nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_IndexError, "%s index out of range", qstr_str(type->name)));
         }
         return i;
     } else {
-        nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "%s indices must be integers, not %s", type->name, mp_obj_get_type_str(index)));
+        nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "%s indices must be integers, not %s", qstr_str(type->name), mp_obj_get_type_str(index)));
     }
 }