summaryrefslogtreecommitdiffstatshomepage
path: root/py/objtuple.c
diff options
context:
space:
mode:
authorJohn R. Lenton <jlenton@gmail.com>2014-01-07 17:29:16 +0000
committerJohn R. Lenton <jlenton@gmail.com>2014-01-07 17:29:16 +0000
commitc06763a0207dde7f2060f7b1670a0b99298a01f8 (patch)
tree2f28c6e8824849f167a9b133c2d23c3c55c727d9 /py/objtuple.c
parent880ce2d7fabc127b4bca7b6f2ea8b82d0977045f (diff)
downloadmicropython-c06763a0207dde7f2060f7b1670a0b99298a01f8.tar.gz
micropython-c06763a0207dde7f2060f7b1670a0b99298a01f8.zip
This implements a better (more python-conformant) list.sort.
It's not really about that, though; it's about me figuring out a sane way forward for keyword-argument functions (and function metadata). But it's useful as is, and shouldn't break any existing code, so here you have it; I'm going to park it in my mind for a bit while sorting out the rest of the dict branch.
Diffstat (limited to 'py/objtuple.c')
-rw-r--r--py/objtuple.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/py/objtuple.c b/py/objtuple.c
index ceca4200e4..2205b869c5 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -97,8 +97,8 @@ static mp_obj_t tuple_getiter(mp_obj_t o_in) {
}
const mp_obj_type_t tuple_type = {
- { &mp_const_type },
- "tuple",
+ .base = { &mp_const_type },
+ .name = "tuple",
.print = tuple_print,
.make_new = tuple_make_new,
.binary_op = tuple_binary_op,
@@ -110,7 +110,7 @@ const mp_obj_type_t tuple_type = {
static const mp_obj_tuple_t empty_tuple_obj = {{&tuple_type}, 0};
const mp_obj_t mp_const_empty_tuple = (mp_obj_t)&empty_tuple_obj;
-mp_obj_t mp_obj_new_tuple(uint n, mp_obj_t *items) {
+mp_obj_t mp_obj_new_tuple(uint n, const mp_obj_t *items) {
if (n == 0) {
return mp_const_empty_tuple;
}
@@ -123,7 +123,7 @@ mp_obj_t mp_obj_new_tuple(uint n, mp_obj_t *items) {
return o;
}
-mp_obj_t mp_obj_new_tuple_reverse(uint n, mp_obj_t *items) {
+mp_obj_t mp_obj_new_tuple_reverse(uint n, const mp_obj_t *items) {
if (n == 0) {
return mp_const_empty_tuple;
}
@@ -163,8 +163,8 @@ static mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
}
static const mp_obj_type_t tuple_it_type = {
- { &mp_const_type },
- "tuple_iterator",
+ .base = { &mp_const_type },
+ .name = "tuple_iterator",
.iternext = tuple_it_iternext,
.methods = {{NULL, NULL},},
};