fixed finite hashmap's compare function pointer and hashes in copy function

Author: TheGAzed

include/misc/fhash_table.h include/misc/fhash_map.hinclude/misc/fhash_table.h renamed to include/misc/fhash_map.h

@@ -1,105 +1,108 @@
-#ifndef FHASH_TABLE_H
-#define FHASH_TABLE_H
+#ifndef FHASH_MAP_H
+#define FHASH_MAP_H
 
 #include <cerpec.h>
 
 /// @brief Finite hash table data structure.
-typedef struct finite_hash_table {
-    hash_fn hash;
+typedef struct finite_hash_map {
+    hash_fn hash_key;
+    compare_fn compare_key;
     char * keys, * values;
-    size_t * next, * head;
-    size_t key_size, value_size, empty, length, max;
+    size_t * next, * prev, * head, * hashes;
+    size_t key_size, value_size, length, max;
     memory_s const * allocator;
-} fhash_table_s;
+} fhash_map_s;
 
 /// @brief Creates an empty structure.
 /// @param key_size Size of a single key.
 /// @param value_size Size of a single value.
 /// @param max Maximum length of structure.
-/// @param hash Function pointer to hash element into value.
+/// @param compare_key Function pointer to compare keys.
+/// @param hash_key Function pointer to hash element into value.
 /// @return Table structure.
-fhash_table_s create_fhash_table(size_t const key_size, size_t const value_size, size_t const max, hash_fn const hash);
+fhash_map_s create_fhash_map(size_t const key_size, size_t const value_size, size_t const max, hash_fn const hash_key, compare_fn const compare_key);
 
 /// @brief Creates an empty structure.
 /// @param key_size Size of a single key.
 /// @param value_size Size of a single value.
 /// @param max Maximum length of structure.
-/// @param hash Function pointer to hash element into value.
+/// @param hash_key Function pointer to hash element into value.
+/// @param compare_key Function pointer to compare keys.
 /// @param allocator Custom allocator structure.
 /// @return Table structure.
-fhash_table_s make_fhash_table(size_t const key_size, size_t const value_size, size_t const max, hash_fn const hash, memory_s const * const allocator);
+fhash_map_s make_fhash_map(size_t const key_size, size_t const value_size, size_t const max, hash_fn const hash_key, compare_fn const compare_key, memory_s const * const allocator);
 
 /// @brief Destroys a structure, and its elements and makes it unusable.
-/// @param table Structure to destroy.
+/// @param map Structure to destroy.
 /// @param destroy_key Function pointer to destroy a single key.
 /// @param destroy_value Function pointer to destroy a single value.
-void destroy_fhash_table(fhash_table_s * const table, set_fn const destroy_key, set_fn const destroy_value);
+void destroy_fhash_map(fhash_map_s * const map, set_fn const destroy_key, set_fn const destroy_value);
 
 /// @brief Clears a structure, and destroys its elements, but remains usable.
-/// @param table Structure to destroy.
+/// @param map Structure to destroy.
 /// @param destroy_key Function pointer to destroy a single key.
 /// @param destroy_value Function pointer to destroy a single value.
-void clear_fhash_table(fhash_table_s * table, const set_fn destroy_key, const set_fn destroy_value);
+void clear_fhash_map(fhash_map_s * map, const set_fn destroy_key, const set_fn destroy_value);
 
 /// @brief Creates a copy of a structure and all its elements.
-/// @param table Structure to copy.
+/// @param map Structure to copy.
 /// @param copy_key Function pointer to create a deep/shallow copy of a single key.
 /// @param copy_value Function pointer to create a deep/shallow copy of a single value.
 /// @return Stack structure.
-fhash_table_s copy_fhash_table(fhash_table_s const * const table, copy_fn const copy_key, copy_fn const copy_value);
+fhash_map_s copy_fhash_map(fhash_map_s const * const map, copy_fn const copy_key, copy_fn const copy_value);
 
 /// @brief Checks if structure is empty.
-/// @param table Structure to check.
+/// @param map Structure to check.
 /// @return 'true' if empty, 'false' if not.
