Remove unnecessary casts and test arena free/realloc

2 files changed, 40 insertions, 25 deletions

diff --git a/src/badlib.h b/src/badlib.h
index 7e1a715..da76577 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -6,14 +6,11 @@
 //     - sub
 //     - delete
 // - Add math operations for vectors and matrices.
-// - Can we remove the PlatformAPI function pointers and just use extern
-//   references?
 // - Breakdown this file in the different library parts.
 // - Sort arrays / linked lists with custom functions?
 // - Implement binary search for searching into an array:
 //       SearchResult find_array(Array haystack, Array needle).
-// - Logger functions for hash map, arrays and growable arrays (print the entire
-//   thing or at least a small range).
+// - Logger functions for hash map and queues.
 //
 
 #include <stdarg.h>
@@ -143,7 +140,7 @@ arena_realloc(void *ptr, sz old_size, sz new_size, void *ctx) {
         a->size += new_size - old_size;
         return ptr;
     }
-    u8 *p = (u8 *)arena_malloc(new_size, ctx);
+    u8 *p = arena_malloc(new_size, ctx);
     memcpy(p, ptr, old_size);
     return p;
 }
@@ -151,7 +148,7 @@ arena_realloc(void *ptr, sz old_size, sz new_size, void *ctx) {
 Arena
 arena_create(sz cap, Allocator allocator) {
     Arena arena = {0};
-    arena.beg = (u8 *)allocator.malloc(cap, allocator.ctx);
+    arena.beg = allocator.malloc(cap, allocator.ctx);
     arena.cap = arena.beg ? cap : 0;
     return arena;
 }
@@ -593,7 +590,8 @@ str_to_int(Str s) {
         s = str_remove_prefix(s, cstr("0x"));
         while (s.size) {
             char c = str_next(&s);
-            assert((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'));
+            assert((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
+                   (c >= 'A' && c <= 'F'));
             if (c >= '0' && c <= '9') {
                 num = num * 16 + (c - '0');
             } else if (c >= 'a' && c <= 'f') {
@@ -631,7 +629,7 @@ typedef struct Queue {
 void
 queue_push(Queue *l, void *val, Arena *a) {
     assert(l);
-    QueueVal *next = (QueueVal *)arena_calloc(sizeof(QueueVal), a);
+    QueueVal *next = arena_calloc(sizeof(QueueVal), a);
     next->val = val;
     if (l->size == 0) {
         l->head = next;
@@ -698,7 +696,7 @@ map_upsert(Map *m, void *key, Arena *a) {
         h = (h << 2) | (h >> 62);
         item = &(*item)->child[h & 0x3];
     }
-    *item = (MapNode *)arena_calloc(sizeof(MapNode), a);
+    *item = arena_calloc(sizeof(MapNode), a);
     (*item)->key = key;
     return *item;
 }
@@ -715,7 +713,7 @@ map_insert(Map *m, void *key, void *val, Arena *a) {
         h = (h << 2) | (h >> 62);
         item = &(*item)->child[h & 0x3];
     }
-    *item = (MapNode *)arena_calloc(sizeof(MapNode), a);
+    *item = arena_calloc(sizeof(MapNode), a);
     (*item)->key = key;
     (*item)->val = val;
 }
@@ -801,7 +799,7 @@ typedef struct ArrayHeader {
 
 static inline void *
 _array_reserve(sz num_elem, sz type_size, Arena *a) {
-    u8 *p = (u8 *)arena_malloc(num_elem * type_size + sizeof(ArrayHeader), a);
+    u8 *p = arena_malloc(num_elem * type_size + sizeof(ArrayHeader), a);
     p += sizeof(ArrayHeader);
     array_head(p)->size = 0;
     array_head(p)->cap = num_elem;
@@ -994,7 +992,7 @@ platform_read_file(Str path, Arena *a) {
 
     return (FileContents){
         .path = path,
-        .data = (Array){.mem = (u8 *)memory, .size = file_size},
+        .data = (Array){.mem = memory, .size = file_size},
         .err = FILE_ERR_OK,
     };
 }
diff --git a/src/main.c b/src/main.c
index 9485c95..fbc19f9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,19 +23,36 @@ init(void) {
 
 void
 process_file(Str path) {
-    println("processing: ");
-    println("%s", path);
-    println("initialing memory...");
+    (void)path;
+    // println("processing: ");
+    // println("%s", path);
+    // println("initialing memory...");
     Arena lexer_arena = arena_create(LEXER_MEM, os_allocator);
-    println("reading file...");
-    FileContents file = platform_read_file(path, &lexer_arena);
-
-    Str scanner = file.data;
-    // NOTE: Testing file read line by line.
-    for (sz i = 0; scanner.size != 0; i++) {
-        Str line = str_split(&scanner, cstr("\n"));
-        println("%x{4}  %s", i + 1, line);
-    }
+    u8 *mem;
+    mem = arena_malloc(16, &lexer_arena);
+    println("%{Arena}", &lexer_arena);
+    mem[0] = 255;
+    mem[1] = 255;
+    mem[2] = 0xba;
+    mem[3] = 0xdd;
+    mem[4] = 0x10;
+    mem[5] = 0xde;
+    mem[0] = 255;
+    mem[1] = 255;
+    println("%{Arena}", &lexer_arena);
+    arena_malloc(8, &lexer_arena);
+    mem = arena_realloc(mem, 16, 32, &lexer_arena);
+    // arena_free(mem, 32, &lexer_arena);
+    println("%{Arena}", &lexer_arena);
+    // println("reading file...");
+    // FileContents file = platform_read_file(path, &lexer_arena);
+
+    // Str scanner = file.data;
+    // // NOTE: Testing file read line by line.
+    // for (sz i = 0; scanner.size != 0; i++) {
+    //     Str line = str_split(&scanner, cstr("\n"));
+    //     println("%x{4}  %s", i + 1, line);
+    // }
 
     // println("<<< %x{4} %b{4} %f{2} %s %{Arena} >>>", 123, 3, 1.345,
     //         cstr("BOOM!"), &logger_inf.storage);
@@ -43,7 +60,7 @@ process_file(Str path) {
     //            cstr("error: testing string logger"));
 
     println("arena_memory:\n%{Mem}",
-            &(Array){logger_inf.storage.beg, logger_inf.storage.size});
+            &(Array){lexer_arena.beg, lexer_arena.size});
     // TODO: run lexer.
 }