From 8b3b2d04a81439eb2c86bd007e9de27aba3d89e8 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Fri, 28 Aug 2015 22:31:31 +0300
Subject: [PATCH] objset: frozensets are hashable.

---
 py/objset.c                | 16 ++++++++++++++++
 tests/basics/frozenset1.py |  3 +++
 tests/basics/set1.py       |  6 ++++++
 3 files changed, 25 insertions(+)

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")