diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-07 15:58:30 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-07 15:58:30 +0000 |
| commit | 97209d38e17a0f3cb2a2d3f03d726fd322b4808f (patch) | |
| tree | 514cc35179713b4128ec6218829d769d87d7fe70 /py/objrange.c | |
| parent | d49420e74c721bb6c61925a6c9a2addbaeed3382 (diff) | |
| parent | a5a01df81d01705b9f04264cc46fbb1bc32641b3 (diff) | |
| download | micropython-97209d38e17a0f3cb2a2d3f03d726fd322b4808f.tar.gz micropython-97209d38e17a0f3cb2a2d3f03d726fd322b4808f.zip | |
Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
py/objcomplex.c
Diffstat (limited to 'py/objrange.c')
| -rw-r--r-- | py/objrange.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/py/objrange.c b/py/objrange.c index 1ef42673f4..a2a0e67b00 100644 --- a/py/objrange.c +++ b/py/objrange.c @@ -25,14 +25,7 @@ mp_obj_t range_getiter(mp_obj_t o_in) { static const mp_obj_type_t range_type = { { &mp_const_type} , "range", - NULL, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - range_getiter, - NULL, // iternext - .methods = {{NULL, NULL},}, + .getiter = range_getiter, }; // range is a class and instances are immutable sequence objects @@ -70,14 +63,7 @@ mp_obj_t range_it_iternext(mp_obj_t o_in) { static const mp_obj_type_t range_it_type = { { &mp_const_type }, "range_iterator", - NULL, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - range_it_iternext, - .methods = {{NULL, NULL},}, + .iternext = range_it_iternext, }; mp_obj_t mp_obj_new_range_iterator(int cur, int stop, int step) { |