Add BasicString and StringView

This reverts commit d4313fb8e4.

compile

@@ -2,15 +2,10 @@
 
 CC=clang
 INCLUDE="\
-	-Ialiases \
+	$(find src -type d | xargs -I{} echo -n "-I{} ") \
-	-Icpath/include \
-	-Idstr/include \
-	$(find mem/include -type d | xargs -I{} echo -n "-I{} ") \
 "
 SRC="\
-	cpath/src/*.c \
+	$(find src -type f -name *.c | xargs -I{} echo -n "{} ") \
-	dstr/src/*.c \
-	mem/src/*/*.c \
 "
 CFLAGS="-O3 -shared -fPIC -Wall -Werror -pedantic"
 OUT="libwapp.so"

src/mem/arena/mem_arena.c

@@ -16,7 +16,6 @@
 typedef struct base_arena BaseArena;
 struct base_arena {
   u8 *buf;
-  u8 *last;
   u8 *offset;
   u64 capacity;
   BaseArena *prev;
@@ -33,7 +32,7 @@ internal bool base_arena_init(BaseArena *arena, u64 capacity);
 internal void *base_arena_alloc_aligned(BaseArena *arena, u64 size,
                                         u64 alignment);
 internal void base_arena_clear(BaseArena *arena);
-internal void base_arena_free(BaseArena *arena);
+internal void base_arena_destroy(BaseArena *arena);
 
 // PUBLIC API
 
@@ -50,12 +49,12 @@ bool wapp_mem_arena_init(Arena **arena, u64 base_capacity) {
 
   arena_ptr->active_arena = (BaseArena *)calloc(1, sizeof(BaseArena));
   if (!(arena_ptr->active_arena)) {
-    wapp_mem_arena_free(arena);
+    wapp_mem_arena_destroy(arena);
     return false;
   }
 
   if (!base_arena_init(arena_ptr->active_arena, base_capacity)) {
-    wapp_mem_arena_free(arena);
+    wapp_mem_arena_destroy(arena);
     return false;
   }
 
@@ -124,7 +123,7 @@ void wapp_mem_arena_clear(Arena *arena) {
   arena->active_arena = last_active;
 }
 
-void wapp_mem_arena_free(Arena **arena) {
+void wapp_mem_arena_destroy(Arena **arena) {
   if (!arena) {
     return;
   }
@@ -142,7 +141,7 @@ void wapp_mem_arena_free(Arena **arena) {
   while (current) {
     next = current->next;
 
-    base_arena_free(current);
+    base_arena_destroy(current);
     free(current);
 
     current = next;
@@ -152,13 +151,13 @@ void wapp_mem_arena_free(Arena **arena) {
   while (current) {
     prev = current->prev;
 
-    base_arena_free(current);
+    base_arena_destroy(current);
     free(current);
 
     current = prev;
   }
 
-  base_arena_free(arena_ptr->active_arena);
+  base_arena_destroy(arena_ptr->active_arena);
 
   free(arena_ptr->active_arena);
   arena_ptr->active_arena = NULL;
@@ -206,7 +205,6 @@ internal void *base_arena_alloc_aligned(BaseArena *arena, u64 size,
   }
 
   arena->offset = output + size;
-  arena->last = output;
 
   return (void *)output;
 }
@@ -220,7 +218,7 @@ internal void base_arena_clear(BaseArena *arena) {
   arena->offset = arena->buf;
 }
 
-internal void base_arena_free(BaseArena *arena) {
+internal void base_arena_destroy(BaseArena *arena) {
   if (!arena) {
     return;
   }

src/mem/arena/mem_arena.h

@@ -14,7 +14,7 @@ bool wapp_mem_arena_init(Arena **arena, u64 base_capacity);
 void *wapp_mem_arena_alloc(Arena *arena, u64 size);
 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
 void wapp_mem_arena_clear(Arena *arena);
-void wapp_mem_arena_free(Arena **arena);
+void wapp_mem_arena_destroy(Arena **arena);
 
 #ifdef __cplusplus
 }

src/strings/basic_strings/basic_strings.h

@@ -0,0 +1,34 @@
+#ifndef BASIC_STRING_H
+#define BASIC_STRING_H
+
+#include "aliases.h"
+#include <stdio.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+typedef struct bstr BasicString;
+struct bstr {
+  u64 size;
+  const char *buf;
+};
+
+typedef struct strvw StringView;
+struct strvw {
+  const u64 size;
+  const char *buf;
+};
+
+#define new_string(STR)                                                        \
+  { .size = strlen(STR), .buf = STR }
+#define wapp_bstr_new(STR) ((BasicString)new_string(STR))
+#define wapp_strvw_new(STR) ((StringView)new_string(STR))
+#define wapp_string_print(STR) (printf("%.*s\n", (i32)STR.size, STR.buf))
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+#endif // !BASIC_STRING_H

src/strings/dstr/dstr.c

@@ -1,7 +1,6 @@
 #include "dstr.h"
 #include "aliases.h"
-#include "mem_allocator.h"
+#include "mem_arena.h"
-#include "mem_libc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,45 +8,42 @@
 // Use this scalar to allocate extra memory in order to avoid having to
 // constantly reallocate
 #define CAPACITY_SCALAR 8
+#define MINIMUM_DSTR_CAPACITY 1024
 
 struct dstr {
-  Allocator allocator;
   u64 capacity;
   u64 size;
   char buf[];
 };
 
-String *wapp_dstr_with_capacity(u64 capacity, const Allocator *allocator) {
+String *wapp_dstr_with_capacity(u64 capacity, Arena *arena) {
-  Allocator alloc;
+  if (!arena) {
-  if (allocator) {
+    return NULL;
-    alloc = *allocator;
-  } else {
-    alloc = wapp_mem_libc_allocator();
   }
 
   String *out =
-      (String *)wapp_mem_allocator_alloc(&alloc, sizeof(String) + capacity + 1);
+      (String *)wapp_mem_arena_alloc(arena, sizeof(String) + capacity + 1);
   if (!out) {
     return NULL;
   }
 
-  out->allocator = alloc;
   out->capacity = capacity;
   out->size = 0;
 
   return out;
 }
 
-String *wapp_dstr_from_string(const char *str, const Allocator *allocator) {
+String *wapp_dstr_from_string(const char *str, Arena *arena) {
-  if (!str) {
+  if (!str || !arena) {
     return NULL;
   }
 
   u64 length = strlen(str);
-
   u64 capacity = length * CAPACITY_SCALAR;
+  capacity =
+      capacity >= MINIMUM_DSTR_CAPACITY ? capacity : MINIMUM_DSTR_CAPACITY;
 
-  String *out = wapp_dstr_with_capacity(capacity, allocator);
+  String *out = wapp_dstr_with_capacity(capacity, arena);
   if (!out) {
     return NULL;
   }
@@ -58,55 +54,45 @@ String *wapp_dstr_from_string(const char *str, const Allocator *allocator) {
   return out;
 }
 
-void wapp_dstr_update(String **dst, const char *src) {
+StringUpdate wapp_dstr_update(String **dst, const char *src, Arena *arena) {
   if (!dst || !(*dst)) {
-    return;
+    return (StringUpdate){.updated = false, .str = *dst};
   }
 
   u64 length = strlen(src);
 
   String *str = *dst;
 
-  if (length < str->capacity) {
+  if (length >= str->capacity) {
+    if (!arena) {
+      return (StringUpdate){.updated = false, .str = *dst};
+    }
+
+    String *new_str = wapp_dstr_from_string(src, arena);
+    if (!new_str) {
+      return (StringUpdate){.updated = false, .str = *dst};
+    }
+
+    return (StringUpdate){.updated = true, .str = new_str};
+  }
+
   memset(str->buf, 0, str->capacity);
 
   str->size = length;
 
   strncpy(str->buf, src, length + 1);
-  } else {
-    u64 capacity = length * CAPACITY_SCALAR;
 
-    String *tmp = (String *)wapp_mem_allocator_realloc(
+  return (StringUpdate){.updated = true, .str = *dst};
-        &(str->allocator), *dst, sizeof(String) + capacity + 1);
-    if (!tmp) {
-      return;
-    }
-
-    tmp->capacity = capacity;
-    tmp->size = length;
-    strncpy(tmp->buf, src, length + 1);
-
-    *dst = tmp;
-  }
 }
 
-void wapp_dstr_free(String **str) {
+StringUpdate wapp_dstr_concat(String **dst, const char *src, Arena *arena) {
-  if (!str || !(*str)) {
-    return;
-  }
-
-  String *str_ptr = *str;
-  wapp_mem_allocator_free(&(str_ptr->allocator), (void **)str);
-}
-
-void wapp_dstr_concat(String **dst, const char *src) {
   if (!dst || !(*dst)) {
-    return;
+    return (StringUpdate){.updated = false, .str = *dst};
   }
 
   u64 src_length = strlen(src);
   if (src_length == 0) {
-    return;
+    return (StringUpdate){.updated = false, .str = *dst};
   }
 
   u64 new_length = (*dst)->size + src_length;
@@ -117,42 +103,7 @@ void wapp_dstr_concat(String **dst, const char *src) {
   strncpy(str, (*dst)->buf, (*dst)->size);
   strncat(str, src, new_length + 1 - (*dst)->size);
 
-  wapp_dstr_update(dst, str);
+  return wapp_dstr_update(dst, str, arena);
-}
-
-void wapp_dstr_append(String **dst, char c) {
-  if (!dst || !(*dst)) {
-    return;
-  }
-
-  u64 new_length = (*dst)->size + 1;
-
-  char str[new_length + 1];
-  memset(str, 0, new_length + 1);
-
-  strncpy(str, (*dst)->buf, (*dst)->size);
-  str[(*dst)->size] = c;
-
-  wapp_dstr_update(dst, str);
-}
-
-void wapp_dstr_resize(String **str) {
-  if (!str || !(*str)) {
-    return;
-  }
-
-  String *str_ptr = *str;
-  u64 capacity = (*str)->size;
-
-  String *tmp = (String *)wapp_mem_allocator_realloc(
-      &(str_ptr->allocator), *str, sizeof(String) + capacity + 1);
-  if (!tmp) {
-    return;
-  }
-
-  tmp->capacity = capacity;
-
-  *str = tmp;
 }
 
 void wapp_dstr_clear(String *str) {

src/strings/dstr/dstr.h

@@ -2,7 +2,8 @@
 #define DSTR_H
 
 #include "aliases.h"
-#include "mem_allocator.h"
+#include "mem_arena.h"
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,13 +11,16 @@ extern "C" {
 
 typedef struct dstr String;
 
-String *wapp_dstr_with_capacity(u64 capacity, const Allocator *allocator);
+typedef struct string_update StringUpdate;
-String *wapp_dstr_from_string(const char *str, const Allocator *allocator);
+struct string_update {
-void wapp_dstr_update(String **dst, const char *src);
+  bool updated;
-void wapp_dstr_free(String **str);
+  String *str;
-void wapp_dstr_concat(String **dst, const char *src);
+};
-void wapp_dstr_append(String **dst, char c);
+
-void wapp_dstr_resize(String **str);
+String *wapp_dstr_with_capacity(u64 capacity, Arena *arena);
+String *wapp_dstr_from_string(const char *str, Arena *arena);
+StringUpdate wapp_dstr_update(String **dst, const char *src, Arena *arena);
+StringUpdate wapp_dstr_concat(String **dst, const char *src, Arena *arena);
 void wapp_dstr_clear(String *str);
 void wapp_dstr_print(const String *str);
 i64 wapp_dstr_find(const String *str, const char *substr);