summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-05-11 02:26:42 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-05-11 02:26:42 +0300
commit7aca1cae340835be70060822bea1d0d8bc0082e8 (patch)
tree8d8f59b12dfc48b2da74e24340d4613938c47ffe
parent3f8d34ca83c75283f9dca398158b58ba4706b58e (diff)
downloadmicropython-7aca1cae340835be70060822bea1d0d8bc0082e8.tar.gz
micropython-7aca1cae340835be70060822bea1d0d8bc0082e8.zip
py: Start making good use of mp_const_obj_t.
-rw-r--r--py/obj.c6
-rw-r--r--py/obj.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/py/obj.c b/py/obj.c
index 6494a847a5..e4bf7d7dfd 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -36,18 +36,18 @@
#include "runtime0.h"
#include "runtime.h"
-mp_obj_type_t *mp_obj_get_type(mp_obj_t o_in) {
+mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) {
if (MP_OBJ_IS_SMALL_INT(o_in)) {
return (mp_obj_t)&mp_type_int;
} else if (MP_OBJ_IS_QSTR(o_in)) {
return (mp_obj_t)&mp_type_str;
} else {
- mp_obj_base_t *o = o_in;
+ const mp_obj_base_t *o = o_in;
return (mp_obj_t)o->type;
}
}
-const char *mp_obj_get_type_str(mp_obj_t o_in) {
+const char *mp_obj_get_type_str(mp_const_obj_t o_in) {
return qstr_str(mp_obj_get_type(o_in)->name);
}
diff --git a/py/obj.h b/py/obj.h
index 2418b28453..5757810c96 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -398,8 +398,8 @@ mp_obj_t mp_obj_new_bound_meth(mp_obj_t meth, mp_obj_t self);
mp_obj_t mp_obj_new_getitem_iter(mp_obj_t *args);
mp_obj_t mp_obj_new_module(qstr module_name);
-mp_obj_type_t *mp_obj_get_type(mp_obj_t o_in);
-const char *mp_obj_get_type_str(mp_obj_t o_in);
+mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in);
+const char *mp_obj_get_type_str(mp_const_obj_t o_in);
bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo); // arguments should be type objects
void mp_obj_print_helper(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind);