xbe | efe3422 | 2014-03-16 00:14:26 -0700 | [diff] [blame] | 1 | #include <stdbool.h> |
John R. Lenton | 3b0bd87 | 2014-01-12 15:56:25 +0000 | [diff] [blame] | 2 | #include <string.h> |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 3 | #include <assert.h> |
| 4 | |
| 5 | #include "nlr.h" |
| 6 | #include "misc.h" |
| 7 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 8 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 9 | #include "obj.h" |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 10 | #include "runtime.h" |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 11 | #include "runtime0.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 12 | |
| 13 | typedef struct _mp_obj_set_t { |
| 14 | mp_obj_base_t base; |
| 15 | mp_set_t set; |
| 16 | } mp_obj_set_t; |
| 17 | |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 18 | typedef struct _mp_obj_set_it_t { |
| 19 | mp_obj_base_t base; |
| 20 | mp_obj_set_t *set; |
| 21 | machine_uint_t cur; |
| 22 | } mp_obj_set_it_t; |
| 23 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 24 | STATIC mp_obj_t set_it_iternext(mp_obj_t self_in); |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 25 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 26 | STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | mp_obj_set_t *self = self_in; |
John R. Lenton | 7244a14 | 2014-01-12 23:37:45 +0000 | [diff] [blame] | 28 | if (self->set.used == 0) { |
| 29 | print(env, "set()"); |
| 30 | return; |
| 31 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 32 | bool first = true; |
| 33 | print(env, "{"); |
| 34 | for (int i = 0; i < self->set.alloc; i++) { |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame^] | 35 | if (MP_SET_SLOT_IS_FILLED(&self->set, i)) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 36 | if (!first) { |
| 37 | print(env, ", "); |
| 38 | } |
| 39 | first = false; |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 40 | mp_obj_print_helper(print, env, self->set.table[i], PRINT_REPR); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 41 | } |
| 42 | } |
| 43 | print(env, "}"); |
| 44 | } |
| 45 | |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 46 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 47 | STATIC mp_obj_t set_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] | 48 | // TODO check n_kw == 0 |
| 49 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 50 | switch (n_args) { |
| 51 | case 0: |
| 52 | // return a new, empty set |
| 53 | return mp_obj_new_set(0, NULL); |
| 54 | |
| 55 | case 1: |
| 56 | { |
| 57 | // 1 argument, an iterable from which we make a new set |
| 58 | mp_obj_t set = mp_obj_new_set(0, NULL); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 59 | mp_obj_t iterable = mp_getiter(args[0]); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 60 | mp_obj_t item; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 61 | while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) { |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 62 | mp_obj_set_store(set, item); |
| 63 | } |
| 64 | return set; |
| 65 | } |
| 66 | |
| 67 | default: |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 68 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "set takes at most 1 argument, %d given", n_args)); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 69 | } |
| 70 | } |
| 71 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 72 | const mp_obj_type_t mp_type_set_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 73 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 74 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 75 | .getiter = mp_identity, |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 76 | .iternext = set_it_iternext, |
| 77 | }; |
| 78 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 79 | STATIC mp_obj_t set_it_iternext(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 80 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set_it)); |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 81 | mp_obj_set_it_t *self = self_in; |
| 82 | machine_uint_t max = self->set->set.alloc; |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame^] | 83 | mp_set_t *set = &self->set->set; |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 84 | |
| 85 | for (machine_uint_t i = self->cur; i < max; i++) { |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame^] | 86 | if (MP_SET_SLOT_IS_FILLED(set, i)) { |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 87 | self->cur = i + 1; |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame^] | 88 | return set->table[i]; |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 89 | } |
| 90 | } |
| 91 | |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 92 | return MP_OBJ_NULL; |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 93 | } |
| 94 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 95 | STATIC mp_obj_t set_getiter(mp_obj_t set_in) { |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 96 | mp_obj_set_it_t *o = m_new_obj(mp_obj_set_it_t); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 97 | o->base.type = &mp_type_set_it; |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 98 | o->set = (mp_obj_set_t *)set_in; |
| 99 | o->cur = 0; |
| 100 | return o; |
| 101 | } |
| 102 | |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 103 | |
| 104 | /******************************************************************************/ |
| 105 | /* set methods */ |
| 106 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 107 | STATIC mp_obj_t set_add(mp_obj_t self_in, mp_obj_t item) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 108 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 109 | mp_obj_set_t *self = self_in; |
John R. Lenton | 2a24172 | 2014-01-12 16:39:39 +0000 | [diff] [blame] | 110 | mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 111 | return mp_const_none; |
| 112 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 113 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_add_obj, set_add); |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 114 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 115 | STATIC mp_obj_t set_clear(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 116 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 1d7fb2f | 2014-01-12 15:44:26 +0000 | [diff] [blame] | 117 | mp_obj_set_t *self = self_in; |
| 118 | |
| 119 | mp_set_clear(&self->set); |
| 120 | |
| 121 | return mp_const_none; |
| 122 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 123 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_clear_obj, set_clear); |
John R. Lenton | 1d7fb2f | 2014-01-12 15:44:26 +0000 | [diff] [blame] | 124 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 125 | STATIC mp_obj_t set_copy(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 126 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 3b0bd87 | 2014-01-12 15:56:25 +0000 | [diff] [blame] | 127 | mp_obj_set_t *self = self_in; |
| 128 | |
| 129 | mp_obj_set_t *other = m_new_obj(mp_obj_set_t); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 130 | other->base.type = &mp_type_set; |
John R. Lenton | 7244a14 | 2014-01-12 23:37:45 +0000 | [diff] [blame] | 131 | mp_set_init(&other->set, self->set.alloc - 1); |
John R. Lenton | 3b0bd87 | 2014-01-12 15:56:25 +0000 | [diff] [blame] | 132 | other->set.used = self->set.used; |
| 133 | memcpy(other->set.table, self->set.table, self->set.alloc * sizeof(mp_obj_t)); |
| 134 | |
| 135 | return other; |
| 136 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 137 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_copy_obj, set_copy); |
John R. Lenton | 3b0bd87 | 2014-01-12 15:56:25 +0000 | [diff] [blame] | 138 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 139 | STATIC mp_obj_t set_discard(mp_obj_t self_in, mp_obj_t item) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 140 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 2a24172 | 2014-01-12 16:39:39 +0000 | [diff] [blame] | 141 | mp_obj_set_t *self = self_in; |
| 142 | mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND); |
| 143 | return mp_const_none; |
| 144 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 145 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_discard_obj, set_discard); |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 146 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 147 | STATIC mp_obj_t set_diff_int(int n_args, const mp_obj_t *args, bool update) { |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 148 | assert(n_args > 0); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 149 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_set)); |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 150 | mp_obj_set_t *self; |
| 151 | if (update) { |
| 152 | self = args[0]; |
| 153 | } else { |
| 154 | self = set_copy(args[0]); |
| 155 | } |
| 156 | |
| 157 | |
| 158 | for (int i = 1; i < n_args; i++) { |
| 159 | mp_obj_t other = args[i]; |
| 160 | if (self == other) { |
| 161 | set_clear(self); |
| 162 | } else { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 163 | mp_obj_t iter = mp_getiter(other); |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 164 | mp_obj_t next; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 165 | while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 166 | set_discard(self, next); |
| 167 | } |
| 168 | } |
| 169 | } |
| 170 | |
| 171 | return self; |
| 172 | } |
| 173 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 174 | STATIC mp_obj_t set_diff(uint n_args, const mp_obj_t *args) { |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 175 | return set_diff_int(n_args, args, false); |
| 176 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 177 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_obj, 1, set_diff); |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 178 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 179 | STATIC mp_obj_t set_diff_update(uint n_args, const mp_obj_t *args) { |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 180 | set_diff_int(n_args, args, true); |
| 181 | return mp_const_none; |
| 182 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 183 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_update_obj, 1, set_diff_update); |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 184 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 185 | STATIC mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 186 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 187 | if (self_in == other) { |
| 188 | return update ? mp_const_none : set_copy(self_in); |
| 189 | } |
| 190 | |
| 191 | mp_obj_set_t *self = self_in; |
| 192 | mp_obj_set_t *out = mp_obj_new_set(0, NULL); |
| 193 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 194 | mp_obj_t iter = mp_getiter(other); |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 195 | mp_obj_t next; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 196 | while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 197 | if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) { |
| 198 | set_add(out, next); |
| 199 | } |
| 200 | } |
| 201 | |
| 202 | if (update) { |
| 203 | m_del(mp_obj_t, self->set.table, self->set.alloc); |
| 204 | self->set.alloc = out->set.alloc; |
| 205 | self->set.used = out->set.used; |
| 206 | self->set.table = out->set.table; |
| 207 | } |
| 208 | |
| 209 | return update ? mp_const_none : out; |
| 210 | } |
| 211 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 212 | STATIC mp_obj_t set_intersect(mp_obj_t self_in, mp_obj_t other) { |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 213 | return set_intersect_int(self_in, other, false); |
| 214 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 215 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_obj, set_intersect); |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 216 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 217 | STATIC mp_obj_t set_intersect_update(mp_obj_t self_in, mp_obj_t other) { |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 218 | return set_intersect_int(self_in, other, true); |
| 219 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 220 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_update_obj, set_intersect_update); |
John R. Lenton | f1ae6b4 | 2014-01-12 17:54:03 +0000 | [diff] [blame] | 221 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 222 | STATIC mp_obj_t set_isdisjoint(mp_obj_t self_in, mp_obj_t other) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 223 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 4a08067 | 2014-01-12 18:03:21 +0000 | [diff] [blame] | 224 | mp_obj_set_t *self = self_in; |
| 225 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 226 | mp_obj_t iter = mp_getiter(other); |
John R. Lenton | 4a08067 | 2014-01-12 18:03:21 +0000 | [diff] [blame] | 227 | mp_obj_t next; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 228 | while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { |
John R. Lenton | 4a08067 | 2014-01-12 18:03:21 +0000 | [diff] [blame] | 229 | if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) { |
| 230 | return mp_const_false; |
| 231 | } |
| 232 | } |
| 233 | return mp_const_true; |
| 234 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 235 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_isdisjoint_obj, set_isdisjoint); |
John R. Lenton | 4a08067 | 2014-01-12 18:03:21 +0000 | [diff] [blame] | 236 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 237 | STATIC mp_obj_t set_issubset_internal(mp_obj_t self_in, mp_obj_t other_in, bool proper) { |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 238 | mp_obj_set_t *self; |
| 239 | bool cleanup_self = false; |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 240 | if (MP_OBJ_IS_TYPE(self_in, &mp_type_set)) { |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 241 | self = self_in; |
| 242 | } else { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 243 | self = set_make_new((mp_obj_t)&mp_type_set, 1, 0, &self_in); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 244 | cleanup_self = true; |
| 245 | } |
| 246 | |
| 247 | mp_obj_set_t *other; |
| 248 | bool cleanup_other = false; |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 249 | if (MP_OBJ_IS_TYPE(other_in, &mp_type_set)) { |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 250 | other = other_in; |
| 251 | } else { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 252 | other = set_make_new((mp_obj_t)&mp_type_set, 1, 0, &other_in); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 253 | cleanup_other = true; |
| 254 | } |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 255 | bool out = true; |
| 256 | if (proper && self->set.used == other->set.used) { |
| 257 | out = false; |
| 258 | } else { |
| 259 | mp_obj_t iter = set_getiter(self); |
| 260 | mp_obj_t next; |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 261 | while ((next = set_it_iternext(iter)) != MP_OBJ_NULL) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 262 | if (!mp_set_lookup(&other->set, next, MP_MAP_LOOKUP)) { |
| 263 | out = false; |
| 264 | break; |
| 265 | } |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 266 | } |
| 267 | } |
| 268 | if (cleanup_self) { |
| 269 | set_clear(self); |
| 270 | } |
| 271 | if (cleanup_other) { |
| 272 | set_clear(other); |
| 273 | } |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 274 | return MP_BOOL(out); |
| 275 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 276 | STATIC mp_obj_t set_issubset(mp_obj_t self_in, mp_obj_t other_in) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 277 | return set_issubset_internal(self_in, other_in, false); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 278 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 279 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_issubset_obj, set_issubset); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 280 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 281 | STATIC mp_obj_t set_issubset_proper(mp_obj_t self_in, mp_obj_t other_in) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 282 | return set_issubset_internal(self_in, other_in, true); |
| 283 | } |
| 284 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 285 | STATIC mp_obj_t set_issuperset(mp_obj_t self_in, mp_obj_t other_in) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 286 | return set_issubset_internal(other_in, self_in, false); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 287 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 288 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_issuperset_obj, set_issuperset); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 289 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 290 | STATIC mp_obj_t set_issuperset_proper(mp_obj_t self_in, mp_obj_t other_in) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 291 | return set_issubset_internal(other_in, self_in, true); |
| 292 | } |
| 293 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 294 | STATIC mp_obj_t set_equal(mp_obj_t self_in, mp_obj_t other_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 295 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 296 | mp_obj_set_t *self = self_in; |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 297 | if (!MP_OBJ_IS_TYPE(other_in, &mp_type_set)) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 298 | return mp_const_false; |
| 299 | } |
| 300 | mp_obj_set_t *other = other_in; |
| 301 | if (self->set.used != other->set.used) { |
| 302 | return mp_const_false; |
| 303 | } |
| 304 | return set_issubset(self_in, other_in); |
| 305 | } |
| 306 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 307 | STATIC mp_obj_t set_pop(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 308 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 309 | mp_obj_set_t *self = self_in; |
Damien George | 95004e5 | 2014-04-05 17:17:19 +0100 | [diff] [blame] | 310 | mp_obj_t obj = mp_set_remove_first(&self->set); |
| 311 | if (obj == MP_OBJ_NULL) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 312 | nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "pop from an empty set")); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 313 | } |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 314 | return obj; |
| 315 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 316 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_pop_obj, set_pop); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 317 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 318 | STATIC mp_obj_t set_remove(mp_obj_t self_in, mp_obj_t item) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 319 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 320 | mp_obj_set_t *self = self_in; |
| 321 | if (mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND) == MP_OBJ_NULL) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 322 | nlr_raise(mp_obj_new_exception(&mp_type_KeyError)); |
John R. Lenton | ae00d33 | 2014-01-12 18:23:36 +0000 | [diff] [blame] | 323 | } |
| 324 | return mp_const_none; |
| 325 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 326 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_remove_obj, set_remove); |
John R. Lenton | 032129f | 2014-01-12 17:07:17 +0000 | [diff] [blame] | 327 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 328 | STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 329 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 330 | mp_obj_set_t *self = self_in; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 331 | mp_obj_t iter = mp_getiter(other_in); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 332 | mp_obj_t next; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 333 | while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 334 | mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_REMOVE_IF_FOUND | MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
| 335 | } |
| 336 | return mp_const_none; |
| 337 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 338 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_update_obj, set_symmetric_difference_update); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 339 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 340 | STATIC mp_obj_t set_symmetric_difference(mp_obj_t self_in, mp_obj_t other_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 341 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 342 | self_in = set_copy(self_in); |
| 343 | set_symmetric_difference_update(self_in, other_in); |
| 344 | return self_in; |
| 345 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 346 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_difference); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 347 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 348 | STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 349 | mp_obj_t iter = mp_getiter(other_in); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 350 | mp_obj_t next; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 351 | while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 352 | mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
| 353 | } |
| 354 | } |
| 355 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 356 | STATIC mp_obj_t set_update(uint n_args, const mp_obj_t *args) { |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 357 | assert(n_args > 0); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 358 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_set)); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 359 | |
| 360 | for (int i = 1; i < n_args; i++) { |
| 361 | set_update_int(args[0], args[i]); |
| 362 | } |
| 363 | |
| 364 | return mp_const_none; |
| 365 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 366 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_update_obj, 1, set_update); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 367 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 368 | STATIC mp_obj_t set_union(mp_obj_t self_in, mp_obj_t other_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 369 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 370 | mp_obj_set_t *self = set_copy(self_in); |
| 371 | set_update_int(self, other_in); |
| 372 | return self; |
| 373 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 374 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_union_obj, set_union); |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 375 | |
Damien George | 95004e5 | 2014-04-05 17:17:19 +0100 | [diff] [blame] | 376 | STATIC mp_obj_t set_unary_op(int op, mp_obj_t self_in) { |
| 377 | mp_obj_set_t *self = self_in; |
| 378 | switch (op) { |
| 379 | case MP_UNARY_OP_BOOL: return MP_BOOL(self->set.used != 0); |
| 380 | case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->set.used); |
| 381 | default: return MP_OBJ_NULL; // op not supported for None |
| 382 | } |
| 383 | } |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 384 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 385 | STATIC mp_obj_t set_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 386 | mp_obj_t args[] = {lhs, rhs}; |
| 387 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 388 | case MP_BINARY_OP_OR: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 389 | return set_union(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 390 | case MP_BINARY_OP_XOR: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 391 | return set_symmetric_difference(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 392 | case MP_BINARY_OP_AND: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 393 | return set_intersect(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 394 | case MP_BINARY_OP_SUBTRACT: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 395 | return set_diff(2, args); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 396 | case MP_BINARY_OP_INPLACE_OR: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 397 | return set_union(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 398 | case MP_BINARY_OP_INPLACE_XOR: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 399 | return set_symmetric_difference(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 400 | case MP_BINARY_OP_INPLACE_AND: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 401 | return set_intersect(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 402 | case MP_BINARY_OP_INPLACE_SUBTRACT: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 403 | return set_diff(2, args); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 404 | case MP_BINARY_OP_LESS: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 405 | return set_issubset_proper(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 406 | case MP_BINARY_OP_MORE: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 407 | return set_issuperset_proper(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 408 | case MP_BINARY_OP_EQUAL: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 409 | return set_equal(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 410 | case MP_BINARY_OP_LESS_EQUAL: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 411 | return set_issubset(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 412 | case MP_BINARY_OP_MORE_EQUAL: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 413 | return set_issuperset(lhs, rhs); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 414 | case MP_BINARY_OP_NOT_EQUAL: |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 415 | return MP_BOOL(set_equal(lhs, rhs) == mp_const_false); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 416 | case MP_BINARY_OP_IN: |
John R. Lenton | 189c8e1 | 2014-01-13 00:52:06 +0000 | [diff] [blame] | 417 | { |
| 418 | mp_obj_set_t *o = lhs; |
| 419 | mp_obj_t elem = mp_set_lookup(&o->set, rhs, MP_MAP_LOOKUP); |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 420 | return MP_BOOL(elem != NULL); |
John R. Lenton | 189c8e1 | 2014-01-13 00:52:06 +0000 | [diff] [blame] | 421 | } |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 422 | default: |
| 423 | // op not supported |
| 424 | return NULL; |
| 425 | } |
| 426 | } |
John R. Lenton | 0de386b | 2014-01-12 19:39:48 +0000 | [diff] [blame] | 427 | |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 428 | /******************************************************************************/ |
| 429 | /* set constructors & public C API */ |
| 430 | |
| 431 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 432 | STATIC const mp_map_elem_t set_locals_dict_table[] = { |
| 433 | { MP_OBJ_NEW_QSTR(MP_QSTR_add), (mp_obj_t)&set_add_obj }, |
| 434 | { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&set_clear_obj }, |
| 435 | { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&set_copy_obj }, |
| 436 | { MP_OBJ_NEW_QSTR(MP_QSTR_discard), (mp_obj_t)&set_discard_obj }, |
| 437 | { MP_OBJ_NEW_QSTR(MP_QSTR_difference), (mp_obj_t)&set_diff_obj }, |
| 438 | { MP_OBJ_NEW_QSTR(MP_QSTR_difference_update), (mp_obj_t)&set_diff_update_obj }, |
| 439 | { MP_OBJ_NEW_QSTR(MP_QSTR_intersection), (mp_obj_t)&set_intersect_obj }, |
| 440 | { MP_OBJ_NEW_QSTR(MP_QSTR_intersection_update), (mp_obj_t)&set_intersect_update_obj }, |
| 441 | { MP_OBJ_NEW_QSTR(MP_QSTR_isdisjoint), (mp_obj_t)&set_isdisjoint_obj }, |
| 442 | { MP_OBJ_NEW_QSTR(MP_QSTR_issubset), (mp_obj_t)&set_issubset_obj }, |
| 443 | { MP_OBJ_NEW_QSTR(MP_QSTR_issuperset), (mp_obj_t)&set_issuperset_obj }, |
| 444 | { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&set_pop_obj }, |
| 445 | { MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&set_remove_obj }, |
| 446 | { MP_OBJ_NEW_QSTR(MP_QSTR_symmetric_difference), (mp_obj_t)&set_symmetric_difference_obj }, |
| 447 | { MP_OBJ_NEW_QSTR(MP_QSTR_symmetric_difference_update), (mp_obj_t)&set_symmetric_difference_update_obj }, |
| 448 | { MP_OBJ_NEW_QSTR(MP_QSTR_union), (mp_obj_t)&set_union_obj }, |
| 449 | { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&set_update_obj }, |
John R. Lenton | 19b14d3 | 2014-01-12 15:29:11 +0000 | [diff] [blame] | 450 | }; |
| 451 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 452 | STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table); |
| 453 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 454 | const mp_obj_type_t mp_type_set = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 455 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 456 | .name = MP_QSTR_set, |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 457 | .print = set_print, |
| 458 | .make_new = set_make_new, |
Damien George | 95004e5 | 2014-04-05 17:17:19 +0100 | [diff] [blame] | 459 | .unary_op = set_unary_op, |
John R. Lenton | be790f9 | 2014-01-12 23:09:10 +0000 | [diff] [blame] | 460 | .binary_op = set_binary_op, |
John R. Lenton | 0ce03b4 | 2014-01-12 15:17:42 +0000 | [diff] [blame] | 461 | .getiter = set_getiter, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 462 | .locals_dict = (mp_obj_t)&set_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 463 | }; |
| 464 | |
| 465 | mp_obj_t mp_obj_new_set(int n_args, mp_obj_t *items) { |
| 466 | mp_obj_set_t *o = m_new_obj(mp_obj_set_t); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 467 | o->base.type = &mp_type_set; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 468 | mp_set_init(&o->set, n_args); |
| 469 | for (int i = 0; i < n_args; i++) { |
John R. Lenton | 2a24172 | 2014-01-12 16:39:39 +0000 | [diff] [blame] | 470 | mp_set_lookup(&o->set, items[i], MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 471 | } |
| 472 | return o; |
| 473 | } |
| 474 | |
| 475 | void mp_obj_set_store(mp_obj_t self_in, mp_obj_t item) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 476 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 477 | mp_obj_set_t *self = self_in; |
John R. Lenton | 2a24172 | 2014-01-12 16:39:39 +0000 | [diff] [blame] | 478 | mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 479 | } |