Fix includes

Author: GrieferAtWork

include/deemon/dict.h

@@ -31,7 +31,7 @@
 
 #include "object.h"
 #include "types.h"        /* DREF, DeeObject, DeeObject_InstanceOf, DeeObject_InstanceOfExact, DeeTypeObject, Dee_OBJECT_HEAD, Dee_OBJECT_HEAD_INIT, Dee_WEAKREF_SUPPORT, Dee_WEAKREF_SUPPORT_INIT, Dee_hash_t */
-#include "util/hash-io.h" /* DeeHash_EmptyHTab, DeeHash_EmptyVTab, Dee_hash_gethidx8, Dee_hash_gethidx_t, Dee_hash_htab, Dee_hash_sethidx8, Dee_hash_sethidx_t, Dee_hash_vidx_t, _DeeHash_HTabGet, _DeeHash_HTabSet, _DeeHash_HashIdxInit, _DeeHash_HashIdxNext, _DeeHash_VIRT_GetRealVTab, _DeeHash_VIRT_GetVirtVTab, _DeeHash_VIRT_SetRealVTab, _DeeHash_VIRT_SetVirtVTab */
+#include "util/hash-io.h" /* DeeHash_EmptyHTab, DeeHash_EmptyVTab, Dee_hash_hidxio, Dee_hash_hidxio_ops, Dee_hash_htab, Dee_hash_vidx_t, _DeeHash_HashIdxInit, _DeeHash_HashIdxNext, _DeeHash_VIRT_GetRealVTab, _DeeHash_VIRT_GetVirtVTab, _DeeHash_VIRT_SetRealVTab, _DeeHash_VIRT_SetVirtVTab */
 #include "util/lock.h"    /* Dee_ATOMIC_RWLOCK_INIT, Dee_atomic_read_with_atomic_rwlock, Dee_atomic_rwlock_* */
 
 #include <stddef.h> /* size_t */

include/deemon/rodict.h

@@ -30,7 +30,7 @@
 
 #include "dict.h"         /* Dee_dict_item */
 #include "types.h"        /* DREF, DeeObject, DeeObject_InstanceOfExact, DeeTypeObject, Dee_OBJECT_HEAD, Dee_hash_t, Dee_ssize_t */
-#include "util/hash-io.h" /* Dee_hash_gethidx_t, Dee_hash_htab, Dee_hash_sethidx_t, Dee_hash_vidx_t, _DeeHash_HTabGet, _DeeHash_HashIdxInit, _DeeHash_HashIdxNext, _DeeHash_REAL_GetRealVTab, _DeeHash_REAL_GetVirtVTab */
+#include "util/hash-io.h" /* Dee_hash_gethidx_t, Dee_hash_htab, Dee_hash_sethidx_t, Dee_hash_vidx_t, _DeeHash_HashIdxInit, _DeeHash_HashIdxNext, _DeeHash_REAL_GetRealVTab, _DeeHash_REAL_GetVirtVTab */
 
 #include <stddef.h> /* NULL, size_t */
 

include/deemon/util/hash-io.h

@@ -22,10 +22,11 @@
 #define GUARD_DEEMON_UTIL_HASH_IO_H 1 /*!export-*/
 
 #include "../api.h"
-#include "../types.h"
 
 #include <hybrid/typecore.h> /* __BYTE_TYPE__, __SHIFT_TYPE__, __SIZEOF_SIZE_T__, __UINT*_C */
 
+#include "../types.h" /* Dee_SIZEOF_HASH_T, Dee_hash_t */
+
 #include <stddef.h> /* size_t */
 #include <stdint.h> /* uintN_t */
 

src/deemon/objects/dict-delitem-impl.c.inl

@@ -34,7 +34,7 @@
 #include <deemon/dict.h>         /* DeeDict_*, Dee_dict_item, _DeeDict_* */
 #include <deemon/error-rt.h>     /* DeeRT_Err* */
 #include <deemon/object.h>
-#include <deemon/util/hash-io.h> /* Dee_HASH_HTAB_EOF, Dee_hash_vidx_t, Dee_hash_vidx_virt_lt_real */
+#include <deemon/util/hash-io.h> /* Dee_HASH_HTAB_EOF, Dee_hash_gethidx_t, Dee_hash_hidx_ofhash, Dee_hash_hidx_t, Dee_hash_vidx_t, Dee_hash_vidx_virt_lt_real */
 
 #include <stddef.h> /* NULL, size_t */
 

