2014-01-09 15:57:50 -05:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2013-12-21 13:17:45 -05:00
|
|
|
|
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
|
|
|
#include "mpconfig.h"
|
2014-01-21 16:40:13 -05:00
|
|
|
#include "qstr.h"
|
2013-12-21 13:17:45 -05:00
|
|
|
#include "obj.h"
|
2014-01-18 10:31:13 -05:00
|
|
|
#include "runtime0.h"
|
2014-01-09 15:57:50 -05:00
|
|
|
#include "runtime.h"
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
// class object
|
|
|
|
// creating an instance of a class makes one of these objects
|
|
|
|
|
|
|
|
typedef struct _mp_obj_class_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_map_t members;
|
2014-03-31 17:57:56 -04:00
|
|
|
// TODO maybe cache __getattr__ and __setattr__ for efficient lookup of them
|
2014-01-09 15:57:50 -05:00
|
|
|
} mp_obj_class_t;
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t mp_obj_new_class(mp_obj_t class) {
|
2014-01-09 15:57:50 -05:00
|
|
|
mp_obj_class_t *o = m_new_obj(mp_obj_class_t);
|
|
|
|
o->base.type = class;
|
|
|
|
mp_map_init(&o->members, 0);
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-01-18 12:52:41 -05:00
|
|
|
// will return MP_OBJ_NULL if not found
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t mp_obj_class_lookup(const mp_obj_type_t *type, qstr attr) {
|
2014-01-09 16:43:51 -05:00
|
|
|
for (;;) {
|
2014-01-18 12:52:41 -05:00
|
|
|
if (type->locals_dict != NULL) {
|
2014-03-26 18:35:10 -04:00
|
|
|
// search locals_dict (the set of methods/attributes)
|
2014-03-29 09:43:38 -04:00
|
|
|
assert(MP_OBJ_IS_TYPE(type->locals_dict, &mp_type_dict)); // Micro Python restriction, for now
|
2014-02-02 17:07:44 -05:00
|
|
|
mp_map_t *locals_map = mp_obj_dict_get_map(type->locals_dict);
|
2014-01-18 12:52:41 -05:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
|
|
|
|
if (elem != NULL) {
|
|
|
|
return elem->value;
|
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// attribute not found, keep searching base classes
|
|
|
|
|
|
|
|
// for a const struct, this entry might be NULL
|
2014-01-11 14:22:29 -05:00
|
|
|
if (type->bases_tuple == MP_OBJ_NULL) {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_NULL;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
uint len;
|
|
|
|
mp_obj_t *items;
|
2014-01-11 14:22:29 -05:00
|
|
|
mp_obj_tuple_get(type->bases_tuple, &len, &items);
|
2014-01-09 16:43:51 -05:00
|
|
|
if (len == 0) {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_NULL;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
for (uint i = 0; i < len - 1; i++) {
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
|
2014-01-18 12:52:41 -05:00
|
|
|
mp_obj_t obj = mp_obj_class_lookup((mp_obj_type_t*)items[i], attr);
|
|
|
|
if (obj != MP_OBJ_NULL) {
|
|
|
|
return obj;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// search last base (simple tail recursion elimination)
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(items[len - 1], &mp_type_type));
|
2014-01-11 14:22:29 -05:00
|
|
|
type = (mp_obj_type_t*)items[len - 1];
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void class_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
|
2014-03-16 09:16:54 -04:00
|
|
|
mp_obj_class_t *self = self_in;
|
|
|
|
qstr meth = (kind == PRINT_STR) ? MP_QSTR___str__ : MP_QSTR___repr__;
|
|
|
|
mp_obj_t member = mp_obj_class_lookup(self->base.type, meth);
|
|
|
|
if (member == MP_OBJ_NULL && kind == PRINT_STR) {
|
|
|
|
// If there's no __str__, fall back to __repr__
|
|
|
|
member = mp_obj_class_lookup(self->base.type, MP_QSTR___repr__);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (member != MP_OBJ_NULL) {
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t r = mp_call_function_1(member, self_in);
|
2014-03-16 09:16:54 -04:00
|
|
|
mp_obj_print_helper(print, env, r, PRINT_STR);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: CPython prints fully-qualified type name
|
2014-01-09 15:57:50 -05:00
|
|
|
print(env, "<%s object at %p>", mp_obj_get_type_str(self_in), self_in);
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t class_make_new(mp_obj_t self_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_type));
|
2014-01-11 14:22:29 -05:00
|
|
|
mp_obj_type_t *self = self_in;
|
2014-01-09 15:57:50 -05:00
|
|
|
|
|
|
|
mp_obj_t o = mp_obj_new_class(self_in);
|
|
|
|
|
|
|
|
// look for __init__ function
|
2014-01-18 12:52:41 -05:00
|
|
|
mp_obj_t init_fn = mp_obj_class_lookup(self, MP_QSTR___init__);
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2014-01-18 12:52:41 -05:00
|
|
|
if (init_fn != MP_OBJ_NULL) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// call __init__ function
|
|
|
|
mp_obj_t init_ret;
|
2014-01-18 09:10:48 -05:00
|
|
|
if (n_args == 0 && n_kw == 0) {
|
2014-03-30 08:35:08 -04:00
|
|
|
init_ret = mp_call_function_n_kw(init_fn, 1, 0, (mp_obj_t*)&o);
|
2014-01-09 15:57:50 -05:00
|
|
|
} else {
|
2014-01-18 09:10:48 -05:00
|
|
|
mp_obj_t *args2 = m_new(mp_obj_t, 1 + n_args + 2 * n_kw);
|
|
|
|
args2[0] = o;
|
|
|
|
memcpy(args2 + 1, args, (n_args + 2 * n_kw) * sizeof(mp_obj_t));
|
2014-03-30 08:35:08 -04:00
|
|
|
init_ret = mp_call_function_n_kw(init_fn, n_args + 1, n_kw, args2);
|
2014-01-18 09:10:48 -05:00
|
|
|
m_del(mp_obj_t, args2, 1 + n_args + 2 * n_kw);
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
if (init_ret != mp_const_none) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "__init__() should return None, not '%s'", mp_obj_get_type_str(init_ret)));
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
// TODO
|
|
|
|
if (n_args != 0) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "function takes 0 positional arguments but %d were given", n_args));
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC const qstr unary_op_method_name[] = {
|
2014-03-30 08:35:08 -04:00
|
|
|
[MP_UNARY_OP_BOOL] = MP_QSTR___bool__,
|
|
|
|
[MP_UNARY_OP_LEN] = MP_QSTR___len__,
|
|
|
|
//[MP_UNARY_OP_POSITIVE,
|
|
|
|
//[MP_UNARY_OP_NEGATIVE,
|
|
|
|
//[MP_UNARY_OP_INVERT,
|
|
|
|
[MP_UNARY_OP_NOT] = MP_QSTR_, // don't need to implement this, used to make sure array has full size
|
2014-01-30 05:05:33 -05:00
|
|
|
};
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t class_unary_op(int op, mp_obj_t self_in) {
|
2014-01-30 05:05:33 -05:00
|
|
|
mp_obj_class_t *self = self_in;
|
|
|
|
qstr op_name = unary_op_method_name[op];
|
|
|
|
if (op_name == 0) {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_NOT_SUPPORTED;
|
2014-01-30 05:05:33 -05:00
|
|
|
}
|
|
|
|
mp_obj_t member = mp_obj_class_lookup(self->base.type, op_name);
|
|
|
|
if (member != MP_OBJ_NULL) {
|
2014-03-30 08:35:08 -04:00
|
|
|
return mp_call_function_1(member, self_in);
|
2014-01-30 05:05:33 -05:00
|
|
|
} else {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_NOT_SUPPORTED;
|
2014-01-30 05:05:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC const qstr binary_op_method_name[] = {
|
2014-01-18 10:31:13 -05:00
|
|
|
/*
|
2014-03-30 08:35:08 -04:00
|
|
|
MP_BINARY_OP_OR,
|
|
|
|
MP_BINARY_OP_XOR,
|
|
|
|
MP_BINARY_OP_AND,
|
|
|
|
MP_BINARY_OP_LSHIFT,
|
|
|
|
MP_BINARY_OP_RSHIFT,
|
2014-01-18 10:31:13 -05:00
|
|
|
*/
|
2014-03-30 08:35:08 -04:00
|
|
|
[MP_BINARY_OP_ADD] = MP_QSTR___add__,
|
|
|
|
[MP_BINARY_OP_SUBTRACT] = MP_QSTR___sub__,
|
2014-01-18 10:31:13 -05:00
|
|
|
/*
|
2014-03-30 08:35:08 -04:00
|
|
|
MP_BINARY_OP_MULTIPLY,
|
|
|
|
MP_BINARY_OP_FLOOR_DIVIDE,
|
|
|
|
MP_BINARY_OP_TRUE_DIVIDE,
|
|
|
|
MP_BINARY_OP_MODULO,
|
|
|
|
MP_BINARY_OP_POWER,
|
|
|
|
MP_BINARY_OP_INPLACE_OR,
|
|
|
|
MP_BINARY_OP_INPLACE_XOR,
|
|
|
|
MP_BINARY_OP_INPLACE_AND,
|
|
|
|
MP_BINARY_OP_INPLACE_LSHIFT,
|
|
|
|
MP_BINARY_OP_INPLACE_RSHIFT,
|
|
|
|
MP_BINARY_OP_INPLACE_ADD,
|
|
|
|
MP_BINARY_OP_INPLACE_SUBTRACT,
|
|
|
|
MP_BINARY_OP_INPLACE_MULTIPLY,
|
|
|
|
MP_BINARY_OP_INPLACE_FLOOR_DIVIDE,
|
|
|
|
MP_BINARY_OP_INPLACE_TRUE_DIVIDE,
|
|
|
|
MP_BINARY_OP_INPLACE_MODULO,
|
|
|
|
MP_BINARY_OP_INPLACE_POWER,
|
|
|
|
MP_BINARY_OP_LESS,
|
|
|
|
MP_BINARY_OP_MORE,
|
|
|
|
MP_BINARY_OP_EQUAL,
|
|
|
|
MP_BINARY_OP_LESS_EQUAL,
|
|
|
|
MP_BINARY_OP_MORE_EQUAL,
|
|
|
|
MP_BINARY_OP_NOT_EQUAL,
|
|
|
|
MP_BINARY_OP_IN,
|
|
|
|
MP_BINARY_OP_IS,
|
2014-01-18 10:31:13 -05:00
|
|
|
*/
|
2014-03-30 08:35:08 -04:00
|
|
|
[MP_BINARY_OP_EXCEPTION_MATCH] = MP_QSTR_, // not implemented, used to make sure array has full size
|
2014-01-18 10:31:13 -05:00
|
|
|
};
|
|
|
|
|
2014-04-02 09:13:26 -04:00
|
|
|
// Given a member that was extracted from an instance, convert it correctly
|
|
|
|
// and put the result in the dest[] array for a possible method call.
|
|
|
|
// Conversion means dealing with static/class methods, callables, and values.
|
|
|
|
// see http://docs.python.org/3.3/howto/descriptor.html
|
|
|
|
STATIC void class_convert_return_attr(mp_obj_t self, mp_obj_t member, mp_obj_t *dest) {
|
|
|
|
if (MP_OBJ_IS_TYPE(member, &mp_type_staticmethod)) {
|
|
|
|
// return just the function
|
|
|
|
dest[0] = ((mp_obj_static_class_method_t*)member)->fun;
|
|
|
|
} else if (MP_OBJ_IS_TYPE(member, &mp_type_classmethod)) {
|
|
|
|
// return a bound method, with self being the type of this object
|
|
|
|
dest[0] = ((mp_obj_static_class_method_t*)member)->fun;
|
|
|
|
dest[1] = mp_obj_get_type(self);
|
|
|
|
} else if (mp_obj_is_callable(member)) {
|
|
|
|
// return a bound method, with self being this object
|
|
|
|
dest[0] = member;
|
|
|
|
dest[1] = self;
|
|
|
|
} else {
|
|
|
|
// class member is a value, so just return that value
|
|
|
|
dest[0] = member;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t class_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2014-04-02 09:13:26 -04:00
|
|
|
// Note: For ducktyping, CPython does not look in the instance members or use
|
|
|
|
// __getattr__ or __getattribute__. It only looks in the class dictionary.
|
2014-01-18 10:31:13 -05:00
|
|
|
mp_obj_class_t *lhs = lhs_in;
|
2014-01-24 19:17:36 -05:00
|
|
|
qstr op_name = binary_op_method_name[op];
|
|
|
|
if (op_name == 0) {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_NOT_SUPPORTED;
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
2014-01-24 19:17:36 -05:00
|
|
|
mp_obj_t member = mp_obj_class_lookup(lhs->base.type, op_name);
|
2014-01-18 12:52:41 -05:00
|
|
|
if (member != MP_OBJ_NULL) {
|
2014-04-02 09:13:26 -04:00
|
|
|
mp_obj_t dest[3];
|
|
|
|
dest[1] = MP_OBJ_NULL;
|
|
|
|
class_convert_return_attr(lhs_in, member, dest);
|
|
|
|
dest[2] = rhs_in;
|
|
|
|
return mp_call_method_n_kw(1, 0, dest);
|
2014-01-18 10:31:13 -05:00
|
|
|
} else {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_NOT_SUPPORTED;
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void class_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// logic: look in obj members then class locals (TODO check this against CPython)
|
|
|
|
mp_obj_class_t *self = self_in;
|
2014-04-13 13:59:45 -04:00
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
|
|
|
|
if (elem != NULL) {
|
|
|
|
// object member, always treated as a value
|
2014-04-13 13:59:45 -04:00
|
|
|
// TODO should we check for properties?
|
2014-01-18 09:10:48 -05:00
|
|
|
dest[0] = elem->value;
|
2014-01-09 15:57:50 -05:00
|
|
|
return;
|
|
|
|
}
|
2014-04-13 13:59:45 -04:00
|
|
|
|
2014-01-18 12:52:41 -05:00
|
|
|
mp_obj_t member = mp_obj_class_lookup(self->base.type, attr);
|
|
|
|
if (member != MP_OBJ_NULL) {
|
2014-04-13 13:59:45 -04:00
|
|
|
if (0) {
|
|
|
|
#if MICROPY_ENABLE_PROPERTY
|
|
|
|
} else if (MP_OBJ_IS_TYPE(member, &mp_type_property)) {
|
|
|
|
// object member is a property
|
|
|
|
// delegate the store to the property
|
|
|
|
// TODO should this be part of class_convert_return_attr?
|
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(member);
|
|
|
|
if (proxy[0] == mp_const_none) {
|
|
|
|
// TODO
|
|
|
|
} else {
|
|
|
|
dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self_in);
|
|
|
|
// TODO should we convert the returned value using class_convert_return_attr?
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
// not a property
|
|
|
|
class_convert_return_attr(self_in, member, dest);
|
|
|
|
}
|
2014-03-31 17:57:56 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// try __getattr__
|
|
|
|
if (attr != MP_QSTR___getattr__) {
|
|
|
|
mp_obj_t dest2[3];
|
|
|
|
mp_load_method_maybe(self_in, MP_QSTR___getattr__, dest2);
|
|
|
|
if (dest2[0] != MP_OBJ_NULL) {
|
|
|
|
// __getattr__ exists, call it and return its result
|
|
|
|
// XXX if this fails to load the requested attr, should we catch the attribute error and return silently?
|
|
|
|
dest2[2] = MP_OBJ_NEW_QSTR(attr);
|
|
|
|
dest[0] = mp_call_method_n_kw(1, 0, dest2);
|
2014-01-09 15:57:50 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC bool class_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
|
2014-01-09 15:57:50 -05:00
|
|
|
mp_obj_class_t *self = self_in;
|
2014-04-13 13:59:45 -04:00
|
|
|
|
|
|
|
#if MICROPY_ENABLE_PROPERTY
|
|
|
|
// for property, we need to do a lookup first in the class dict
|
|
|
|
// this makes all stores slow... how to fix?
|
|
|
|
mp_obj_t member = mp_obj_class_lookup(self->base.type, attr);
|
|
|
|
if (member != MP_OBJ_NULL && MP_OBJ_IS_TYPE(member, &mp_type_property)) {
|
|
|
|
// attribute already exists and is a property
|
|
|
|
// delegate the store to the property
|
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(member);
|
|
|
|
if (proxy[1] == mp_const_none) {
|
|
|
|
// TODO better error message
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
mp_obj_t dest[2] = {self_in, value};
|
|
|
|
mp_call_function_n_kw(proxy[1], 2, 0, dest);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-04-08 16:11:49 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
2014-04-13 13:59:45 -04:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
|
|
return elem != NULL;
|
2014-04-08 16:11:49 -04:00
|
|
|
} else {
|
|
|
|
// store attribute
|
|
|
|
mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
|
|
|
return true;
|
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
|
2014-04-17 17:10:53 -04:00
|
|
|
STATIC mp_obj_t class_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
2014-04-14 18:20:52 -04:00
|
|
|
mp_obj_class_t *self = self_in;
|
|
|
|
mp_obj_t member;
|
|
|
|
uint meth_args;
|
2014-04-08 16:32:29 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete item
|
2014-04-14 18:20:52 -04:00
|
|
|
member = mp_obj_class_lookup(self->base.type, MP_QSTR___delitem__);
|
|
|
|
meth_args = 2;
|
2014-04-17 17:10:53 -04:00
|
|
|
} else if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load item
|
|
|
|
member = mp_obj_class_lookup(self->base.type, MP_QSTR___getitem__);
|
|
|
|
meth_args = 2;
|
2014-04-14 18:20:52 -04:00
|
|
|
} else {
|
2014-04-17 17:10:53 -04:00
|
|
|
// store item
|
2014-04-14 18:20:52 -04:00
|
|
|
member = mp_obj_class_lookup(self->base.type, MP_QSTR___setitem__);
|
|
|
|
meth_args = 3;
|
2014-04-08 16:32:29 -04:00
|
|
|
}
|
2014-01-18 12:52:41 -05:00
|
|
|
if (member != MP_OBJ_NULL) {
|
2014-01-18 10:31:13 -05:00
|
|
|
mp_obj_t args[3] = {self_in, index, value};
|
2014-04-17 17:10:53 -04:00
|
|
|
// TODO probably need to call class_convert_return_attr, and use mp_call_method_n_kw
|
|
|
|
mp_obj_t ret = mp_call_function_n_kw(member, meth_args, 0, args);
|
|
|
|
if (value == MP_OBJ_SENTINEL) {
|
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-01-18 10:31:13 -05:00
|
|
|
} else {
|
2014-04-17 17:10:53 -04:00
|
|
|
return MP_OBJ_NOT_SUPPORTED;
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-25 14:15:16 -04:00
|
|
|
STATIC mp_obj_t class_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
|
|
|
mp_obj_class_t *self = self_in;
|
|
|
|
mp_obj_t member = mp_obj_class_lookup(self->base.type, MP_QSTR___call__);
|
|
|
|
if (member == MP_OBJ_NULL) {
|
|
|
|
return member;
|
|
|
|
}
|
|
|
|
mp_obj_t meth = mp_obj_new_bound_meth(member, self);
|
|
|
|
return mp_call_function_n_kw(meth, n_args, n_kw, args);
|
|
|
|
}
|
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
/******************************************************************************/
|
|
|
|
// type object
|
|
|
|
// - the struct is mp_obj_type_t and is defined in obj.h so const types can be made
|
2014-02-15 11:10:44 -05:00
|
|
|
// - there is a constant mp_obj_type_t (called mp_type_type) for the 'type' object
|
2014-01-09 15:57:50 -05:00
|
|
|
// - creating a new class (a new type) creates a new mp_obj_type_t
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void type_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
|
2014-01-04 15:21:15 -05:00
|
|
|
mp_obj_type_t *self = self_in;
|
2014-02-15 06:34:50 -05:00
|
|
|
print(env, "<class '%s'>", qstr_str(self->name));
|
2014-01-04 15:21:15 -05:00
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t type_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-01-18 09:10:48 -05:00
|
|
|
// TODO check n_kw == 0
|
|
|
|
|
2014-01-08 13:48:12 -05:00
|
|
|
switch (n_args) {
|
|
|
|
case 1:
|
|
|
|
return mp_obj_get_type(args[0]);
|
|
|
|
|
|
|
|
case 3:
|
2014-01-18 09:10:48 -05:00
|
|
|
// args[0] = name
|
2014-01-08 13:48:12 -05:00
|
|
|
// args[1] = bases tuple
|
2014-01-18 09:10:48 -05:00
|
|
|
// args[2] = locals dict
|
2014-02-15 06:34:50 -05:00
|
|
|
return mp_obj_new_type(mp_obj_str_get_qstr(args[0]), args[1], args[2]);
|
2014-01-08 13:48:12 -05:00
|
|
|
|
|
|
|
default:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "type takes 1 or 3 arguments"));
|
2014-01-08 13:48:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t type_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// instantiate an instance of a class
|
|
|
|
|
2014-01-04 15:21:15 -05:00
|
|
|
mp_obj_type_t *self = self_in;
|
2014-01-09 15:57:50 -05:00
|
|
|
|
|
|
|
if (self->make_new == NULL) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "cannot create '%s' instances", qstr_str(self->name)));
|
2014-01-04 15:21:15 -05:00
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
|
|
|
|
// make new instance
|
2014-01-18 09:10:48 -05:00
|
|
|
mp_obj_t o = self->make_new(self, n_args, n_kw, args);
|
2014-01-09 15:57:50 -05:00
|
|
|
|
|
|
|
// return new instance
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-01-18 09:10:48 -05:00
|
|
|
// for fail, do nothing; for attr, dest[0] = value; for method, dest[0] = method, dest[1] = self
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void type_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_type));
|
2014-01-11 14:22:29 -05:00
|
|
|
mp_obj_type_t *self = self_in;
|
2014-03-31 13:26:44 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2014-03-30 21:43:21 -04:00
|
|
|
if (attr == MP_QSTR___name__) {
|
|
|
|
dest[0] = MP_OBJ_NEW_QSTR(self->name);
|
|
|
|
return;
|
|
|
|
}
|
2014-03-31 13:26:44 -04:00
|
|
|
#endif
|
2014-01-18 12:52:41 -05:00
|
|
|
mp_obj_t member = mp_obj_class_lookup(self, attr);
|
|
|
|
if (member != MP_OBJ_NULL) {
|
|
|
|
// check if the methods are functions, static or class methods
|
|
|
|
// see http://docs.python.org/3.3/howto/descriptor.html
|
|
|
|
if (MP_OBJ_IS_TYPE(member, &mp_type_staticmethod)) {
|
|
|
|
// return just the function
|
2014-02-06 15:31:44 -05:00
|
|
|
dest[0] = ((mp_obj_static_class_method_t*)member)->fun;
|
2014-01-18 12:52:41 -05:00
|
|
|
} else if (MP_OBJ_IS_TYPE(member, &mp_type_classmethod)) {
|
|
|
|
// return a bound method, with self being this class
|
2014-02-06 15:31:44 -05:00
|
|
|
dest[0] = ((mp_obj_static_class_method_t*)member)->fun;
|
2014-01-18 12:52:41 -05:00
|
|
|
dest[1] = self_in;
|
|
|
|
} else {
|
|
|
|
// return just the function
|
|
|
|
// TODO need to wrap in a type check for the first argument; eg list.append(1,1) needs to throw an exception
|
|
|
|
dest[0] = (mp_obj_t)member;
|
2014-01-11 14:22:29 -05:00
|
|
|
}
|
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC bool type_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_type));
|
2014-01-11 14:22:29 -05:00
|
|
|
mp_obj_type_t *self = self_in;
|
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
// TODO CPython allows STORE_ATTR to a class, but is this the correct implementation?
|
|
|
|
|
2014-01-18 12:52:41 -05:00
|
|
|
if (self->locals_dict != NULL) {
|
2014-03-29 09:43:38 -04:00
|
|
|
assert(MP_OBJ_IS_TYPE(self->locals_dict, &mp_type_dict)); // Micro Python restriction, for now
|
2014-03-27 05:32:26 -04:00
|
|
|
mp_map_t *locals_map = mp_obj_dict_get_map(self->locals_dict);
|
2014-04-08 16:11:49 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
|
|
// note that locals_map may be in ROM, so remove will fail in that case
|
|
|
|
return elem != NULL;
|
|
|
|
} else {
|
|
|
|
// store attribute
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
|
|
|
// note that locals_map may be in ROM, so add will fail in that case
|
|
|
|
if (elem != NULL) {
|
|
|
|
elem->value = value;
|
|
|
|
return true;
|
|
|
|
}
|
2014-03-27 05:32:26 -04:00
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
2014-03-27 05:32:26 -04:00
|
|
|
|
|
|
|
return false;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2014-04-05 06:09:33 -04:00
|
|
|
STATIC mp_obj_t type_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
|
|
|
switch (op) {
|
|
|
|
case MP_BINARY_OP_EQUAL:
|
|
|
|
// Types can be equal only if it's the same type structure,
|
|
|
|
// we don't even need to check for 2nd arg type.
|
|
|
|
return MP_BOOL(lhs_in == rhs_in);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-02-15 11:10:44 -05:00
|
|
|
const mp_obj_type_t mp_type_type = {
|
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_type,
|
2014-01-05 15:34:09 -05:00
|
|
|
.print = type_print,
|
2014-01-08 13:48:12 -05:00
|
|
|
.make_new = type_make_new,
|
2014-01-18 09:10:48 -05:00
|
|
|
.call = type_call,
|
2014-01-09 15:57:50 -05:00
|
|
|
.load_attr = type_load_attr,
|
|
|
|
.store_attr = type_store_attr,
|
2014-04-05 06:09:33 -04:00
|
|
|
.binary_op = type_binary_op,
|
2013-12-21 13:17:45 -05:00
|
|
|
};
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2014-02-15 06:34:50 -05:00
|
|
|
mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict) {
|
2014-03-29 09:15:08 -04:00
|
|
|
assert(MP_OBJ_IS_TYPE(bases_tuple, &mp_type_tuple)); // Micro Python restriction, for now
|
2014-03-29 09:43:38 -04:00
|
|
|
assert(MP_OBJ_IS_TYPE(locals_dict, &mp_type_dict)); // Micro Python restriction, for now
|
2014-01-09 15:57:50 -05:00
|
|
|
mp_obj_type_t *o = m_new0(mp_obj_type_t, 1);
|
2014-02-15 11:10:44 -05:00
|
|
|
o->base.type = &mp_type_type;
|
2014-01-22 09:35:10 -05:00
|
|
|
o->name = name;
|
2014-01-09 15:57:50 -05:00
|
|
|
o->print = class_print;
|
|
|
|
o->make_new = class_make_new;
|
2014-01-30 05:05:33 -05:00
|
|
|
o->unary_op = class_unary_op;
|
2014-01-18 10:31:13 -05:00
|
|
|
o->binary_op = class_binary_op;
|
2014-01-09 15:57:50 -05:00
|
|
|
o->load_attr = class_load_attr;
|
|
|
|
o->store_attr = class_store_attr;
|
2014-04-17 17:10:53 -04:00
|
|
|
o->subscr = class_subscr;
|
2014-04-25 14:15:16 -04:00
|
|
|
o->call = class_call;
|
2014-01-09 16:43:51 -05:00
|
|
|
o->bases_tuple = bases_tuple;
|
|
|
|
o->locals_dict = locals_dict;
|
2014-01-09 15:57:50 -05:00
|
|
|
return o;
|
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
|
|
|
|
/******************************************************************************/
|
2014-02-04 19:51:47 -05:00
|
|
|
// super object
|
|
|
|
|
|
|
|
typedef struct _mp_obj_super_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_t type;
|
|
|
|
mp_obj_t obj;
|
|
|
|
} mp_obj_super_t;
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void super_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
|
2014-02-04 19:51:47 -05:00
|
|
|
mp_obj_super_t *self = self_in;
|
|
|
|
print(env, "<super: ");
|
|
|
|
mp_obj_print_helper(print, env, self->type, PRINT_STR);
|
|
|
|
print(env, ", ");
|
|
|
|
mp_obj_print_helper(print, env, self->obj, PRINT_STR);
|
|
|
|
print(env, ">");
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t super_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-02-04 19:51:47 -05:00
|
|
|
if (n_args != 2 || n_kw != 0) {
|
|
|
|
// 0 arguments are turned into 2 in the compiler
|
|
|
|
// 1 argument is not yet implemented
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "super() requires 2 arguments"));
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
|
|
|
return mp_obj_new_super(args[0], args[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// for fail, do nothing; for attr, dest[0] = value; for method, dest[0] = method, dest[1] = self
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void super_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
2014-03-29 09:43:38 -04:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_super));
|
2014-02-04 19:51:47 -05:00
|
|
|
mp_obj_super_t *self = self_in;
|
|
|
|
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(self->type, &mp_type_type));
|
2014-02-04 19:51:47 -05:00
|
|
|
|
|
|
|
mp_obj_type_t *type = self->type;
|
|
|
|
|
|
|
|
// for a const struct, this entry might be NULL
|
|
|
|
if (type->bases_tuple == MP_OBJ_NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint len;
|
|
|
|
mp_obj_t *items;
|
|
|
|
mp_obj_tuple_get(type->bases_tuple, &len, &items);
|
|
|
|
for (uint i = 0; i < len; i++) {
|
2014-02-15 11:10:44 -05:00
|
|
|
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
|
2014-02-04 19:51:47 -05:00
|
|
|
mp_obj_t member = mp_obj_class_lookup((mp_obj_type_t*)items[i], attr);
|
|
|
|
if (member != MP_OBJ_NULL) {
|
2014-04-20 21:11:07 -04:00
|
|
|
class_convert_return_attr(self->obj, member, dest);
|
2014-03-26 18:35:10 -04:00
|
|
|
return;
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
const mp_obj_type_t mp_type_super = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_super,
|
2014-02-04 19:51:47 -05:00
|
|
|
.print = super_print,
|
|
|
|
.make_new = super_make_new,
|
|
|
|
.load_attr = super_load_attr,
|
|
|
|
};
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_super(mp_obj_t type, mp_obj_t obj) {
|
|
|
|
mp_obj_super_t *o = m_new_obj(mp_obj_super_t);
|
2014-03-29 09:43:38 -04:00
|
|
|
*o = (mp_obj_super_t){{&mp_type_super}, type, obj};
|
2014-02-04 19:51:47 -05:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
2014-02-15 11:10:44 -05:00
|
|
|
// subclassing and built-ins specific to types
|
2014-01-09 16:43:51 -05:00
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
// object and classinfo should be type objects
|
|
|
|
// (but the function will fail gracefully if they are not)
|
2014-03-26 14:37:06 -04:00
|
|
|
bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo) {
|
2014-01-09 16:43:51 -05:00
|
|
|
for (;;) {
|
|
|
|
if (object == classinfo) {
|
2014-02-15 11:10:44 -05:00
|
|
|
return true;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// not equivalent classes, keep searching base classes
|
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
// object should always be a type object, but just return false if it's not
|
|
|
|
if (!MP_OBJ_IS_TYPE(object, &mp_type_type)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-03-26 14:37:06 -04:00
|
|
|
const mp_obj_type_t *self = object;
|
2014-01-09 16:43:51 -05:00
|
|
|
|
|
|
|
// for a const struct, this entry might be NULL
|
|
|
|
if (self->bases_tuple == MP_OBJ_NULL) {
|
2014-02-15 11:10:44 -05:00
|
|
|
return false;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
// get the base objects (they should be type objects)
|
2014-01-09 16:43:51 -05:00
|
|
|
uint len;
|
|
|
|
mp_obj_t *items;
|
|
|
|
mp_obj_tuple_get(self->bases_tuple, &len, &items);
|
|
|
|
if (len == 0) {
|
2014-02-15 11:10:44 -05:00
|
|
|
return false;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
2014-03-03 17:38:13 -05:00
|
|
|
|
|
|
|
// iterate through the base objects
|
2014-01-09 16:43:51 -05:00
|
|
|
for (uint i = 0; i < len - 1; i++) {
|
2014-03-03 17:38:13 -05:00
|
|
|
if (mp_obj_is_subclass_fast(items[i], classinfo)) {
|
2014-02-15 11:10:44 -05:00
|
|
|
return true;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// search last base (simple tail recursion elimination)
|
|
|
|
object = items[len - 1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
|
|
|
|
uint len;
|
|
|
|
mp_obj_t *items;
|
|
|
|
if (MP_OBJ_IS_TYPE(classinfo, &mp_type_type)) {
|
|
|
|
len = 1;
|
|
|
|
items = &classinfo;
|
2014-03-29 09:15:08 -04:00
|
|
|
} else if (MP_OBJ_IS_TYPE(classinfo, &mp_type_tuple)) {
|
2014-03-03 17:38:13 -05:00
|
|
|
mp_obj_tuple_get(classinfo, &len, &items);
|
|
|
|
} else {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "issubclass() arg 2 must be a class or a tuple of classes"));
|
2014-02-27 15:48:25 -05:00
|
|
|
}
|
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
for (uint i = 0; i < len; i++) {
|
2014-04-05 17:45:23 -04:00
|
|
|
// We explicitly check for 'object' here since no-one explicitly derives from it
|
|
|
|
if (items[i] == &mp_type_object || mp_obj_is_subclass_fast(object, items[i])) {
|
2014-03-03 17:38:13 -05:00
|
|
|
return mp_const_true;
|
|
|
|
}
|
2014-02-27 15:48:25 -05:00
|
|
|
}
|
2014-03-03 17:38:13 -05:00
|
|
|
return mp_const_false;
|
2014-02-27 15:48:25 -05:00
|
|
|
}
|
|
|
|
|
2014-02-15 11:10:44 -05:00
|
|
|
STATIC mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) {
|
2014-03-03 17:38:13 -05:00
|
|
|
if (!MP_OBJ_IS_TYPE(object, &mp_type_type)) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "issubclass() arg 1 must be a class"));
|
2014-03-03 17:38:13 -05:00
|
|
|
}
|
|
|
|
return mp_obj_is_subclass(object, classinfo);
|
2014-02-15 11:10:44 -05:00
|
|
|
}
|
|
|
|
|
2014-01-09 16:43:51 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_issubclass_obj, mp_builtin_issubclass);
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t mp_builtin_isinstance(mp_obj_t object, mp_obj_t classinfo) {
|
2014-03-03 17:38:13 -05:00
|
|
|
return mp_obj_is_subclass(mp_obj_get_type(object), classinfo);
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_isinstance_obj, mp_builtin_isinstance);
|
2014-01-11 14:22:29 -05:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
// staticmethod and classmethod types (probably should go in a different file)
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t static_class_method_make_new(mp_obj_t self_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-02-06 15:31:44 -05:00
|
|
|
assert(self_in == &mp_type_staticmethod || self_in == &mp_type_classmethod);
|
|
|
|
|
|
|
|
if (n_args != 1 || n_kw != 0) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "function takes 1 positional argument but %d were given", n_args));
|
2014-02-06 15:31:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_static_class_method_t *o = m_new_obj(mp_obj_static_class_method_t);
|
|
|
|
*o = (mp_obj_static_class_method_t){{(mp_obj_type_t*)self_in}, args[0]};
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-01-11 14:22:29 -05:00
|
|
|
const mp_obj_type_t mp_type_staticmethod = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_staticmethod,
|
2014-02-06 15:31:44 -05:00
|
|
|
.make_new = static_class_method_make_new
|
2014-01-11 14:22:29 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
const mp_obj_type_t mp_type_classmethod = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_classmethod,
|
2014-02-06 15:31:44 -05:00
|
|
|
.make_new = static_class_method_make_new
|
2014-01-11 14:22:29 -05:00
|
|
|
};
|