332d83343f
This commit fixes lookups of class members to make it so that built-in functions that are used as methods/functions of a class work correctly. The mp_convert_member_lookup() function is pretty much completely changed by this commit, but for the most part it's just reorganised and the indenting changed. The functional changes are: - staticmethod and classmethod checks moved to later in the if-logic, because they are less common and so should be checked after the more common cases. - The explicit mp_obj_is_type(member, &mp_type_type) check is removed because it's now subsumed by other, more general tests in this function. - MP_TYPE_FLAG_BINDS_SELF and MP_TYPE_FLAG_BUILTIN_FUN type flags added to make the checks in this function much simpler (now they just test this bit in type->flags). - An extra check is made for mp_obj_is_instance_type(type) to fix lookup of built-in functions. Fixes #1326 and #6198. Signed-off-by: Damien George <damien@micropython.org>
99 lines
3.7 KiB
C
99 lines
3.7 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 <string.h>
|
|
|
|
#include "py/obj.h"
|
|
#include "py/runtime.h"
|
|
|
|
typedef struct _mp_obj_closure_t {
|
|
mp_obj_base_t base;
|
|
mp_obj_t fun;
|
|
size_t n_closed;
|
|
mp_obj_t closed[];
|
|
} mp_obj_closure_t;
|
|
|
|
STATIC mp_obj_t closure_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
mp_obj_closure_t *self = MP_OBJ_TO_PTR(self_in);
|
|
|
|
// need to concatenate closed-over-vars and args
|
|
|
|
size_t n_total = self->n_closed + n_args + 2 * n_kw;
|
|
if (n_total <= 5) {
|
|
// use stack to allocate temporary args array
|
|
mp_obj_t args2[5];
|
|
memcpy(args2, self->closed, self->n_closed * sizeof(mp_obj_t));
|
|
memcpy(args2 + self->n_closed, args, (n_args + 2 * n_kw) * sizeof(mp_obj_t));
|
|
return mp_call_function_n_kw(self->fun, self->n_closed + n_args, n_kw, args2);
|
|
} else {
|
|
// use heap to allocate temporary args array
|
|
mp_obj_t *args2 = m_new(mp_obj_t, n_total);
|
|
memcpy(args2, self->closed, self->n_closed * sizeof(mp_obj_t));
|
|
memcpy(args2 + self->n_closed, args, (n_args + 2 * n_kw) * sizeof(mp_obj_t));
|
|
mp_obj_t res = mp_call_function_n_kw(self->fun, self->n_closed + n_args, n_kw, args2);
|
|
m_del(mp_obj_t, args2, n_total);
|
|
return res;
|
|
}
|
|
}
|
|
|
|
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
|
|
STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
|
|
(void)kind;
|
|
mp_obj_closure_t *o = MP_OBJ_TO_PTR(o_in);
|
|
mp_print_str(print, "<closure ");
|
|
mp_obj_print_helper(print, o->fun, PRINT_REPR);
|
|
mp_printf(print, " at %p, n_closed=%u ", o, (int)o->n_closed);
|
|
for (size_t i = 0; i < o->n_closed; i++) {
|
|
if (o->closed[i] == MP_OBJ_NULL) {
|
|
mp_print_str(print, "(nil)");
|
|
} else {
|
|
mp_obj_print_helper(print, o->closed[i], PRINT_REPR);
|
|
}
|
|
mp_print_str(print, " ");
|
|
}
|
|
mp_print_str(print, ">");
|
|
}
|
|
#endif
|
|
|
|
const mp_obj_type_t closure_type = {
|
|
{ &mp_type_type },
|
|
.flags = MP_TYPE_FLAG_BINDS_SELF,
|
|
.name = MP_QSTR_closure,
|
|
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
|
|
.print = closure_print,
|
|
#endif
|
|
.call = closure_call,
|
|
};
|
|
|
|
mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed) {
|
|
mp_obj_closure_t *o = m_new_obj_var(mp_obj_closure_t, mp_obj_t, n_closed_over);
|
|
o->base.type = &closure_type;
|
|
o->fun = fun;
|
|
o->n_closed = n_closed_over;
|
|
memcpy(o->closed, closed, n_closed_over * sizeof(mp_obj_t));
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|