From c5babf57de94a9a5e35c4bbb1237f3bffd15456c Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sat, 19 Oct 2024 22:45:40 +0300 Subject: play around with lookup tables for commands --- src/lyn.c | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) (limited to 'src/lyn.c') diff --git a/src/lyn.c b/src/lyn.c index 2783ba6..bd5dbb4 100644 --- a/src/lyn.c +++ b/src/lyn.c @@ -141,18 +141,13 @@ struct lyn lyn_create() return (struct lyn){}; } -struct visible { - const char *name; - struct lyn_symbol symb; -}; - int lyn_create_scope(struct lyn *lyn) { struct lyn_scope *scope = calloc(1, sizeof(struct lyn_scope)); if (!scope) return -1; - scope->visible = vec_create(sizeof(struct visible)); + scope->visible = lookup_create(sizeof(struct lyn_symbol)); scope->parent = lyn->cur; if (!lyn->root) @@ -162,23 +157,17 @@ int lyn_create_scope(struct lyn *lyn) return 0; } -static struct visible *scope_find(struct lyn_scope *scope, const char *name) +static struct lyn_symbol *scope_find(struct lyn_scope *scope, const char *name) { - foreach_vec(vi, scope->visible) { - struct visible *v = vec_at(&scope->visible, vi); - if (strcmp(v->name, name) == 0) - return v; - } - - return NULL; + return lookup_at(&scope->visible, name); } -static struct visible *scopes_find(struct lyn_scope *scope, const char *name) +static struct lyn_symbol *scopes_find(struct lyn_scope *scope, const char *name) { while (scope) { - struct visible *v = scope_find(scope, name); - if (v) - return v; + struct lyn_symbol *s = scope_find(scope, name); + if (s) + return s; scope = scope->parent; } @@ -188,13 +177,11 @@ static struct visible *scopes_find(struct lyn_scope *scope, const char *name) static int scope_add(struct lyn_scope *scope, const char *name, struct lyn_symbol symb) { - if (scope_find(scope, name)) { + if (!lookup_insert(&scope->visible, name, &symb)) { error("%s exists in scope\n", name); return -1; } - struct visible v = {.name = name, .symb = symb}; - vect_append(struct visible, scope->visible, &v); return 0; } @@ -205,20 +192,16 @@ int lyn_create_symbol(struct lyn *lyn, const char *name, struct lyn_symbol symb) struct lyn_symbol *lyn_lookup_symbol(struct lyn *lyn, const char *name) { - struct visible *v = scopes_find(lyn->cur, name); - if (!v) - return NULL; - - return &v->symb; + return scopes_find(lyn->cur, name); } int lyn_replace_symbol(struct lyn *lyn, const char *name, struct lyn_symbol symb) { - struct visible *v = scopes_find(lyn->cur, name); - if (!v) + struct lyn_symbol *s = scopes_find(lyn->cur, name); + if (!s) return -1; - v->symb = symb; + *s = symb; return 0; } -- cgit v1.2.3