summaryrefslogtreecommitdiffstatshomepage
path: root/py/objzip.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-14 23:18:35 +0000
committerDamien George <damien.p.george@gmail.com>2014-01-14 23:18:35 +0000
commit0f59203e37de155c3c7e3fadb35fd3b06cb75478 (patch)
tree5e30d1c00796fe868c2e55b3cdac03a09071e188 /py/objzip.c
parent6c2401e935b38ca87fd8f52efbb614a428b6938c (diff)
downloadmicropython-0f59203e37de155c3c7e3fadb35fd3b06cb75478.tar.gz
micropython-0f59203e37de155c3c7e3fadb35fd3b06cb75478.zip
Tidy up.
Diffstat (limited to 'py/objzip.c')
-rw-r--r--py/objzip.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/py/objzip.c b/py/objzip.c
index 2ab80af0b5..a552ff5881 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -12,12 +12,6 @@ typedef struct _mp_obj_zip_t {
mp_obj_t iters[];
} mp_obj_zip_t;
-static mp_obj_t zip_getiter(mp_obj_t self_in) {
- return self_in;
-}
-
-static mp_obj_t zip_iternext(mp_obj_t self_in);
-
static mp_obj_t zip_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
/* NOTE: args are backwards */
mp_obj_zip_t *o = m_new_obj_var(mp_obj_zip_t, mp_obj_t, n_args);
@@ -29,13 +23,9 @@ static mp_obj_t zip_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args)
return o;
}
-const mp_obj_type_t zip_type = {
- { &mp_const_type },
- "zip",
- .make_new = zip_make_new,
- .iternext = zip_iternext,
- .getiter = zip_getiter,
-};
+static mp_obj_t zip_getiter(mp_obj_t self_in) {
+ return self_in;
+}
static mp_obj_t zip_iternext(mp_obj_t self_in) {
assert(MP_OBJ_IS_TYPE(self_in, &zip_type));
@@ -57,3 +47,11 @@ static mp_obj_t zip_iternext(mp_obj_t self_in) {
}
return o;
}
+
+const mp_obj_type_t zip_type = {
+ { &mp_const_type },
+ "zip",
+ .make_new = zip_make_new,
+ .getiter = zip_getiter,
+ .iternext = zip_iternext,
+};