From b87a0c473abd543b6e6d6e95faa6f783df23a285 Mon Sep 17 00:00:00 2001
From: Aryadev Chavali <aryadev@aryadevchavali.com>
Date: Tue, 19 Aug 2025 22:47:57 +0100
Subject: Separated out the definitions to clean up a bit

We're going to be using C to compile our Lisp eventually, so I need to
have a header file for compilation to work.  We can still separate out
the implementation details into separate files (then generate a shared
library for usage in the link stage) but we need this header file to
be singular and clean.
---
 main.c | 59 ++++++++---------------------------------------------------
 1 file changed, 8 insertions(+), 51 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index 23557d9..454a474 100644
--- a/main.c
+++ b/main.c
@@ -1,46 +1,22 @@
 /* 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.
+ * 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/>.
+ * 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: Entrypoint
  */
 
 #include <malloc.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
-#define MAX(A, B) ((A) > (B) ? (A) : (B))
-#define MIN(A, B) ((A) < (B) ? (A) : (B))
-
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-typedef int8_t i8;
-typedef int16_t i16;
-typedef int32_t i32;
-typedef int64_t i64;
-
-typedef struct
-{
-  u64 size, capacity;
-  u8 bytes[];
-} vec_t;
-
-#define VEC_GET(P)  (((vec_t *)(P)) - 1)
-#define VEC_SIZE(P) (VEC_GET(P)->size)
-#define VEC_CAP(P)  (VEC_GET(P)->capacity)
-#define VEC_MULT    2
+#include "./base.h"
 
 void vec_make(void **ptr, u64 size)
 {
@@ -100,16 +76,6 @@ void vec_clone(void **dest, void **src)
   VEC_SIZE(*dest) = VEC_SIZE(*src);
 }
 
-typedef struct
-{
-  u64 size;
-  char *data;
-} sv_t;
-
-#define SV(DATA, SIZE) ((sv_t){.data = (DATA), .size = (SIZE)})
-#define SV_FMT(SV)     (int)(SV).size, (SV).data
-#define PR_SV          "%.*s"
-
 sv_t sv_copy(sv_t old)
 {
   char *newstr = calloc(1, old.size * sizeof(*newstr));
@@ -117,13 +83,6 @@ sv_t sv_copy(sv_t old)
   return SV(newstr, old.size);
 }
 
-typedef struct
-{
-  u64 count;     // How many strings?
-  u64 capacity;  // How many entry buckets?
-  sv_t *entries; // this is actually a vector on the inside lol
-} sym_table_t;
-
 u64 djb2(sv_t string)
 {
   u64 hash = 5381;
@@ -132,8 +91,6 @@ u64 djb2(sv_t string)
   return hash;
 }
 
-#define SYM_TABLE_INIT_SIZE 1024
-
 void sym_table_init(sym_table_t *table)
 {
   table->capacity = MAX(table->capacity, SYM_TABLE_INIT_SIZE);
@@ -192,7 +149,7 @@ int main(void)
       "euismod",      "tellus",    "id",        "erat",
   };
 
-  for (u64 i = 0; i < sizeof(words) / sizeof(words[0]); ++i)
+  for (u64 i = 0; i < ARRSIZE(words); ++i)
   {
     sv_t sv = sym_table_find(&table, SV(words[i], strlen(words[i])));
     printf("%s => %p\n", words[i], sv.data);
-- 
cgit v1.2.3-13-gbd6f