Chore: more explicit namespace for memory buffer

1 files changed, 28 insertions, 25 deletions

diff --git a/include/base/memory.h b/include/base/memory.h
index d80b34c..dd00992 100644
--- a/include/base/memory.h
+++ b/include/base/memory.h
@@ -1,38 +1,49 @@
 #pragma once
 
 // ----------------------------------------------------------------------------
+// basic memory operations
+
+/* mem functions */
+int   mem·move(void *dst, uintptr size, void *src);
+int   mem·copy(void *dst, uintptr size, void *src);
+int   mem·compare(void *, uintptr size, void *);
+void *mem·findc(void *dst, uintptr len, int c);
+int   mem·set(void *dst, uintptr size, int val);
+int   mem·set64(void *dst, uintptr size, uint64 val);
+
+// ----------------------------------------------------------------------------
 // dynamic array
 
-typedef struct BufHdr
+typedef struct mem·BufHead
 {
     vlong len;
     vlong cap;
     byte  buf[];
-} BufHdr;
+} mem·BufHead;
 
-#define bufhdr(b)        ((BufHdr*)((uint8*)(b)-offsetof(BufHdr, buf)))
-#define buflen(b)        ((b) ? (bufhdr(b)->len) : 0)
-#define bufcap(b)        ((b) ? (bufhdr(b)->cap) : 0)
-#define bufend(b)        ((b) + buflen(b))
-#define bufsize(b)       ((b) ? (buflen(b) * sizeof((b)[0])) : 0)
+#define mem·bufhdr(b)        ((mem·BufHead*)((uint8*)(b)-offsetof(mem·BufHead, buf)))
+#define mem·buflen(b)        ((b) ? (mem·bufhdr(b)->len) : 0)
+#define mem·bufcap(b)        ((b) ? (mem·bufhdr(b)->cap) : 0)
+#define mem·bufend(b)        ((b) + mem·buflen(b))
+#define mem·bufsize(b)       ((b) ? (mem·buflen(b) * sizeof((b)[0])) : 0)
 
-#define buffree(b)       ((b) ? (free(bufhdr(b)), (b) = nil) : 0)
-#define buffit(b, n)     ((n) <= bufcap(b) ? 0 : ((b) = ·bufgrow((b), (n), sizeof(*(b)))))
+#define mem·buffree(b)       ((b) ? (free(mem·bufhdr(b)), (b) = nil) : 0)
+#define mem·buffit(b, n)     ((n) <= mem·bufcap(b) ? 0 : ((b) = mem·bufgrow((b), (n), sizeof(*(b)))))
 
-#define bufpush(b, ...)  (buffit((b), 1 + buflen(b)), (b)[bufhdr(b)->len++] = (__VA_ARGS__))
-#define bufaddn(b, n)    (buffit(b, buflen(b)+n), bufhdr(b)->len += n, b+bufhdr(b)->len-n)
+#define mem·bufpush(b, ...)  (mem·buffit((b), 1 + mem·buflen(b)), (b)[mem·bufhdr(b)->len++] = (__VA_ARGS__))
+#define mem·bufaddn(b, n)    (mem·buffit(b, mem·buflen(b)+n), mem·bufhdr(b)->len += n, b+mem·bufhdr(b)->len-n)
 
-#define bufpop(b)         ((b)[--bufhdr(b)->len])
-#define bufdel(b, i)      bufdeln((b), (i), 1)
-#define bufdeln(b, i, n)  (memmove((b)+(i), (b)+(i)+(n), sizeof(*(b))*(bufhdr(b)->len-(n)-(i)), bufhdr(b)->len -= (n))
-#define bufdelswap(b, i)  ((b)[i] = bufend(b)[-1], bufhdr(b)->len-=1)
+#define mem·bufpop(b)         ((b)[--mem·bufhdr(b)->len])
+#define mem·bufdel(b, i)      mem·bufdeln((b), (i), 1)
+#define mem·bufdeln(b, i, n)  (mem·move((b)+(i), (b)+(i)+(n), sizeof(*(b))*(mem·bufhdr(b)->len-(n)-(i)), mem·bufhdr(b)->len -= (n))
+#define mem·bufdelswap(b, i)  ((b)[i] = mem·bufend(b)[-1], mem·bufhdr(b)->len-=1)
 
-void* ·bufgrow(void*, vlong, vlong);
+void* mem·bufgrow(void*, vlong, vlong);
 
 // -----------------------------------------------------------------------------
 // memory allocation
 
-/* allocator interface */
+/* interfaces */
 typedef struct mem·Allocator {
     void *(*alloc)(void *heap, uint n, ulong size);
     void  (*free)(void *heap, void *ptr);
@@ -56,11 +67,3 @@ void      *mem·arenaalloc(mem·Arena *A, uint n, ulong size);
 void       mem·freearena(mem·Arena *A);
 
 extern mem·Allocator mem·ArenaAllocator;
-
-/* mem functions */
-int   mem·move(void *dst, uintptr size, void *src);
-int   mem·copy(void *dst, uintptr size, void *src);
-int   mem·compare(void *, uintptr size, void *);
-void *mem·findc(void *dst, uintptr len, int c);
-int   mem·set(void *dst, uintptr size, int val);
-int   mem·set64(void *dst, uintptr size, uint64 val);