Experiments/libabacus
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Switch the table to using tries.

Browse Source
This commit is contained in:
Danila Fedorin 2018-03-24 20:47:34 -07:00
parent 56c891f9f8
commit 26ad341a50
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/table.h
View File

@ -1,9 +1,9 @@
#ifndef LIBABACUS_TABLE_H #ifndef LIBABACUS_TABLE_H
#define LIBABACUS_TABLE_H #define LIBABACUS_TABLE_H
#include "ht.h"
#include "result.h" #include "result.h"
#include "custom.h" #include "custom.h"
#include "trie.h"
/** /**
* A struct that represents a structure * A struct that represents a structure
@ -20,7 +20,7 @@ struct libab_table_s {
/** /**
* The hash table used to store the data. * The hash table used to store the data.
*/ */
ht table; libab_trie trie;
}; };
/** /**

13
src/table.c
View File

@ -4,13 +4,14 @@
#include "lexer.h" #include "lexer.h"
void libab_table_init(libab_table* table) { void libab_table_init(libab_table* table) {
ht_init(&table->table); libab_trie_init(&table->trie);
table->parent = NULL; table->parent = NULL;
} }
libab_table_entry* libab_table_search_filter(libab_table* table, const char* string, void* data, compare_func compare) { libab_table_entry* libab_table_search_filter(libab_table* table, const char* string, void* data, compare_func compare) {
void* to_return = NULL; void* to_return = NULL;
do { do {
to_return = ht_find(&table->table, string, data, compare); const ll* matches = libab_trie_get(&table->trie, string);
to_return = ll_find(matches, data, compare);
table = table->parent; table = table->parent;
} while(table && to_return == NULL); } while(table && to_return == NULL);
return to_return; return to_return;
@ -18,7 +19,7 @@ libab_table_entry* libab_table_search_filter(libab_table* table, const char* str
libab_table_entry* libab_table_search(libab_table* table, const char* string) { libab_table_entry* libab_table_search(libab_table* table, const char* string) {
void* to_return = NULL; void* to_return = NULL;
do { do {
to_return = ht_get(&table->table, string); to_return = ll_head(libab_trie_get(&table->trie, string));
table = table->parent; table = table->parent;
} while(table && to_return == NULL); } while(table && to_return == NULL);
return to_return; return to_return;
@ -55,7 +56,7 @@ libab_function* libab_table_search_function(libab_table* table, const char* stri
return entry ? &entry->data_u.function : NULL; return entry ? &entry->data_u.function : NULL;
} }
libab_result libab_table_put(libab_table* table, const char* string, libab_table_entry* entry) { libab_result libab_table_put(libab_table* table, const char* string, libab_table_entry* entry) {
return libab_convert_ds_result(ht_put(&table->table, string, entry)); return libab_trie_put(&table->trie, string, entry);
} }
int _table_foreach_entry_free(void* data, va_list args) { int _table_foreach_entry_free(void* data, va_list args) {
libab_table_entry_free(data); libab_table_entry_free(data);
@ -63,8 +64,8 @@ int _table_foreach_entry_free(void* data, va_list args) {
return 0; return 0;
} }
void libab_table_free(libab_table* table) { void libab_table_free(libab_table* table) {
ht_foreach(&table->table, NULL, compare_always, _table_foreach_entry_free); libab_trie_foreach(&table->trie, NULL, compare_always, _table_foreach_entry_free);
ht_free(&table->table); libab_trie_free(&table->trie);
} }
void libab_table_entry_free(libab_table_entry* entry) { void libab_table_entry_free(libab_table_entry* entry) {
if(entry->variant == ENTRY_OP) { if(entry->variant == ENTRY_OP) {