Separate out implementation to make looking at code files easier

This commit is contained in:
2025-08-19 22:53:19 +01:00
parent b87a0c473a
commit 78aa7d6fb3
5 changed files with 139 additions and 104 deletions

1
base.h
View File

@@ -33,7 +33,6 @@ typedef int32_t i32;
typedef int64_t i64;
/// String Views for my String Needs
typedef struct
{
u64 size;

View File

@@ -1,8 +1,8 @@
#!/usr/bin/env sh
CFLAGS="-Wall -Wextra -std=c11 -ggdb"
SRC="main.c"
OUT="main.out"
SRC="vec.c symtable.c main.c"
OUT="alisp.out"
set -xe

101
main.c
View File

@@ -18,64 +18,6 @@
#include "./base.h"
void vec_make(void **ptr, u64 size)
{
if (!ptr)
return;
vec_t *vector = calloc(1, sizeof(*vector) + size);
vector->size = 0;
vector->capacity = size;
*ptr = (vector + 1);
}
void vec_free(void **data)
{
if (!data || !*data)
return;
free(VEC_GET(*data));
*data = NULL;
}
void vec_ensure_remaining(void **ptr, u64 space)
{
if (!ptr || !*ptr)
return;
vec_t *vec = VEC_GET(*ptr);
if (vec->capacity - vec->size < space)
{
void *new_vec = NULL;
vec_make(&new_vec, MAX(vec->capacity * VEC_MULT, vec->size + space));
VEC_SIZE(new_vec) = vec->size;
memcpy(new_vec, *ptr, vec->size);
vec_free(ptr);
*ptr = new_vec;
}
}
void vec_append_byte(void **ptr, u8 byte)
{
vec_ensure_remaining(ptr, 1);
vec_t *vec = VEC_GET(*ptr);
vec->bytes[vec->size++] = byte;
}
void vec_append(void **ptr, void *data, u64 size)
{
vec_ensure_remaining(ptr, size);
vec_t *vec = VEC_GET(*ptr);
memcpy(*ptr + vec->size, data, size);
vec->size += size;
}
void vec_clone(void **dest, void **src)
{
if (!dest || !src || !*src)
return;
vec_make(dest, VEC_SIZE(*src));
memcpy(*dest, *src, VEC_SIZE(*src));
VEC_SIZE(*dest) = VEC_SIZE(*src);
}
sv_t sv_copy(sv_t old)
{
char *newstr = calloc(1, old.size * sizeof(*newstr));
@@ -83,49 +25,6 @@ sv_t sv_copy(sv_t old)
return SV(newstr, old.size);
}
u64 djb2(sv_t string)
{
u64 hash = 5381;
for (u64 i = 0; i < string.size; ++i)
hash = string.data[i] + (hash + (hash << 5));
return hash;
}
void sym_table_init(sym_table_t *table)
{
table->capacity = MAX(table->capacity, SYM_TABLE_INIT_SIZE);
table->count = 0;
vec_make((void **)&table->entries, table->capacity * sizeof(*table->entries));
}
sv_t sym_table_find(sym_table_t *table, sv_t sv)
{
// TODO: Deal with resizing this when table->count > table->size / 2
u64 index = djb2(sv) & (table->capacity - 1);
for (sv_t comp = table->entries[index]; comp.data; index += 1,
index = index & (table->capacity - 1), comp = table->entries[index])
// Is it present in the table?
if (sv.size == comp.size && strncmp(sv.data, comp.data, sv.size) == 0)
return comp;
// Otherwise we need to duplicate and make it permanently interned
sv_t newsv = sv_copy(sv);
table->entries[index] = newsv;
++table->count;
return newsv;
}
void sym_table_cleanup(sym_table_t *table)
{
for (u64 i = 0; i < table->capacity; ++i)
if (table->entries[i].data)
free(table->entries[i].data);
vec_free((void **)&table->entries);
memset(table, 0, sizeof(*table));
}
int main(void)
{
sym_table_t table = {0};

61
symtable.c Normal file
View File

@@ -0,0 +1,61 @@
/* Copyright (C) 2025 Aryadev Chavali
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the Unlicense for details.
* You may distribute and modify this code under the terms of the Unlicense,
* which you should have received a copy of along with this program. If not,
* please go to <https://unlicense.org/>.
* Created: 2025-08-19
* Description: Symbol Table implementation
*/
#include "./base.h"
#include <malloc.h>
#include <string.h>
u64 djb2(sv_t string)
{
u64 hash = 5381;
for (u64 i = 0; i < string.size; ++i)
hash = string.data[i] + (hash + (hash << 5));
return hash;
}
void sym_table_init(sym_table_t *table)
{
table->capacity = MAX(table->capacity, SYM_TABLE_INIT_SIZE);
table->count = 0;
vec_make((void **)&table->entries, table->capacity * sizeof(*table->entries));
}
sv_t sym_table_find(sym_table_t *table, sv_t sv)
{
// TODO: Deal with resizing this when table->count > table->size / 2
u64 index = djb2(sv) & (table->capacity - 1);
for (sv_t comp = table->entries[index]; comp.data; index += 1,
index = index & (table->capacity - 1), comp = table->entries[index])
// Is it present in the table?
if (sv.size == comp.size && strncmp(sv.data, comp.data, sv.size) == 0)
return comp;
// Otherwise we need to duplicate and make it permanently interned
sv_t newsv = sv_copy(sv);
table->entries[index] = newsv;
++table->count;
return newsv;
}
void sym_table_cleanup(sym_table_t *table)
{
for (u64 i = 0; i < table->capacity; ++i)
if (table->entries[i].data)
free(table->entries[i].data);
vec_free((void **)&table->entries);
memset(table, 0, sizeof(*table));
}

76
vec.c Normal file
View File

@@ -0,0 +1,76 @@
/* Copyright (C) 2025 Aryadev Chavali
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the Unlicense for details.
* You may distribute and modify this code under the terms of the Unlicense,
* which you should have received a copy of along with this program. If not,
* please go to <https://unlicense.org/>.
* Created: 2025-08-19
* Description: Vector implementation
*/
#include <malloc.h>
#include <string.h>
#include "./base.h"
void vec_make(void **ptr, u64 size)
{
if (!ptr)
return;
vec_t *vector = calloc(1, sizeof(*vector) + size);
vector->size = 0;
vector->capacity = size;
*ptr = (vector + 1);
}
void vec_free(void **data)
{
if (!data || !*data)
return;
free(VEC_GET(*data));
*data = NULL;
}
void vec_ensure_remaining(void **ptr, u64 space)
{
if (!ptr || !*ptr)
return;
vec_t *vec = VEC_GET(*ptr);
if (vec->capacity - vec->size < space)
{
void *new_vec = NULL;
vec_make(&new_vec, MAX(vec->capacity * VEC_MULT, vec->size + space));
VEC_SIZE(new_vec) = vec->size;
memcpy(new_vec, *ptr, vec->size);
vec_free(ptr);
*ptr = new_vec;
}
}
void vec_append_byte(void **ptr, u8 byte)
{
vec_ensure_remaining(ptr, 1);
vec_t *vec = VEC_GET(*ptr);
vec->bytes[vec->size++] = byte;
}
void vec_append(void **ptr, void *data, u64 size)
{
vec_ensure_remaining(ptr, size);
vec_t *vec = VEC_GET(*ptr);
memcpy(*ptr + vec->size, data, size);
vec->size += size;
}
void vec_clone(void **dest, void **src)
{
if (!dest || !src || !*src)
return;
vec_make(dest, VEC_SIZE(*src));
memcpy(*dest, *src, VEC_SIZE(*src));
VEC_SIZE(*dest) = VEC_SIZE(*src);
}