Merge map.h into obj.h.

Pretty much everyone needs to include map.h, since it's such an integral
part of the Micro Python object implementation.  Thus, the definitions
are now in obj.h instead.  map.h is removed.

1 files changed, 0 insertions, 48 deletions

diff --git a/py/map.h b/py/map.h
deleted file mode 100644
index 0614af3c42..0000000000
--- a/py/map.h
+++ /dev/null
@@ -1,48 +0,0 @@
-typedef struct _mp_map_elem_t {
-    mp_obj_t key;
-    mp_obj_t value;
-} mp_map_elem_t;
-
-// TODO maybe have a truncated mp_map_t for fixed tables, since alloc=used
-// put alloc last in the structure, so the truncated version does not need it
-// this would save 1 ROM word for all ROM objects that have a locals_dict
-// would also need a trucated dict structure
-
-typedef struct _mp_map_t {
-    machine_uint_t all_keys_are_qstrs : 1;
-    machine_uint_t table_is_fixed_array : 1;
-    machine_uint_t used : (8 * sizeof(machine_uint_t) - 2);
-    machine_uint_t alloc;
-    mp_map_elem_t *table;
-} mp_map_t;
-
-typedef struct _mp_set_t {
-    machine_uint_t alloc;
-    machine_uint_t used;
-    mp_obj_t *table;
-} mp_set_t;
-
-typedef enum _mp_map_lookup_kind_t {
-    MP_MAP_LOOKUP,                    // 0
-    MP_MAP_LOOKUP_ADD_IF_NOT_FOUND,   // 1
-    MP_MAP_LOOKUP_REMOVE_IF_FOUND,    // 2
-    MP_MAP_LOOKUP_FIRST = 4,
-} mp_map_lookup_kind_t;
-
-typedef struct _mp_obj_dict_t {
-    mp_obj_base_t base;
-    mp_map_t map;
-} mp_obj_dict_t;
-
-int get_doubling_prime_greater_or_equal_to(int x);
-void mp_map_init(mp_map_t *map, int n);
-void mp_map_init_fixed_table(mp_map_t *map, int n, const mp_obj_t *table);
-mp_map_t *mp_map_new(int n);
-void mp_map_deinit(mp_map_t *map);
-void mp_map_free(mp_map_t *map);
-mp_map_elem_t* mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
-void mp_map_clear(mp_map_t *map);
-
-void mp_set_init(mp_set_t *set, int n);
-mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
-void mp_set_clear(mp_set_t *set);