forked from Lephenixnoir/PythonExtra
6da41b5900
The goal here is to remove a slot (making way to turn make_new into a slot) as well as reduce code size by the ~40 references to mp_identity_getiter and mp_stream_unbuffered_iter. This introduces two new type flags: - MP_TYPE_FLAG_ITER_IS_ITERNEXT: This means that the "iter" slot in the type is "iternext", and should use the identity getiter. - MP_TYPE_FLAG_ITER_IS_CUSTOM: This means that the "iter" slot is a pointer to a mp_getiter_iternext_custom_t instance, which then defines both getiter and iternext. And a third flag that is the OR of both, MP_TYPE_FLAG_ITER_IS_STREAM: This means that the type should use the identity getiter, and mp_stream_unbuffered_iter as iternext. Finally, MP_TYPE_FLAG_ITER_IS_GETITER is defined as a no-op flag to give the default case where "iter" is "getiter". Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
73 lines
2.5 KiB
C
73 lines
2.5 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/runtime.h"
|
|
|
|
typedef struct _mp_obj_map_t {
|
|
mp_obj_base_t base;
|
|
size_t n_iters;
|
|
mp_obj_t fun;
|
|
mp_obj_t iters[];
|
|
} mp_obj_map_t;
|
|
|
|
STATIC mp_obj_t map_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
mp_arg_check_num(n_args, n_kw, 2, MP_OBJ_FUN_ARGS_MAX, false);
|
|
mp_obj_map_t *o = mp_obj_malloc_var(mp_obj_map_t, mp_obj_t, n_args - 1, type);
|
|
o->n_iters = n_args - 1;
|
|
o->fun = args[0];
|
|
for (size_t i = 0; i < n_args - 1; i++) {
|
|
o->iters[i] = mp_getiter(args[i + 1], NULL);
|
|
}
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
|
|
STATIC mp_obj_t map_iternext(mp_obj_t self_in) {
|
|
mp_check_self(mp_obj_is_type(self_in, &mp_type_map));
|
|
mp_obj_map_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_obj_t *nextses = m_new(mp_obj_t, self->n_iters);
|
|
|
|
for (size_t i = 0; i < self->n_iters; i++) {
|
|
mp_obj_t next = mp_iternext(self->iters[i]);
|
|
if (next == MP_OBJ_STOP_ITERATION) {
|
|
m_del(mp_obj_t, nextses, self->n_iters);
|
|
return MP_OBJ_STOP_ITERATION;
|
|
}
|
|
nextses[i] = next;
|
|
}
|
|
return mp_call_function_n_kw(self->fun, self->n_iters, 0, nextses);
|
|
}
|
|
|
|
MP_DEFINE_CONST_OBJ_TYPE(
|
|
mp_type_map,
|
|
MP_QSTR_map,
|
|
MP_TYPE_FLAG_ITER_IS_ITERNEXT,
|
|
map_make_new,
|
|
iter, map_iternext
|
|
);
|