src/deemon/objects/dict-getitem-impl.c.inl

@@ -42,7 +42,7 @@
 #include <deemon/dict.h>         /* DeeDict_*, Dee_dict_item, _DeeDict_* */
 #include <deemon/error-rt.h>     /* DeeRT_Err* */
 #include <deemon/object.h>
-#include <deemon/util/hash-io.h> /* Dee_HASH_HTAB_EOF, Dee_hash_vidx_t, Dee_hash_vidx_virt_lt_real */
+#include <deemon/util/hash-io.h> /* Dee_HASH_HTAB_EOF, Dee_hash_gethidx_t, Dee_hash_hidx_ofhash, Dee_hash_hidx_t, Dee_hash_vidx_t, Dee_hash_vidx_virt_lt_real */
 
 #include <stddef.h> /* NULL, size_t */
 

src/deemon/objects/dict-init-copyfrom.c.inl

@@ -28,7 +28,7 @@
 #include <deemon/dict.h>            /* DeeDict_LockEndRead, Dee_dict_item, _DeeDict_GetRealVTab, _DeeDict_SetRealVTab */
 #include <deemon/object.h>
 #include <deemon/system-features.h> /* memcpy* */
-#include <deemon/util/hash-io.h>    /* Dee_HASH_HIDXIO_FROM_VALLOC, Dee_hash_hidxio, Dee_hash_htab */
+#include <deemon/util/hash-io.h>    /* Dee_HASH_HIDXIO_FROM_VALLOC, Dee_hash_gethidx_t, Dee_hash_hidx_t, Dee_hash_hidxio, Dee_hash_hidxio_t, Dee_hash_htab, Dee_hash_sethidx_t, Dee_hash_vidx_t */
 #include <deemon/util/lock.h>       /* Dee_atomic_rwlock_init */
 
 #include <stdbool.h> /* false, true */

src/deemon/objects/dict-setitem-impl.c.inl

@@ -38,7 +38,7 @@
 #include <deemon/object.h>
 #include <deemon/string.h>          /* DeeString_NewSizedWithHash, DeeString_NewWithHash */
 #include <deemon/system-features.h> /* memmovedownc, memmoveupc */
-#include <deemon/util/hash-io.h>    /* Dee_HASH_HTAB_EOF, Dee_hash_vidx_t, Dee_hash_vidx_toreal, Dee_hash_vidx_tovirt, Dee_hash_vidx_virt_lt_real */
+#include <deemon/util/hash-io.h>    /* Dee_HASH_HTAB_EOF, Dee_hash_hidx_ofhash, Dee_hash_hidx_t, Dee_hash_hidxio_ops, Dee_hash_vidx_t, Dee_hash_vidx_toreal, Dee_hash_vidx_tovirt, Dee_hash_vidx_virt_lt_real */
 
 #include <stdbool.h> /* bool, false, true */
 #include <stddef.h>  /* NULL, size_t */

src/deemon/objects/dict.c

@@ -43,10 +43,10 @@
 #include <deemon/seq.h>                /* DeeIterator_Type, DeeSeq_Unpack */
 #include <deemon/serial.h>             /* DeeSerial*, Dee_SERADDR_ISOK, Dee_seraddr_t */
 #include <deemon/string.h>             /* DeeString_STR */
-#include <deemon/system-features.h>    /* bzero*, memcpy*, memmovedownc, memmoveupc, memset */
+#include <deemon/system-features.h>    /* bzeroc, memcpy*, memmovedownc, memmoveupc, memset */
 #include <deemon/tuple.h>              /* DeeTuple* */
 #include <deemon/util/atomic.h>        /* atomic_cmpxch_or_write, atomic_read */
