summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-02-08 19:01:47 +0000
committerDamien George <damien.p.george@gmail.com>2014-02-08 19:01:47 +0000
commit7d0bfbedd218fadd91e2bbeb6486371ffeb7b682 (patch)
treeaeb7dd4917812c95c858372d363e52c50d5c42d9 /py
parent0a587b85fb19e57644ac420c642d0d75d2f9346f (diff)
downloadmicropython-7d0bfbedd218fadd91e2bbeb6486371ffeb7b682.tar.gz
micropython-7d0bfbedd218fadd91e2bbeb6486371ffeb7b682.zip
py: Add some qstrs to the global table.
Diffstat (limited to 'py')
-rw-r--r--py/objlist.c4
-rw-r--r--py/objtype.c2
-rw-r--r--py/qstrdefs.h3
-rw-r--r--py/runtime.c2
4 files changed, 7 insertions, 4 deletions
diff --git a/py/objlist.c b/py/objlist.c
index aa857e41c2..14f3a5760a 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -277,8 +277,8 @@ mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
}
mp_obj_list_t *self = args[0];
if (self->len > 1) {
- mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(QSTR_FROM_STR_STATIC("key")), MP_MAP_LOOKUP);
- mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(QSTR_FROM_STR_STATIC("reverse")), MP_MAP_LOOKUP);
+ mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP);
+ mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_reverse), MP_MAP_LOOKUP);
mp_quicksort(self->items, self->items + self->len - 1,
keyfun ? keyfun->value : NULL,
reverse && reverse->value ? rt_is_true(reverse->value) : false);
diff --git a/py/objtype.c b/py/objtype.c
index 6ff18b47bf..55f4227364 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -239,7 +239,7 @@ static bool class_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
bool class_store_item(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
mp_obj_class_t *self = self_in;
- mp_obj_t member = mp_obj_class_lookup(self->base.type, QSTR_FROM_STR_STATIC("__setitem__"));
+ mp_obj_t member = mp_obj_class_lookup(self->base.type, MP_QSTR___setitem__);
if (member != MP_OBJ_NULL) {
mp_obj_t args[3] = {self_in, index, value};
rt_call_function_n_kw(member, 3, 0, args);
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index b90c5023de..3d4f4e2488 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -17,6 +17,7 @@ Q(__repl_print__)
Q(__bool__)
Q(__len__)
Q(__getitem__)
+Q(__setitem__)
Q(__add__)
Q(__sub__)
@@ -96,6 +97,8 @@ Q(sort)
Q(join)
Q(strip)
Q(format)
+Q(key)
+Q(reverse)
Q(<module>)
Q(<lambda>)
diff --git a/py/runtime.c b/py/runtime.c
index 2f65186a0d..0ac470fbc2 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -968,7 +968,7 @@ mp_obj_t rt_getiter(mp_obj_t o_in) {
} else {
// check for __getitem__ method
mp_obj_t dest[2];
- rt_load_method_maybe(o_in, qstr_from_str("__getitem__"), dest);
+ rt_load_method_maybe(o_in, MP_QSTR___getitem__, dest);
if (dest[0] != MP_OBJ_NULL) {
// __getitem__ exists, create an iterator
return mp_obj_new_getitem_iter(dest);