diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-07 17:29:16 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-07 17:29:16 +0000 |
commit | c06763a0207dde7f2060f7b1670a0b99298a01f8 (patch) | |
tree | 2f28c6e8824849f167a9b133c2d23c3c55c727d9 /py/objgenerator.c | |
parent | 880ce2d7fabc127b4bca7b6f2ea8b82d0977045f (diff) | |
download | micropython-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/objgenerator.c')
-rw-r--r-- | py/objgenerator.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c index a91b0d6fc6..7b93d29de5 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -37,15 +37,11 @@ mp_obj_t gen_wrap_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) { } const mp_obj_type_t gen_wrap_type = { - { &mp_const_type }, - "generator", - NULL, // print - NULL, // make_new - gen_wrap_call_n, // call_n - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - NULL, // iternext + .base = { &mp_const_type }, + .name = "generator", + .call_n = gen_wrap_call_n, + .unary_op = NULL, + .binary_op = NULL, .methods = {{NULL, NULL},}, }; @@ -92,15 +88,11 @@ mp_obj_t gen_instance_iternext(mp_obj_t self_in) { } const mp_obj_type_t gen_instance_type = { - { &mp_const_type }, - "generator", - gen_instance_print, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - gen_instance_getiter, // getiter - gen_instance_iternext, // iternext + .base = { &mp_const_type }, + .name = "generator", + .print = gen_instance_print, + .getiter = gen_instance_getiter, + .iternext = gen_instance_iternext, .methods = {{NULL, NULL},}, }; |