Convert Python types to proper Python type hierarchy.
Now much more inline with how CPython does types.
This commit is contained in:
@@ -1,13 +1,14 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
//#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "nlr.h"
|
||||
#include "misc.h"
|
||||
#include "mpconfig.h"
|
||||
#include "mpqstr.h"
|
||||
#include "obj.h"
|
||||
#include "runtime0.h"
|
||||
#include "runtime.h"
|
||||
|
||||
typedef struct _mp_obj_tuple_t {
|
||||
mp_obj_base_t base;
|
||||
@@ -20,7 +21,7 @@ static mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur);
|
||||
/******************************************************************************/
|
||||
/* tuple */
|
||||
|
||||
void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in) {
|
||||
static void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in) {
|
||||
mp_obj_tuple_t *o = o_in;
|
||||
print(env, "(");
|
||||
for (int i = 0; i < o->len; i++) {
|
||||
@@ -35,7 +36,48 @@ void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_o
|
||||
print(env, ")");
|
||||
}
|
||||
|
||||
mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
|
||||
// args are in reverse order in the array
|
||||
static mp_obj_t tuple_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
|
||||
switch (n_args) {
|
||||
case 0:
|
||||
// return a empty tuple
|
||||
return mp_const_empty_tuple;
|
||||
|
||||
case 1:
|
||||
{
|
||||
// 1 argument, an iterable from which we make a new tuple
|
||||
if (MP_OBJ_IS_TYPE(args[0], &tuple_type)) {
|
||||
return args[0];
|
||||
}
|
||||
|
||||
// TODO optimise for cases where we know the length of the iterator
|
||||
|
||||
uint alloc = 4;
|
||||
uint len = 0;
|
||||
mp_obj_t *items = m_new(mp_obj_t, alloc);
|
||||
|
||||
mp_obj_t iterable = rt_getiter(args[0]);
|
||||
mp_obj_t item;
|
||||
while ((item = rt_iternext(iterable)) != mp_const_stop_iteration) {
|
||||
if (len >= alloc) {
|
||||
items = m_renew(mp_obj_t, items, alloc, alloc * 2);
|
||||
alloc *= 2;
|
||||
}
|
||||
items[len++] = item;
|
||||
}
|
||||
|
||||
mp_obj_t tuple = mp_obj_new_tuple(len, items);
|
||||
m_free(items, alloc);
|
||||
|
||||
return tuple;
|
||||
}
|
||||
|
||||
default:
|
||||
nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "tuple takes at most 1 argument, %d given", (void*)(machine_int_t)n_args));
|
||||
}
|
||||
}
|
||||
|
||||
static mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
|
||||
mp_obj_tuple_t *o = lhs;
|
||||
switch (op) {
|
||||
case RT_BINARY_OP_SUBSCR:
|
||||
@@ -50,20 +92,15 @@ mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
|
||||
}
|
||||
}
|
||||
|
||||
mp_obj_t tuple_getiter(mp_obj_t o_in) {
|
||||
static mp_obj_t tuple_getiter(mp_obj_t o_in) {
|
||||
return mp_obj_new_tuple_iterator(o_in, 0);
|
||||
}
|
||||
|
||||
void mp_obj_tuple_get(mp_obj_t self_in, uint *len, mp_obj_t **items) {
|
||||
mp_obj_tuple_t *self = self_in;
|
||||
*len = self->len;
|
||||
*items = &self->items[0];
|
||||
}
|
||||
|
||||
const mp_obj_type_t tuple_type = {
|
||||
{ &mp_const_type },
|
||||
"tuple",
|
||||
tuple_print, // print
|
||||
tuple_make_new, // make_new
|
||||
NULL, // call_n
|
||||
NULL, // unary_op
|
||||
tuple_binary_op, // binary_op
|
||||
@@ -72,7 +109,14 @@ const mp_obj_type_t tuple_type = {
|
||||
{{NULL, NULL},}, // method list
|
||||
};
|
||||
|
||||
// the zero-length tuple
|
||||
static const mp_obj_tuple_t empty_tuple_obj = {{&tuple_type}, 0};
|
||||
const mp_obj_t mp_const_empty_tuple = (mp_obj_t)&empty_tuple_obj;
|
||||
|
||||
mp_obj_t mp_obj_new_tuple(uint n, mp_obj_t *items) {
|
||||
if (n == 0) {
|
||||
return mp_const_empty_tuple;
|
||||
}
|
||||
mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n);
|
||||
o->base.type = &tuple_type;
|
||||
o->len = n;
|
||||
@@ -83,6 +127,9 @@ mp_obj_t mp_obj_new_tuple(uint n, mp_obj_t *items) {
|
||||
}
|
||||
|
||||
mp_obj_t mp_obj_new_tuple_reverse(uint n, mp_obj_t *items) {
|
||||
if (n == 0) {
|
||||
return mp_const_empty_tuple;
|
||||
}
|
||||
mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n);
|
||||
o->base.type = &tuple_type;
|
||||
o->len = n;
|
||||
@@ -92,6 +139,12 @@ mp_obj_t mp_obj_new_tuple_reverse(uint n, mp_obj_t *items) {
|
||||
return o;
|
||||
}
|
||||
|
||||
void mp_obj_tuple_get(mp_obj_t self_in, uint *len, mp_obj_t **items) {
|
||||
mp_obj_tuple_t *self = self_in;
|
||||
*len = self->len;
|
||||
*items = &self->items[0];
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
/* tuple iterator */
|
||||
|
||||
@@ -101,7 +154,7 @@ typedef struct _mp_obj_tuple_it_t {
|
||||
machine_uint_t cur;
|
||||
} mp_obj_tuple_it_t;
|
||||
|
||||
mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
|
||||
static mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
|
||||
mp_obj_tuple_it_t *self = self_in;
|
||||
if (self->cur < self->tuple->len) {
|
||||
mp_obj_t o_out = self->tuple->items[self->cur];
|
||||
@@ -116,6 +169,7 @@ static const mp_obj_type_t tuple_it_type = {
|
||||
{ &mp_const_type },
|
||||
"tuple_iterator",
|
||||
NULL, // print
|
||||
NULL, // make_new
|
||||
NULL, // call_n
|
||||
NULL, // unary_op
|
||||
NULL, // binary_op
|
||||
|
||||
Reference in New Issue
Block a user