diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-08-28 22:31:31 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-08-28 22:31:52 +0300 |
| commit | 8b3b2d04a81439eb2c86bd007e9de27aba3d89e8 (patch) | |
| tree | fb4b42640bf15e50303fbd4ddfb943f35f4a6b37 | |
| parent | 936e25b164d837fc91e4bafd76580e747b235dff (diff) | |
| download | micropython-8b3b2d04a81439eb2c86bd007e9de27aba3d89e8.tar.gz micropython-8b3b2d04a81439eb2c86bd007e9de27aba3d89e8.zip | |
objset: frozensets are hashable.
| -rw-r--r-- | py/objset.c | 16 | ||||
| -rw-r--r-- | tests/basics/frozenset1.py | 3 | ||||
| -rw-r--r-- | tests/basics/set1.py | 6 |
3 files changed, 25 insertions, 0 deletions
diff --git a/py/objset.c b/py/objset.c index 6e303fe4bb..9b70ce6289 100644 --- a/py/objset.c +++ b/py/objset.c @@ -473,6 +473,22 @@ STATIC mp_obj_t set_unary_op(mp_uint_t op, mp_obj_t self_in) { switch (op) { case MP_UNARY_OP_BOOL: return MP_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)&mp_type_frozenset; + mp_uint_t max = self->set.alloc; + mp_set_t *set = &self->set; + + for (mp_uint_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 } } diff --git a/tests/basics/frozenset1.py b/tests/basics/frozenset1.py index 00694581f0..7a4a335401 100644 --- a/tests/basics/frozenset1.py +++ b/tests/basics/frozenset1.py @@ -15,3 +15,6 @@ print(s) s = frozenset({3, 4, 3, 1}) print(sorted(s)) + +# frozensets are hashable unlike sets +print({frozenset("1"): 2}) diff --git a/tests/basics/set1.py b/tests/basics/set1.py index 399c33eb68..6afd9eb5ef 100644 --- a/tests/basics/set1.py +++ b/tests/basics/set1.py @@ -5,3 +5,9 @@ print(s) s = {3, 4, 3, 1} print(sorted(s)) + +# Sets are not hashable +try: + {s: 1} +except TypeError: + print("TypeError") |