3aab54bf43
This commit implements a more complete replication of CPython's behaviour for equality and inequality testing of objects. This addresses the issues discussed in #5382 and a few other inconsistencies. Improvements over the old code include: - Support for returning non-boolean results from comparisons (as used by numpy and others). - Support for non-reflexive equality tests. - Preferential use of __ne__ methods and MP_BINARY_OP_NOT_EQUAL binary operators for inequality tests, when available. - Fallback to op2 == op1 or op2 != op1 when op1 does not implement the (in)equality operators. The scheme here makes use of a new flag, MP_TYPE_FLAG_NEEDS_FULL_EQ_TEST, in the flags word of mp_obj_type_t to indicate if various shortcuts can or cannot be used when performing equality and inequality tests. Currently four built-in classes have the flag set: float and complex are non-reflexive (since nan != nan) while bytearray and frozenszet instances can equal other builtin class instances (bytes and set respectively). The flag is also set for any new class defined by the user. This commit also includes a more comprehensive set of tests for the behaviour of (in)equality operators implemented in special methods.
594 lines
21 KiB
C
594 lines
21 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013-2017 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 <stdbool.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/runtime.h"
|
|
#include "py/builtin.h"
|
|
|
|
#if MICROPY_PY_BUILTINS_SET
|
|
|
|
typedef struct _mp_obj_set_t {
|
|
mp_obj_base_t base;
|
|
mp_set_t set;
|
|
} mp_obj_set_t;
|
|
|
|
typedef struct _mp_obj_set_it_t {
|
|
mp_obj_base_t base;
|
|
mp_fun_1_t iternext;
|
|
mp_obj_set_t *set;
|
|
size_t cur;
|
|
} mp_obj_set_it_t;
|
|
|
|
STATIC bool is_set_or_frozenset(mp_obj_t o) {
|
|
return mp_obj_is_type(o, &mp_type_set)
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
|| mp_obj_is_type(o, &mp_type_frozenset)
|
|
#endif
|
|
;
|
|
}
|
|
|
|
// This macro is shorthand for mp_check_self to verify the argument is a set.
|
|
#define check_set(o) mp_check_self(mp_obj_is_type(o, &mp_type_set))
|
|
|
|
// This macro is shorthand for mp_check_self to verify the argument is a
|
|
// set or frozenset for methods that operate on both of these types.
|
|
#define check_set_or_frozenset(o) mp_check_self(is_set_or_frozenset(o))
|
|
|
|
STATIC void set_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
(void)kind;
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
bool is_frozen = mp_obj_is_type(self_in, &mp_type_frozenset);
|
|
#endif
|
|
if (self->set.used == 0) {
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
if (is_frozen) {
|
|
mp_print_str(print, "frozen");
|
|
}
|
|
#endif
|
|
mp_print_str(print, "set()");
|
|
return;
|
|
}
|
|
bool first = true;
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
if (is_frozen) {
|
|
mp_print_str(print, "frozenset(");
|
|
}
|
|
#endif
|
|
mp_print_str(print, "{");
|
|
for (size_t i = 0; i < self->set.alloc; i++) {
|
|
if (mp_set_slot_is_filled(&self->set, i)) {
|
|
if (!first) {
|
|
mp_print_str(print, ", ");
|
|
}
|
|
first = false;
|
|
mp_obj_print_helper(print, self->set.table[i], PRINT_REPR);
|
|
}
|
|
}
|
|
mp_print_str(print, "}");
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
if (is_frozen) {
|
|
mp_print_str(print, ")");
|
|
}
|
|
#endif
|
|
}
|
|
|
|
STATIC mp_obj_t set_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
mp_arg_check_num(n_args, n_kw, 0, 1, false);
|
|
|
|
switch (n_args) {
|
|
case 0: {
|
|
// create a new, empty set
|
|
mp_obj_set_t *set = MP_OBJ_TO_PTR(mp_obj_new_set(0, NULL));
|
|
// set actual set/frozenset type
|
|
set->base.type = type;
|
|
return MP_OBJ_FROM_PTR(set);
|
|
}
|
|
|
|
case 1:
|
|
default: { // can only be 0 or 1 arg
|
|
// 1 argument, an iterable from which we make a new set
|
|
mp_obj_t set = mp_obj_new_set(0, NULL);
|
|
mp_obj_t iterable = mp_getiter(args[0], NULL);
|
|
mp_obj_t item;
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
|
mp_obj_set_store(set, item);
|
|
}
|
|
// Set actual set/frozenset type
|
|
((mp_obj_set_t*)MP_OBJ_TO_PTR(set))->base.type = type;
|
|
return set;
|
|
}
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t set_it_iternext(mp_obj_t self_in) {
|
|
mp_obj_set_it_t *self = MP_OBJ_TO_PTR(self_in);
|
|
size_t max = self->set->set.alloc;
|
|
mp_set_t *set = &self->set->set;
|
|
|
|
for (size_t i = self->cur; i < max; i++) {
|
|
if (mp_set_slot_is_filled(set, i)) {
|
|
self->cur = i + 1;
|
|
return set->table[i];
|
|
}
|
|
}
|
|
|
|
return MP_OBJ_STOP_ITERATION;
|
|
}
|
|
|
|
STATIC mp_obj_t set_getiter(mp_obj_t set_in, mp_obj_iter_buf_t *iter_buf) {
|
|
assert(sizeof(mp_obj_set_it_t) <= sizeof(mp_obj_iter_buf_t));
|
|
mp_obj_set_it_t *o = (mp_obj_set_it_t*)iter_buf;
|
|
o->base.type = &mp_type_polymorph_iter;
|
|
o->iternext = set_it_iternext;
|
|
o->set = (mp_obj_set_t *)MP_OBJ_TO_PTR(set_in);
|
|
o->cur = 0;
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
|
|
/******************************************************************************/
|
|
/* set methods */
|
|
|
|
STATIC mp_obj_t set_add(mp_obj_t self_in, mp_obj_t item) {
|
|
check_set(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_add_obj, set_add);
|
|
|
|
STATIC mp_obj_t set_clear(mp_obj_t self_in) {
|
|
check_set(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_set_clear(&self->set);
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_clear_obj, set_clear);
|
|
|
|
STATIC mp_obj_t set_copy(mp_obj_t self_in) {
|
|
check_set_or_frozenset(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_obj_set_t *other = m_new_obj(mp_obj_set_t);
|
|
other->base.type = self->base.type;
|
|
mp_set_init(&other->set, self->set.alloc);
|
|
other->set.used = self->set.used;
|
|
memcpy(other->set.table, self->set.table, self->set.alloc * sizeof(mp_obj_t));
|
|
return MP_OBJ_FROM_PTR(other);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_copy_obj, set_copy);
|
|
|
|
STATIC mp_obj_t set_discard(mp_obj_t self_in, mp_obj_t item) {
|
|
check_set(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_discard_obj, set_discard);
|
|
|
|
STATIC mp_obj_t set_diff_int(size_t n_args, const mp_obj_t *args, bool update) {
|
|
mp_obj_t self;
|
|
if (update) {
|
|
check_set(args[0]);
|
|
self = args[0];
|
|
} else {
|
|
self = set_copy(args[0]);
|
|
}
|
|
|
|
for (size_t i = 1; i < n_args; i++) {
|
|
mp_obj_t other = args[i];
|
|
if (self == other) {
|
|
set_clear(self);
|
|
} else {
|
|
mp_set_t *self_set = &((mp_obj_set_t*)MP_OBJ_TO_PTR(self))->set;
|
|
mp_obj_t iter = mp_getiter(other, NULL);
|
|
mp_obj_t next;
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
mp_set_lookup(self_set, next, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
}
|
|
}
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
STATIC mp_obj_t set_diff(size_t n_args, const mp_obj_t *args) {
|
|
return set_diff_int(n_args, args, false);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_obj, 1, set_diff);
|
|
|
|
STATIC mp_obj_t set_diff_update(size_t n_args, const mp_obj_t *args) {
|
|
set_diff_int(n_args, args, true);
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_update_obj, 1, set_diff_update);
|
|
|
|
STATIC mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update) {
|
|
if (update) {
|
|
check_set(self_in);
|
|
} else {
|
|
check_set_or_frozenset(self_in);
|
|
}
|
|
|
|
if (self_in == other) {
|
|
return update ? mp_const_none : set_copy(self_in);
|
|
}
|
|
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_obj_set_t *out = MP_OBJ_TO_PTR(mp_obj_new_set(0, NULL));
|
|
|
|
mp_obj_t iter = mp_getiter(other, NULL);
|
|
mp_obj_t next;
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) {
|
|
set_add(MP_OBJ_FROM_PTR(out), next);
|
|
}
|
|
}
|
|
|
|
if (update) {
|
|
m_del(mp_obj_t, self->set.table, self->set.alloc);
|
|
self->set.alloc = out->set.alloc;
|
|
self->set.used = out->set.used;
|
|
self->set.table = out->set.table;
|
|
}
|
|
|
|
return update ? mp_const_none : MP_OBJ_FROM_PTR(out);
|
|
}
|
|
|
|
STATIC mp_obj_t set_intersect(mp_obj_t self_in, mp_obj_t other) {
|
|
return set_intersect_int(self_in, other, false);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_obj, set_intersect);
|
|
|
|
STATIC mp_obj_t set_intersect_update(mp_obj_t self_in, mp_obj_t other) {
|
|
return set_intersect_int(self_in, other, true);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_update_obj, set_intersect_update);
|
|
|
|
STATIC mp_obj_t set_isdisjoint(mp_obj_t self_in, mp_obj_t other) {
|
|
check_set_or_frozenset(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
|
|
mp_obj_iter_buf_t iter_buf;
|
|
mp_obj_t iter = mp_getiter(other, &iter_buf);
|
|
mp_obj_t next;
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) {
|
|
return mp_const_false;
|
|
}
|
|
}
|
|
return mp_const_true;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_isdisjoint_obj, set_isdisjoint);
|
|
|
|
STATIC mp_obj_t set_issubset_internal(mp_obj_t self_in, mp_obj_t other_in, bool proper) {
|
|
mp_obj_set_t *self;
|
|
bool cleanup_self = false;
|
|
if (is_set_or_frozenset(self_in)) {
|
|
self = MP_OBJ_TO_PTR(self_in);
|
|
} else {
|
|
self = MP_OBJ_TO_PTR(set_make_new(&mp_type_set, 1, 0, &self_in));
|
|
cleanup_self = true;
|
|
}
|
|
|
|
mp_obj_set_t *other;
|
|
bool cleanup_other = false;
|
|
if (is_set_or_frozenset(other_in)) {
|
|
other = MP_OBJ_TO_PTR(other_in);
|
|
} else {
|
|
other = MP_OBJ_TO_PTR(set_make_new(&mp_type_set, 1, 0, &other_in));
|
|
cleanup_other = true;
|
|
}
|
|
mp_obj_t out = mp_const_true;
|
|
if (proper && self->set.used == other->set.used) {
|
|
out = mp_const_false;
|
|
} else {
|
|
mp_obj_iter_buf_t iter_buf;
|
|
mp_obj_t iter = set_getiter(MP_OBJ_FROM_PTR(self), &iter_buf);
|
|
mp_obj_t next;
|
|
while ((next = set_it_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
if (!mp_set_lookup(&other->set, next, MP_MAP_LOOKUP)) {
|
|
out = mp_const_false;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
// TODO: Should free objects altogether
|
|
if (cleanup_self) {
|
|
set_clear(MP_OBJ_FROM_PTR(self));
|
|
}
|
|
if (cleanup_other) {
|
|
set_clear(MP_OBJ_FROM_PTR(other));
|
|
}
|
|
return out;
|
|
}
|
|
|
|
STATIC mp_obj_t set_issubset(mp_obj_t self_in, mp_obj_t other_in) {
|
|
return set_issubset_internal(self_in, other_in, false);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_issubset_obj, set_issubset);
|
|
|
|
STATIC mp_obj_t set_issubset_proper(mp_obj_t self_in, mp_obj_t other_in) {
|
|
return set_issubset_internal(self_in, other_in, true);
|
|
}
|
|
|
|
STATIC mp_obj_t set_issuperset(mp_obj_t self_in, mp_obj_t other_in) {
|
|
return set_issubset_internal(other_in, self_in, false);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_issuperset_obj, set_issuperset);
|
|
|
|
STATIC mp_obj_t set_issuperset_proper(mp_obj_t self_in, mp_obj_t other_in) {
|
|
return set_issubset_internal(other_in, self_in, true);
|
|
}
|
|
|
|
STATIC mp_obj_t set_equal(mp_obj_t self_in, mp_obj_t other_in) {
|
|
assert(is_set_or_frozenset(other_in));
|
|
check_set_or_frozenset(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_obj_set_t *other = MP_OBJ_TO_PTR(other_in);
|
|
if (self->set.used != other->set.used) {
|
|
return mp_const_false;
|
|
}
|
|
return set_issubset(self_in, other_in);
|
|
}
|
|
|
|
STATIC mp_obj_t set_pop(mp_obj_t self_in) {
|
|
check_set(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_obj_t obj = mp_set_remove_first(&self->set);
|
|
if (obj == MP_OBJ_NULL) {
|
|
mp_raise_msg(&mp_type_KeyError, "pop from an empty set");
|
|
}
|
|
return obj;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_pop_obj, set_pop);
|
|
|
|
STATIC mp_obj_t set_remove(mp_obj_t self_in, mp_obj_t item) {
|
|
check_set(self_in);
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
if (mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND) == MP_OBJ_NULL) {
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, item));
|
|
}
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_remove_obj, set_remove);
|
|
|
|
STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other_in) {
|
|
check_set_or_frozenset(self_in); // can be frozenset due to call from set_symmetric_difference
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_obj_t iter = mp_getiter(other_in, NULL);
|
|
mp_obj_t next;
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND_OR_REMOVE_IF_FOUND);
|
|
}
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_update_obj, set_symmetric_difference_update);
|
|
|
|
STATIC mp_obj_t set_symmetric_difference(mp_obj_t self_in, mp_obj_t other_in) {
|
|
mp_obj_t self_out = set_copy(self_in);
|
|
set_symmetric_difference_update(self_out, other_in);
|
|
return self_out;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_difference);
|
|
|
|
STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) {
|
|
mp_obj_t iter = mp_getiter(other_in, NULL);
|
|
mp_obj_t next;
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t set_update(size_t n_args, const mp_obj_t *args) {
|
|
check_set(args[0]);
|
|
for (size_t i = 1; i < n_args; i++) {
|
|
set_update_int(MP_OBJ_TO_PTR(args[0]), args[i]);
|
|
}
|
|
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_update_obj, 1, set_update);
|
|
|
|
STATIC mp_obj_t set_union(mp_obj_t self_in, mp_obj_t other_in) {
|
|
check_set_or_frozenset(self_in);
|
|
mp_obj_t self = set_copy(self_in);
|
|
set_update_int(MP_OBJ_TO_PTR(self), other_in);
|
|
return self;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_union_obj, set_union);
|
|
|
|
STATIC mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
switch (op) {
|
|
case MP_UNARY_OP_BOOL: return mp_obj_new_bool(self->set.used != 0);
|
|
case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->set.used);
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
case MP_UNARY_OP_HASH:
|
|
if (mp_obj_is_type(self_in, &mp_type_frozenset)) {
|
|
// start hash with unique value
|
|
mp_int_t hash = (mp_int_t)(uintptr_t)&mp_type_frozenset;
|
|
size_t max = self->set.alloc;
|
|
mp_set_t *set = &self->set;
|
|
|
|
for (size_t i = 0; i < max; i++) {
|
|
if (mp_set_slot_is_filled(set, i)) {
|
|
hash += MP_OBJ_SMALL_INT_VALUE(mp_unary_op(MP_UNARY_OP_HASH, set->table[i]));
|
|
}
|
|
}
|
|
return MP_OBJ_NEW_SMALL_INT(hash);
|
|
}
|
|
#endif
|
|
default: return MP_OBJ_NULL; // op not supported
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t set_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
|
|
mp_obj_t args[] = {lhs, rhs};
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
bool update = mp_obj_is_type(lhs, &mp_type_set);
|
|
#else
|
|
bool update = true;
|
|
#endif
|
|
if (op != MP_BINARY_OP_CONTAINS && !is_set_or_frozenset(rhs)) {
|
|
// For all ops except containment the RHS must be a set/frozenset
|
|
return MP_OBJ_NULL;
|
|
}
|
|
switch (op) {
|
|
case MP_BINARY_OP_OR:
|
|
return set_union(lhs, rhs);
|
|
case MP_BINARY_OP_XOR:
|
|
return set_symmetric_difference(lhs, rhs);
|
|
case MP_BINARY_OP_AND:
|
|
return set_intersect(lhs, rhs);
|
|
case MP_BINARY_OP_SUBTRACT:
|
|
return set_diff(2, args);
|
|
case MP_BINARY_OP_INPLACE_OR:
|
|
if (update) {
|
|
set_update(2, args);
|
|
return lhs;
|
|
} else {
|
|
return set_union(lhs, rhs);
|
|
}
|
|
case MP_BINARY_OP_INPLACE_XOR:
|
|
if (update) {
|
|
set_symmetric_difference_update(lhs, rhs);
|
|
return lhs;
|
|
} else {
|
|
return set_symmetric_difference(lhs, rhs);
|
|
}
|
|
case MP_BINARY_OP_INPLACE_AND:
|
|
rhs = set_intersect_int(lhs, rhs, update);
|
|
if (update) {
|
|
return lhs;
|
|
} else {
|
|
return rhs;
|
|
}
|
|
case MP_BINARY_OP_INPLACE_SUBTRACT:
|
|
return set_diff_int(2, args, update);
|
|
case MP_BINARY_OP_LESS:
|
|
return set_issubset_proper(lhs, rhs);
|
|
case MP_BINARY_OP_MORE:
|
|
return set_issuperset_proper(lhs, rhs);
|
|
case MP_BINARY_OP_EQUAL:
|
|
return set_equal(lhs, rhs);
|
|
case MP_BINARY_OP_LESS_EQUAL:
|
|
return set_issubset(lhs, rhs);
|
|
case MP_BINARY_OP_MORE_EQUAL:
|
|
return set_issuperset(lhs, rhs);
|
|
case MP_BINARY_OP_CONTAINS: {
|
|
mp_obj_set_t *o = MP_OBJ_TO_PTR(lhs);
|
|
mp_obj_t elem = mp_set_lookup(&o->set, rhs, MP_MAP_LOOKUP);
|
|
return mp_obj_new_bool(elem != MP_OBJ_NULL);
|
|
}
|
|
default:
|
|
return MP_OBJ_NULL; // op not supported
|
|
}
|
|
}
|
|
|
|
/******************************************************************************/
|
|
/* set constructors & public C API */
|
|
|
|
STATIC const mp_rom_map_elem_t set_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_add), MP_ROM_PTR(&set_add_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&set_clear_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&set_copy_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_discard), MP_ROM_PTR(&set_discard_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_difference), MP_ROM_PTR(&set_diff_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_difference_update), MP_ROM_PTR(&set_diff_update_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_intersection), MP_ROM_PTR(&set_intersect_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_intersection_update), MP_ROM_PTR(&set_intersect_update_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_isdisjoint), MP_ROM_PTR(&set_isdisjoint_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_issubset), MP_ROM_PTR(&set_issubset_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_issuperset), MP_ROM_PTR(&set_issuperset_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&set_pop_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&set_remove_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_symmetric_difference), MP_ROM_PTR(&set_symmetric_difference_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_symmetric_difference_update), MP_ROM_PTR(&set_symmetric_difference_update_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_union), MP_ROM_PTR(&set_union_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&set_update_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR___contains__), MP_ROM_PTR(&mp_op_contains_obj) },
|
|
};
|
|
STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
|
|
|
|
const mp_obj_type_t mp_type_set = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_set,
|
|
.print = set_print,
|
|
.make_new = set_make_new,
|
|
.unary_op = set_unary_op,
|
|
.binary_op = set_binary_op,
|
|
.getiter = set_getiter,
|
|
.locals_dict = (mp_obj_dict_t*)&set_locals_dict,
|
|
};
|
|
|
|
#if MICROPY_PY_BUILTINS_FROZENSET
|
|
STATIC const mp_rom_map_elem_t frozenset_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&set_copy_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_difference), MP_ROM_PTR(&set_diff_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_intersection), MP_ROM_PTR(&set_intersect_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_isdisjoint), MP_ROM_PTR(&set_isdisjoint_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_issubset), MP_ROM_PTR(&set_issubset_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_issuperset), MP_ROM_PTR(&set_issuperset_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_symmetric_difference), MP_ROM_PTR(&set_symmetric_difference_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_union), MP_ROM_PTR(&set_union_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR___contains__), MP_ROM_PTR(&mp_op_contains_obj) },
|
|
};
|
|
STATIC MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
|
|
|
|
const mp_obj_type_t mp_type_frozenset = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_frozenset,
|
|
.flags = MP_TYPE_FLAG_NEEDS_FULL_EQ_TEST,
|
|
.print = set_print,
|
|
.make_new = set_make_new,
|
|
.unary_op = set_unary_op,
|
|
.binary_op = set_binary_op,
|
|
.getiter = set_getiter,
|
|
.locals_dict = (mp_obj_dict_t*)&frozenset_locals_dict,
|
|
};
|
|
#endif
|
|
|
|
mp_obj_t mp_obj_new_set(size_t n_args, mp_obj_t *items) {
|
|
mp_obj_set_t *o = m_new_obj(mp_obj_set_t);
|
|
o->base.type = &mp_type_set;
|
|
mp_set_init(&o->set, n_args);
|
|
for (size_t i = 0; i < n_args; i++) {
|
|
mp_set_lookup(&o->set, items[i], MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
|
}
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
|
|
void mp_obj_set_store(mp_obj_t self_in, mp_obj_t item) {
|
|
mp_check_self(mp_obj_is_type(self_in, &mp_type_set));
|
|
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
|
}
|
|
|
|
#endif // MICROPY_PY_BUILTINS_SET
|