Paul Sokolovsky | 9ed5435 | 2014-02-02 03:42:07 +0200 | [diff] [blame] | 1 | #include <string.h> |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 2 | #include <assert.h> |
| 3 | |
| 4 | #include "nlr.h" |
| 5 | #include "misc.h" |
| 6 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 7 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 8 | #include "obj.h" |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame^] | 9 | #include "map.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 10 | #include "runtime0.h" |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 11 | #include "runtime.h" |
Paul Sokolovsky | 8eec8bc | 2014-01-12 23:23:10 +0200 | [diff] [blame] | 12 | #include "objtuple.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 13 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 14 | STATIC mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 15 | |
| 16 | /******************************************************************************/ |
| 17 | /* tuple */ |
| 18 | |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 19 | void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 20 | mp_obj_tuple_t *o = o_in; |
| 21 | print(env, "("); |
| 22 | for (int i = 0; i < o->len; i++) { |
| 23 | if (i > 0) { |
| 24 | print(env, ", "); |
| 25 | } |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 26 | mp_obj_print_helper(print, env, o->items[i], PRINT_REPR); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | } |
| 28 | if (o->len == 1) { |
| 29 | print(env, ","); |
| 30 | } |
| 31 | print(env, ")"); |
| 32 | } |
| 33 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 34 | STATIC mp_obj_t tuple_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 35 | // TODO check n_kw == 0 |
| 36 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 37 | switch (n_args) { |
| 38 | case 0: |
| 39 | // return a empty tuple |
| 40 | return mp_const_empty_tuple; |
| 41 | |
| 42 | case 1: |
| 43 | { |
| 44 | // 1 argument, an iterable from which we make a new tuple |
| 45 | if (MP_OBJ_IS_TYPE(args[0], &tuple_type)) { |
| 46 | return args[0]; |
| 47 | } |
| 48 | |
| 49 | // TODO optimise for cases where we know the length of the iterator |
| 50 | |
| 51 | uint alloc = 4; |
| 52 | uint len = 0; |
| 53 | mp_obj_t *items = m_new(mp_obj_t, alloc); |
| 54 | |
| 55 | mp_obj_t iterable = rt_getiter(args[0]); |
| 56 | mp_obj_t item; |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 57 | while ((item = rt_iternext(iterable)) != MP_OBJ_NULL) { |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 58 | if (len >= alloc) { |
| 59 | items = m_renew(mp_obj_t, items, alloc, alloc * 2); |
| 60 | alloc *= 2; |
| 61 | } |
| 62 | items[len++] = item; |
| 63 | } |
| 64 | |
| 65 | mp_obj_t tuple = mp_obj_new_tuple(len, items); |
| 66 | m_free(items, alloc); |
| 67 | |
| 68 | return tuple; |
| 69 | } |
| 70 | |
| 71 | default: |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 72 | nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "tuple takes at most 1 argument, %d given", n_args)); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 73 | } |
| 74 | } |
| 75 | |
Paul Sokolovsky | e827e98 | 2014-02-08 22:55:00 +0200 | [diff] [blame] | 76 | // Don't pass RT_BINARY_OP_NOT_EQUAL here |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 77 | STATIC bool tuple_cmp_helper(int op, mp_obj_t self_in, mp_obj_t another_in) { |
Paul Sokolovsky | e827e98 | 2014-02-08 22:55:00 +0200 | [diff] [blame] | 78 | assert(MP_OBJ_IS_TYPE(self_in, &tuple_type)); |
| 79 | if (!MP_OBJ_IS_TYPE(another_in, &tuple_type)) { |
| 80 | return false; |
| 81 | } |
| 82 | mp_obj_tuple_t *self = self_in; |
| 83 | mp_obj_tuple_t *another = another_in; |
| 84 | |
| 85 | return mp_seq_cmp_objs(op, self->items, self->len, another->items, another->len); |
| 86 | } |
| 87 | |
Paul Sokolovsky | e74f52b | 2014-02-27 22:49:47 +0200 | [diff] [blame] | 88 | mp_obj_t tuple_unary_op(int op, mp_obj_t self_in) { |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 89 | mp_obj_tuple_t *self = self_in; |
| 90 | switch (op) { |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 91 | case RT_UNARY_OP_BOOL: return MP_BOOL(self->len != 0); |
| 92 | case RT_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len); |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 93 | default: return MP_OBJ_NULL; // op not supported for None |
| 94 | } |
| 95 | } |
| 96 | |
Paul Sokolovsky | e74f52b | 2014-02-27 22:49:47 +0200 | [diff] [blame] | 97 | mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 98 | mp_obj_tuple_t *o = lhs; |
| 99 | switch (op) { |
| 100 | case RT_BINARY_OP_SUBSCR: |
| 101 | { |
Paul Sokolovsky | 9ed5435 | 2014-02-02 03:42:07 +0200 | [diff] [blame] | 102 | #if MICROPY_ENABLE_SLICE |
| 103 | if (MP_OBJ_IS_TYPE(rhs, &slice_type)) { |
| 104 | machine_uint_t start, stop; |
Paul Sokolovsky | ea2509d | 2014-02-02 08:57:05 +0200 | [diff] [blame] | 105 | if (!m_seq_get_fast_slice_indexes(o->len, rhs, &start, &stop)) { |
| 106 | assert(0); |
| 107 | } |
Paul Sokolovsky | 9ed5435 | 2014-02-02 03:42:07 +0200 | [diff] [blame] | 108 | mp_obj_tuple_t *res = mp_obj_new_tuple(stop - start, NULL); |
| 109 | m_seq_copy(res->items, o->items + start, res->len, mp_obj_t); |
| 110 | return res; |
| 111 | } |
| 112 | #endif |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 113 | uint index = mp_get_index(o->base.type, o->len, rhs, false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 114 | return o->items[index]; |
| 115 | } |
Paul Sokolovsky | ee4aaf7 | 2014-02-08 23:17:51 +0200 | [diff] [blame] | 116 | case RT_BINARY_OP_ADD: |
| 117 | { |
Paul Sokolovsky | e74f52b | 2014-02-27 22:49:47 +0200 | [diff] [blame] | 118 | if (!mp_obj_is_subclass_fast(mp_obj_get_type(rhs), (mp_obj_t)&tuple_type)) { |
Paul Sokolovsky | ee4aaf7 | 2014-02-08 23:17:51 +0200 | [diff] [blame] | 119 | return NULL; |
| 120 | } |
| 121 | mp_obj_tuple_t *p = rhs; |
| 122 | mp_obj_tuple_t *s = mp_obj_new_tuple(o->len + p->len, NULL); |
| 123 | m_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t); |
| 124 | return s; |
| 125 | } |
Paul Sokolovsky | f7c2410 | 2014-02-08 23:19:48 +0200 | [diff] [blame] | 126 | case RT_BINARY_OP_MULTIPLY: |
| 127 | { |
| 128 | if (!MP_OBJ_IS_SMALL_INT(rhs)) { |
| 129 | return NULL; |
| 130 | } |
| 131 | int n = MP_OBJ_SMALL_INT_VALUE(rhs); |
| 132 | mp_obj_tuple_t *s = mp_obj_new_tuple(o->len * n, NULL); |
| 133 | mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items); |
| 134 | return s; |
| 135 | } |
Paul Sokolovsky | e827e98 | 2014-02-08 22:55:00 +0200 | [diff] [blame] | 136 | case RT_BINARY_OP_EQUAL: |
| 137 | case RT_BINARY_OP_LESS: |
| 138 | case RT_BINARY_OP_LESS_EQUAL: |
| 139 | case RT_BINARY_OP_MORE: |
| 140 | case RT_BINARY_OP_MORE_EQUAL: |
| 141 | return MP_BOOL(tuple_cmp_helper(op, lhs, rhs)); |
| 142 | case RT_BINARY_OP_NOT_EQUAL: |
| 143 | return MP_BOOL(!tuple_cmp_helper(RT_BINARY_OP_EQUAL, lhs, rhs)); |
| 144 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 145 | default: |
| 146 | // op not supported |
| 147 | return NULL; |
| 148 | } |
| 149 | } |
| 150 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 151 | STATIC mp_obj_t tuple_getiter(mp_obj_t o_in) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 152 | return mp_obj_new_tuple_iterator(o_in, 0); |
| 153 | } |
| 154 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 155 | STATIC mp_obj_t tuple_count(mp_obj_t self_in, mp_obj_t value) { |
Paul Sokolovsky | ac0134d | 2014-02-10 07:10:55 +0200 | [diff] [blame] | 156 | assert(MP_OBJ_IS_TYPE(self_in, &tuple_type)); |
| 157 | mp_obj_tuple_t *self = self_in; |
| 158 | return mp_seq_count_obj(self->items, self->len, value); |
| 159 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 160 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(tuple_count_obj, tuple_count); |
Paul Sokolovsky | ac0134d | 2014-02-10 07:10:55 +0200 | [diff] [blame] | 161 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 162 | STATIC mp_obj_t tuple_index(uint n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 624eff6 | 2014-02-10 06:42:20 +0200 | [diff] [blame] | 163 | assert(MP_OBJ_IS_TYPE(args[0], &tuple_type)); |
| 164 | mp_obj_tuple_t *self = args[0]; |
| 165 | return mp_seq_index_obj(self->items, self->len, n_args, args); |
| 166 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 167 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tuple_index_obj, 2, 4, tuple_index); |
Paul Sokolovsky | 624eff6 | 2014-02-10 06:42:20 +0200 | [diff] [blame] | 168 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame^] | 169 | STATIC const mp_map_elem_t tuple_locals_dict_table[] = { |
| 170 | { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&tuple_count_obj }, |
| 171 | { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&tuple_index_obj }, |
Paul Sokolovsky | 624eff6 | 2014-02-10 06:42:20 +0200 | [diff] [blame] | 172 | }; |
| 173 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame^] | 174 | STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table); |
| 175 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 176 | const mp_obj_type_t tuple_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 177 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 178 | .name = MP_QSTR_tuple, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 179 | .print = tuple_print, |
| 180 | .make_new = tuple_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 181 | .unary_op = tuple_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 182 | .binary_op = tuple_binary_op, |
| 183 | .getiter = tuple_getiter, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame^] | 184 | .locals_dict = (mp_obj_t)&tuple_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 185 | }; |
| 186 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 187 | // the zero-length tuple |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 188 | STATIC const mp_obj_tuple_t empty_tuple_obj = {{&tuple_type}, 0}; |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 189 | const mp_obj_t mp_const_empty_tuple = (mp_obj_t)&empty_tuple_obj; |
| 190 | |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 191 | mp_obj_t mp_obj_new_tuple(uint n, const mp_obj_t *items) { |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 192 | if (n == 0) { |
| 193 | return mp_const_empty_tuple; |
| 194 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 195 | mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n); |
| 196 | o->base.type = &tuple_type; |
| 197 | o->len = n; |
John R. Lenton | 07205ec | 2014-01-13 02:31:00 +0000 | [diff] [blame] | 198 | if (items) { |
| 199 | for (int i = 0; i < n; i++) { |
| 200 | o->items[i] = items[i]; |
| 201 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 202 | } |
| 203 | return o; |
| 204 | } |
| 205 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 206 | void mp_obj_tuple_get(mp_obj_t self_in, uint *len, mp_obj_t **items) { |
Damien George | 004cdce | 2014-01-09 21:43:51 +0000 | [diff] [blame] | 207 | assert(MP_OBJ_IS_TYPE(self_in, &tuple_type)); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 208 | mp_obj_tuple_t *self = self_in; |
John R. Lenton | 07205ec | 2014-01-13 02:31:00 +0000 | [diff] [blame] | 209 | if (len) { |
| 210 | *len = self->len; |
| 211 | } |
| 212 | if (items) { |
| 213 | *items = &self->items[0]; |
| 214 | } |
| 215 | } |
| 216 | |
| 217 | void mp_obj_tuple_del(mp_obj_t self_in) { |
| 218 | assert(MP_OBJ_IS_TYPE(self_in, &tuple_type)); |
| 219 | mp_obj_tuple_t *self = self_in; |
| 220 | m_del_var(mp_obj_tuple_t, mp_obj_t, self->len, self); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 221 | } |
| 222 | |
Damien George | 7f8be59 | 2014-03-20 19:20:59 +0000 | [diff] [blame] | 223 | machine_int_t mp_obj_tuple_hash(mp_obj_t self_in) { |
| 224 | assert(MP_OBJ_IS_TYPE(self_in, &tuple_type)); |
| 225 | mp_obj_tuple_t *self = self_in; |
| 226 | // start hash with pointer to empty tuple, to make it fairly unique |
| 227 | machine_int_t hash = (machine_int_t)mp_const_empty_tuple; |
| 228 | for (uint i = 0; i < self->len; i++) { |
| 229 | hash += mp_obj_hash(self->items[i]); |
| 230 | } |
| 231 | return hash; |
| 232 | } |
| 233 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 234 | /******************************************************************************/ |
| 235 | /* tuple iterator */ |
| 236 | |
| 237 | typedef struct _mp_obj_tuple_it_t { |
| 238 | mp_obj_base_t base; |
| 239 | mp_obj_tuple_t *tuple; |
| 240 | machine_uint_t cur; |
| 241 | } mp_obj_tuple_it_t; |
| 242 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 243 | STATIC mp_obj_t tuple_it_iternext(mp_obj_t self_in) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 244 | mp_obj_tuple_it_t *self = self_in; |
| 245 | if (self->cur < self->tuple->len) { |
| 246 | mp_obj_t o_out = self->tuple->items[self->cur]; |
| 247 | self->cur += 1; |
| 248 | return o_out; |
| 249 | } else { |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 250 | return MP_OBJ_NULL; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 251 | } |
| 252 | } |
| 253 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 254 | STATIC const mp_obj_type_t tuple_it_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 255 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 256 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 257 | .iternext = tuple_it_iternext, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 258 | }; |
| 259 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 260 | STATIC mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 261 | mp_obj_tuple_it_t *o = m_new_obj(mp_obj_tuple_it_t); |
| 262 | o->base.type = &tuple_it_type; |
| 263 | o->tuple = tuple; |
| 264 | o->cur = cur; |
| 265 | return o; |
| 266 | } |