-#include <deemon/util/hash-io.h>       /* Dee_HASH_HIDXIO_COUNT, Dee_HASH_HIDXIO_FROM_VALLOC, Dee_HASH_HIDXIO_IS8, Dee_HASH_HIDXIO_IS16, Dee_HASH_HIDXIO_IS32, Dee_HASH_HIDXIO_IS64, Dee_HASH_HTAB_EOF, Dee_SIZEOF_HASH_VIDX_T, Dee_hash_gethidx8, Dee_hash_gethidx_t, Dee_hash_hidxio, Dee_hash_htab, Dee_hash_sethidx8, Dee_hash_sethidx_t, Dee_hash_vidx_t, Dee_hash_vidx_toreal, Dee_hash_vidx_tovirt, Dee_hash_vidx_virt2real, Dee_hash_vidx_virt_lt_real, IF_Dee_HASH_HIDXIO_COUNT_GE_2, IF_Dee_HASH_HIDXIO_COUNT_GE_3, IF_Dee_HASH_HIDXIO_COUNT_GE_4 */
+#include <deemon/util/hash-io.h>       /* Dee_HASH_HIDXIO_COUNT, Dee_HASH_HIDXIO_FROM_VALLOC, Dee_HASH_HTAB_EOF, Dee_SIZEOF_HASH_VIDX_T, Dee_hash_hidx_ofhash, Dee_hash_hidx_t, Dee_hash_hidxio, Dee_hash_hidxio_ops, Dee_hash_hidxio_t, Dee_hash_htab, Dee_hash_vidx_t, Dee_hash_vidx_toreal, Dee_hash_vidx_tovirt, Dee_hash_vidx_virt2real, Dee_hash_vidx_virt_lt_real, IF_Dee_HASH_HIDXIO_COUNT_GE_2, IF_Dee_HASH_HIDXIO_COUNT_GE_3, IF_Dee_HASH_HIDXIO_COUNT_GE_4 */
 #include <deemon/util/lock.h>          /* DeeLock_Acquire2, Dee_atomic_read_with_atomic_rwlock, Dee_atomic_rwlock_* */
 #include <deemon/util/objectlist.h>    /* Dee_objectlist, Dee_objectlist_* */
 
@@ -65,7 +65,7 @@
 
 #include <stdbool.h> /* bool, false, true */
 #include <stddef.h>  /* NULL, offsetof, size_t */
-#include <stdint.h>  /* uintN_t, uintptr_t */
+#include <stdint.h>  /* uintptr_t */
 
 #undef byte_t
 #define byte_t __BYTE_TYPE__

src/deemon/objects/dict.h

@@ -29,8 +29,8 @@
 #include <deemon/object.h>
 #include <deemon/rodict.h>          /* DeeRoDictObject */
 #include <deemon/string.h>          /* DeeString* */
-#include <deemon/system-features.h> /* DeeSystem_DEFINE_strcmp, memcmp, memcpy, memmovedown, strlen */
-#include <deemon/util/hash-io.h>    /* Dee_HASH_HIDXIO_FROM_VALLOC, Dee_hash_gethidx_t, Dee_hash_hidxio, Dee_hash_hidxio_t, Dee_hash_htab, Dee_hash_sethidx_t, Dee_hash_vidx_t */
+#include <deemon/system-features.h> /* DeeSystem_DEFINE_strcmp, memcmp, memmovedown, strlen */
+#include <deemon/util/hash-io.h>    /* Dee_HASH_HIDXIO_FROM_VALLOC, Dee_hash_gethidx_t, Dee_hash_hidx_t, Dee_hash_hidxio, Dee_hash_hidxio_t, Dee_hash_htab, Dee_hash_sethidx_t, Dee_hash_vidx_t */
 
 #include <hybrid/bit.h>      /* CLZ */
 #include <hybrid/overflow.h> /* OVERFLOW_UADD, OVERFLOW_UMUL */

src/deemon/objects/rodict-getitem.c.inl

@@ -166,7 +166,7 @@
 #include <deemon/int.h>          /* DeeInt_Size_TryCompareEq */
 #include <deemon/object.h>
 #include <deemon/rodict.h>       /* _DeeRoDict_* */
-#include <deemon/util/hash-io.h> /* Dee_HASH_HTAB_EOF, Dee_hash_vidx_t, Dee_hash_vidx_virt_lt_real */
+#include <deemon/util/hash-io.h> /* Dee_HASH_HTAB_EOF, Dee_hash_hidx_ofhash, Dee_hash_hidx_t, Dee_hash_vidx_t, Dee_hash_vidx_virt_lt_real */
 
 #include <stddef.h> /* NULL, size_t */