-bool is_empty_fhash_table(fhash_table_s const * const table);
+bool is_empty_fhash_map(fhash_map_s const * const map);
 
 /// @brief Checks if structure is full.
-/// @param table Structure to check.
+/// @param map Structure to check.
 /// @return 'true' if full, 'false' if not.
-bool is_full_fhash_table(fhash_table_s const * const table);
+bool is_full_fhash_map(fhash_map_s const * const map);
 
 /// @brief Inserts unique key/value pair into structure.
-/// @param table Structure to insert element into.
+/// @param map Structure to insert element into.
 /// @param key Key to insert.
 /// @param value Value to insert.
-void insert_fhash_table(fhash_table_s * const table, void const * const key, void const * const value);
+void insert_fhash_map(fhash_map_s * const map, void const * const key, void const * const value);
 
 /// @brief Removes unique key/value pair from structure.
-/// @param table Structure to remove element into.
+/// @param map Structure to remove element into.
 /// @param key Key to remove.
 /// @param key_buffer Key buffer to save removed key.
 /// @param value_buffer Value buffer to save removed value.
-void remove_fhash_table(fhash_table_s * const table, void const * const key, void * const key_buffer, void * const value_buffer);
+void remove_fhash_map(fhash_map_s * const map, void const * const key, void * const key_buffer, void * const value_buffer);
 
 /// @brief Checks if structure contains key.
-/// @param table Structure to check.
+/// @param map Structure to check.
 /// @param key Key to check.
 /// @return 'true' if contained, 'false' otherwise.
-bool contains_key_fhash_table(fhash_table_s const * const table, void const * const key);
+bool contains_key_fhash_map(fhash_map_s const * const map, void const * const key);
 
 /// @brief Gets value based on key.
-/// @param table Structure to get value.
+/// @param map Structure to get value.
 /// @param key Key to value.
 /// @param value_buffer Value buffer to save retrieved value.
-void get_value_fhash_table(fhash_table_s const * const table, void const * const key, void * const value_buffer);
+void get_value_fhash_map(fhash_map_s const * const map, void const * const key, void * const value_buffer);
 
 /// @brief Sets value based on key.
-/// @param table Structure to set value.
+/// @param map Structure to set value.
 /// @param key Key to value.
 /// @param value New value to insert.
 /// @param value_buffer Old value buffer to save replaced value.
-void set_value_fhash_table(fhash_table_s const * const table, void const * const key, void const * const value, void * const value_buffer);
+void set_value_fhash_map(fhash_map_s const * const map, void const * const key, void const * const value, void * const value_buffer);
 
 /// @brief Iterates over each key in structure.
-/// @param table Structure to iterate over.
+/// @param map Structure to iterate over.
 /// @param handle Function pointer to handle each element reference using generic arguments.
 /// @param arguments Generic arguments to use in function pointer.
-void map_key_fhash_table(fhash_table_s const * const table, handle_fn const handle, void * const arguments);
+void map_key_fhash_map(fhash_map_s const * const map, handle_fn const handle, void * const arguments);
 
 /// @brief Iterates over each value in structure.
-/// @param table Structure to iterate over.
+/// @param map Structure to iterate over.
 /// @param handle Function pointer to handle each element reference using generic arguments.
 /// @param arguments Generic arguments to use in function pointer.
-void map_value_fhash_table(fhash_table_s const * const table, handle_fn const handle, void * const arguments);
+void map_value_fhash_map(fhash_map_s const * const map, handle_fn const handle, void * const arguments);
 
-#endif // FHASH_TABLE_H
+#endif // FHASH_MAP_H

source/CMakeLists.txt

@@ -13,6 +13,6 @@ add_library(${PROJECT_NAME} cerpec.c
         graph/imatrix_graph.c
 
         misc/ihash_map.c misc/ibinary_heap.c
-        misc/fbinary_heap.c misc/fhash_table.c
+        misc/fbinary_heap.c misc/fhash_map.c
         set/frb_set.c
 )