From 52f9a2fe330e9615d8f7209255cfe3b79e6c30e1 Mon Sep 17 00:00:00 2001 From: Daniel Ledda Date: Sun, 9 Nov 2025 04:18:08 +0100 Subject: [PATCH] migration --- .clangd | 3 +- app.cpp | 7 +-- core.cpp => core.c | 98 ++++++++++++++------------------ core.h | 113 +++++++++++++++++++------------------ os.cpp => os.c | 8 +-- os.h | 6 +- os_linux.cpp => os_linux.c | 10 ++-- os_win32.cpp => os_win32.c | 6 +- 8 files changed, 121 insertions(+), 130 deletions(-) rename core.cpp => core.c (86%) rename os.cpp => os.c (56%) rename os_linux.cpp => os_linux.c (95%) rename os_win32.cpp => os_win32.c (97%) diff --git a/.clangd b/.clangd index 5467e39..659449b 100644 --- a/.clangd +++ b/.clangd @@ -1,3 +1,4 @@ CompileFlags: - Add: + Add: + - [-std=c99, -xc] - -DOS_LINUX diff --git a/app.cpp b/app.cpp index 0d9a646..6087bdf 100644 --- a/app.cpp +++ b/app.cpp @@ -1,13 +1,12 @@ #include -#include "core.cpp" -#include "core.h" +#include "core.c" int main(int argc, char **argv) { initialiseDjStdCore(); Arena *arena = arenaAlloc(Megabytes(64)); - list args = getArgs(arena, argc, argv); + StringList args = getArgs(arena, argc, argv); - print("%S", strSplit(arena, "-"_s, "hallo-world"_s)); + print("%S", strSplit(arena, s("-"), s("hallo-world"))); return 0; } diff --git a/core.cpp b/core.c similarity index 86% rename from core.cpp rename to core.c index 4064f39..16c1665 100644 --- a/core.cpp +++ b/core.c @@ -1,6 +1,6 @@ -#include "os.cpp" -#include -#include +#include "os.c" +#include "math.h" +#include "string.h" // memmove #include "core.h" #define STB_SPRINTF_IMPLEMENTATION #include "vendor/stb_sprintf.h" @@ -78,13 +78,6 @@ void scratchEnd(Scratch scratch) { arenaFreeFrom(scratch.arena, scratch.start); } -const char *cstring(Arena *arena, CharList buf) { - char *arr = PushArray(arena, char, buf.length + 1); - memmove(arr, buf.data, buf.length); - arr[buf.length] = '\0'; - return arr; -} - const char *cstring(Arena *arena, string str) { char *arr = PushArray(arena, char, str.length + 1); memmove(arr, str.str, str.length); @@ -92,6 +85,13 @@ const char *cstring(Arena *arena, string str) { return arr; } +const char *cstringFromCharList(Arena *arena, CharList buf) { + char *arr = PushArray(arena, char, buf.length + 1); + memmove(arr, buf.data, buf.length); + arr[buf.length] = '\0'; + return arr; +} + bool strStartsWith(string str, string testStr) { if (str.length < testStr.length) { return false; @@ -165,21 +165,7 @@ string strPrintf(Arena *arena, const char *fmt, ...) { return result; } -template -list listSlice(list l, size_t start, size_t stop) { - if (stop == 0) { - stop = l.head; - } - // TODO(djledda): maybe assert instead - if (stop > l.head || start > stop) { - return {0}; - } - return { - l.data + start, - stop - start, - stop - start, - }; -} +#define ListSlice(__ls_list__, __ls_start__, __ls_stop__) (__ls_stop__ > l.head || __ls_start__ > __ls_stop__ ? {0} : { l.data + start, stop - start, stop - start, }) string strSlice(string str, size_t start, size_t stop) { if (stop == 0) { @@ -187,16 +173,16 @@ string strSlice(string str, size_t start, size_t stop) { } // TODO(djledda): maybe assert instead if (stop > str.length || start > stop) { - return {0}; + return (string){0}; } - return { + return (string){ str.str + start, stop - start, }; } -string strSlice(char *data, size_t start, size_t stop) { - return { +string strSliceCStr(char *data, size_t start, size_t stop) { + return (string){ data + start, stop - start, }; @@ -211,7 +197,7 @@ bool stringContains(string str, char c) { return false; } -string NUMERIC_CHARS = "0123456789"_s; +string NUMERIC_CHARS = s("0123456789"); inline bool isNumeric(char c) { return stringContains(NUMERIC_CHARS, c); } @@ -259,17 +245,17 @@ ParsePositiveIntResult parsePositiveInt(string str, size_t *lengthPointer) { result *= 10; result += str.str[i] - '0'; } - return {result, true}; + return (ParsePositiveIntResult){ result, true }; } else { - return {0, false}; + return (ParsePositiveIntResult){0, false}; } } ParsePositiveReal32Result parsePositiveReal32(string str, size_t *lengthPointer) { ParsePositiveReal32Result result = {NAN, false}; - string wholePartStr = string{0}; - string fractionalPartStr = string{0}; + string wholePartStr = (string){0}; + string fractionalPartStr = (string){0}; bool split = false; size_t c = 0; @@ -311,7 +297,7 @@ StringList getArgs(Arena *arena, int argc, char **argv) { } return args; } - + UnixTimestamp getSystemUnixTime() { time_t now; time(&now); @@ -319,15 +305,15 @@ UnixTimestamp getSystemUnixTime() { } Timestamp timestampFromUnixTime(UnixTimestamp *unixTimestamp) { - tm timestamp = {0}; + struct tm timestamp = {0}; gmtime_r((time_t *)unixTimestamp, ×tamp); return timestamp; } -string formatTimeHms(Arena *arena, UnixTimestamp time) { - local_persist const string format = strlit("HH-MM-SS"); +string formatTimeHmsUnix(Arena *arena, UnixTimestamp time) { + local_persist const string format = s("HH-MM-SS"); string buf = PushString(arena, format.length); - tm *timestamp = gmtime((time_t *)&time); + struct tm *timestamp = gmtime((time_t *)&time); strftime(buf.str, buf.length + 1, "%T", timestamp); return buf; } @@ -335,14 +321,14 @@ string formatTimeHms(Arena *arena, UnixTimestamp time) { string formatTimeHms(Arena *arena, Timestamp *time) { local_persist const string format = s("HH-MM-SS"); string buf = PushString(arena, format.length); - strftime(buf.str, buf.length + 1, "%T", (tm *)time); + strftime(buf.str, buf.length + 1, "%T", (struct tm *)time); return buf; } -string formatTimeYmd(Arena *arena, UnixTimestamp time) { +string formatTimeYmdUnix(Arena *arena, UnixTimestamp time) { local_persist const string format = s("YYYY-mm-dd"); string buf = PushString(arena, format.length); - tm *timestamp = gmtime((time_t *)&time); + struct tm *timestamp = gmtime((time_t *)&time); strftime(buf.str, buf.length + 1, "%Y-%m-%d", timestamp); return buf; } @@ -350,7 +336,7 @@ string formatTimeYmd(Arena *arena, UnixTimestamp time) { string formatTimeYmd(Arena *arena, Timestamp *time) { local_persist const string format = s("YYYY-mm-dd"); string buf = PushString(arena, format.length); - strftime(buf.str, buf.length + 1, "%Y-%m-%d", (tm *)time); + strftime(buf.str, buf.length + 1, "%Y-%m-%d", (struct tm *)time); return buf; } @@ -375,6 +361,8 @@ void print(const char *fmt, ...) { va_end(argList); } +// TODO(dledda): mat print functions +/* void print(list> l, StdStream target) { void (*logFn)(const char *fmt, ...) = target == StdStream_stdout ? &printStdout : &printStderr; logFn("{ "); @@ -410,29 +398,29 @@ void print(list> l, StdStream target) { } logFn(" } length: %zu, head: %zu\n", l.length, l.head); } +*/ -void print(list l, StdStream target) { - void (*logFn)(const char *fmt, ...) = target == StdStream_stdout ? &printStdout : &printStderr; - logFn("{ "); +void (*__djstdlib_logFn)(const char *fmt, ...) = &printStdout; +void printIntList(IntList l) { + __djstdlib_logFn("{ "); for (size_t i = 0; i < l.length; i++) { if (i != 0) { - logFn(", "); + __djstdlib_logFn(", "); } - logFn("%i", l.data[i]); + __djstdlib_logFn("%i", l.data[i]); } - logFn(" } length: %zu, head: %zu\n", l.length, l.head); + __djstdlib_logFn(" } length: %zu, head: %zu\n", l.length, l.head); } -void print(list l, StdStream target) { - void (*logFn)(const char *fmt, ...) = target == StdStream_stdout ? &printStdout : &printStderr; - logFn("{ "); +void printStringList(StringList l) { + __djstdlib_logFn("{ "); for (size_t i = 0; i < l.length; i++) { if (i != 0) { - logFn(", "); + __djstdlib_logFn(", "); } - logFn("\"%S\"", l.data[i]); + __djstdlib_logFn("\"%S\"", l.data[i]); } - logFn(" } length: %zu, head: %zu\n", l.length, l.head); + __djstdlib_logFn(" } length: %zu, head: %zu\n", l.length, l.head); } int intCompare(const void *a, const void *b) { diff --git a/core.h b/core.h index e7a0e6c..b806ffd 100644 --- a/core.h +++ b/core.h @@ -2,21 +2,21 @@ #define CORE_H // cstdlib includes -#include -#include -#include // necessary for int type sizes -#include -#include // TODO(djledda): try not to depend on this one +#include "math.h" +#include "stdbool.h" +#include "stdint.h" // necessary for int type sizes +#include "stdio.h" +#include "time.h" // TODO(djledda): try not to depend on this one -// ### Misc macros ### +// ### Misc macros ### #if ENABLE_ASSERT #define Assert(expression) if (!(expression)) {*(volatile int *)0 = 0;} #else -#define Assert(expression) +#define Assert(expression) #endif #define function static -#define global static +#define global static #define local_persist static // ### Types ### @@ -45,18 +45,20 @@ typedef struct string string; #define Billion(n) ((n)*1000000000LL) #define ArrayCount(arr) (sizeof(arr) / sizeof((arr)[0])) +#define MemberSize(type, memberName) (sizeof(((type*)0)->data)) +#define MemberSizeUnderlying(type, memberName) (sizeof(*((type*)0)->data)) // ### Arenas ### -struct Arena { +typedef struct { void *memory; size_t capacity; size_t head; -}; +} Arena; -struct Scratch { +typedef struct { Arena *arena; size_t start; -}; +} Scratch; void *pushSize(Arena *arena, size_t bytes); void *pushSizeFill(Arena *arena, size_t bytes, byte fill); @@ -67,8 +69,8 @@ void arenaPopTo(Arena *arena, void *pos); void initialiseDjStdCore(); -Scratch scratchStart(Arena **conflicts, size_t conflictCount); -void scratchEnd(Scratch scratch); +Scratch scratchStart(Arena **conflicts, size_t conflictCount); +void scratchEnd(Scratch scratch); #define PushArray(arena, type, size) (type *)pushSize(arena, sizeof(type) * (size)) #define PushArrayZero(arena, type, size) (type *)pushSizeFill(arena, sizeof(type) * (size), 0) @@ -76,13 +78,13 @@ void scratchEnd(Scratch scratch); #define PushStructZero(arena, type) (type *)pushSizeFill(arena, sizeof(type), 0) // ### Vectors ### -union Vec2 { +typedef union { struct { real32 x; real32 y; }; real32 vec[2]; -}; +} Vec2; inline function Vec2 vec2(real32 x, real32 y) { Vec2 result = {0}; result.x = x; @@ -90,14 +92,14 @@ inline function Vec2 vec2(real32 x, real32 y) { return result; } -union Vec3 { +typedef union { struct { real32 x; real32 y; real32 z; }; real32 vec[3]; -}; +} Vec3; inline function Vec3 vec3(real32 x, real32 y, real32 z) { Vec3 result = {0}; result.x = x; @@ -106,7 +108,7 @@ inline function Vec3 vec3(real32 x, real32 y, real32 z) { return result; } -union Vec4 { +typedef union { struct { real32 r; real32 g; @@ -120,7 +122,7 @@ union Vec4 { real32 w; }; real32 vec[4]; -}; +} Vec4; inline function Vec4 vec4(real32 x, real32 y, real32 z, real32 w) { Vec4 result = {0}; result.x = x; @@ -140,11 +142,11 @@ inline function Vec4 vec4(real32 x, real32 y, real32 z, real32 w) { DefineList(string, String); -#define PushList(arena, type, size) ((type){ PushArray(arena, type, size), size, 0 }) +#define PushList(arena, type, size) ((type){ pushSize(arena, MemberSizeUnderlying(type, data)), size, 0 }) #define EmptyList(type) ((type){ NULL, 0, 0 }) -#define PushListZero(arena, type, size) ((type){ PushArrayZero(arena, type, size), size, 0 }) -#define PushFullList(arena, type, size) ((type){ PushArray(arena, type, size), size, size }) -#define PushFullListZero(arena, type, size) ((type){ PushArrayZero(arena, type, size), size, size }) +#define PushListZero(arena, type, size) ((type){ pushSizeFill(arena, MemberSizeUnderlying(type, data), 0), size, 0 }) +#define PushFullList(arena, type, size) ((type){ pushSize(arena, MemberSizeUnderlying(type, data)), size, size }) +#define PushFullListZero(arena, type, size) ((type){ pushSizeFill(arena, MemberSizeUnderlying(type, data), 0), size, size }) #define ArrayAsList(type, array) ((type){ array, ArrayCount(array), ArrayCount(array) }) #define AppendList(type, list, element) \ @@ -163,58 +165,58 @@ struct string { #define STB_SPRINTF_DECORATE(name) stb_##name // define this before including if you want to change the names #include "vendor/stb_sprintf.h" -#define s(lit) (string{(char *)(lit), sizeof(lit) - 1}) -#define PushString(arena, length) (string{ (char *)pushSize(arena, length), (length) }) -#define PushStringFill(arena, length, characterByte) (string{ (char *)pushSizeFill(arena, length, characterByte), (length) }) +#define s(lit) ((string){(char *)(lit), sizeof(lit) - 1}) +#define PushString(arena, length) ((string){ (char *)pushSize(arena, length), (length) }) +#define PushStringFill(arena, length, characterByte) ((string){ (char *)pushSizeFill(arena, length, characterByte), (length) }) // C Strings DefineList(char, Char); -const char *cstringFromCharList(Arena *arena, CharList buf); -const char *cstring(Arena *arena, string str); -size_t calcStringLen(const char *str); -string strFromCString(Arena *arena, const char *str); +const char *cstringFromCharList(Arena *arena, CharList buf); +const char *cstring(Arena *arena, string str); +size_t calcStringLen(const char *str); +string strFromCString(Arena *arena, const char *str); -bool strEql(string s1, string s2); +bool strEql(string s1, string s2); bool strStartsWith(string str, string testStr); -bool stringContains(string str, char c); +bool stringContains(string str, char c); -string strReverse(Arena *arena, string str); -string strSlice(string str, size_t start, size_t stop = 0); -string strSlice(char *data, size_t start, size_t stop = 0); -StringList strSplit(Arena *arena, string splitStr, string inputStr); +string strReverse(Arena *arena, string str); +string strSlice(string str, size_t start, size_t stop); +string strSliceCStr(char *data, size_t start, size_t stop); +StringList strSplit(Arena *arena, string splitStr, string inputStr); string strPrintfv(Arena *arena, const char *fmt, va_list args); string strPrintf(Arena *arena, const char *fmt, ...); -struct ParsePositiveIntResult { uint8 result; bool valid; }; -ParsePositiveIntResult parsePositiveInt(string str, size_t *lengthPointer); -struct ParsePositiveReal32Result { real32 result; bool valid; }; -ParsePositiveReal32Result parsePositiveReal32(Arena *arena, string str, size_t *lengthPointer); +typedef struct { uint8 result; bool valid; } ParsePositiveIntResult; +ParsePositiveIntResult parsePositiveInt(string str, size_t *lengthPointer); +typedef struct { real32 result; bool valid; } ParsePositiveReal32Result; +ParsePositiveReal32Result parsePositiveReal32(string str, size_t *lengthPointer); -inline function bool isNumeric(char c); +inline function bool isNumeric(char c); // ### Cmdline ### -StringList getArgs(Arena *arena, int argc, char **argv); +StringList getArgs(Arena *arena, int argc, char **argv); // ### Time ### typedef uint64 UnixTimestamp; -typedef tm Timestamp; +typedef struct tm Timestamp; -UnixTimestamp getSystemUnixTime(); -Timestamp timestampFromUnixTime(UnixTimestamp *unixTimestamp); -string formatTimeHms(Arena *arena, UnixTimestamp time); -string formatTimeHms(Arena *arena, Timestamp *time); -string formatTimeYmd(Arena *arena, UnixTimestamp time); -string formatTimeYmd(Arena *arena, Timestamp *time); +UnixTimestamp getSystemUnixTime(); +Timestamp timestampFromUnixTime(UnixTimestamp *unixTimestamp); +string formatTimeHmsUnix(Arena *arena, UnixTimestamp time); +string formatTimeHms(Arena *arena, Timestamp *time); +string formatTimeYmdUnix(Arena *arena, UnixTimestamp time); +string formatTimeYmd(Arena *arena, Timestamp *time); // ### Linked Lists ### // TODO(djledda): implement basic linked lists (based on arenas?) // ### Logging ### -enum StdStream { +typedef enum { StdStream_stdout, StdStream_stdin, StdStream_stderr, -}; +} StdStream; #define ANSI_INSTRUCTION_FROM_ENUM(ansiCodeEnum) ANSI_INSTRUCTION(ansiCodeEnum) #define ANSI_INSTRUCTION(ansiCode) "\u001b[" #ansiCode "m" @@ -262,9 +264,10 @@ enum StdStream { #define COLOR_TEXT_FG_BG(text, foregroundcolor, backgroundcolor) ANSI_INSTRUCTION_FROM_ENUM(foregroundcolor) ANSI_INSTRUCTION_FROM_ENUM(backgroundcolor) text ANSI_RESET #define COLOR_TEXT_RGB(text, red, green, blue) ANSI_INSTRUCTION_STR("38;2;" #red ";" #green ";" #blue) text ANSI_RESET +#define SetStdErr() DeferLoop DefineList(int, Int); -void printIntList(IntList l, StdStream target = StdStream_stdout); -void printStrList(StringList l, StdStream target = StdStream_stdout); +void printIntListErr(IntList l); +void printStrListErr(StringList l); void print(const char *fmt, ...); void printErr(const char *fmt, ...); @@ -274,6 +277,6 @@ void printErr(const char *fmt, ...); #define EachInArray(arr, it) size_t it = 0; it < ArrayCount(arr); ++it // ### Misc ### -int intCompare(const void *a, const void *b); +int intCompare(const void *a, const void *b); #endif diff --git a/os.cpp b/os.c similarity index 56% rename from os.cpp rename to os.c index 480231e..4445456 100644 --- a/os.cpp +++ b/os.c @@ -1,10 +1,10 @@ -#ifndef OS_CPP -#define OS_CPP +#ifndef OS_C +#define OS_C #if OS_WINDOWS -#include "os_win32.cpp" +#include "os_win32.c" #elif OS_LINUX -#include "os_linux.cpp" +#include "os_linux.c" #else #error Development environment not supported. #endif diff --git a/os.h b/os.h index de1c01a..c9446d8 100644 --- a/os.h +++ b/os.h @@ -10,9 +10,9 @@ void os_decommit(void *ptr); void os_free(void *ptr, size_t freeSize); // ### File IO ### -string os_readEntireFile(Arena *arena, string filename); -bool os_writeEntireFile(Arena *arena, string filename, const byte *contents, size_t contentsLength); -bool os_fileAppend(Arena *arena, string filename, const byte *contents, size_t contentsLength); +string os_readEntireFile(Arena *arena, string filename); +bool os_writeEntireFile(Arena *arena, string filename, const byte *contents, size_t contentsLength); +bool os_fileAppend(Arena *arena, string filename, const byte *contents, size_t contentsLength); // ### Standard IO ### void os_print(StdStream target, const char *fmt, va_list argList); diff --git a/os_linux.cpp b/os_linux.c similarity index 95% rename from os_linux.cpp rename to os_linux.c index 24eac8e..8da939a 100644 --- a/os_linux.cpp +++ b/os_linux.c @@ -1,11 +1,11 @@ -#ifndef OS_IMPL_LINUX_CPP -#define OS_IMPL_LINUX_CPP +#ifndef OS_IMPL_LINUX_C +#define OS_IMPL_LINUX_C #include "os.h" -#include -#include -#include +#include "sys/mman.h" +#include "sys/stat.h" +#include "unistd.h" void *os_alloc(size_t capacity) { return mmap(0, capacity, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); diff --git a/os_win32.cpp b/os_win32.c similarity index 97% rename from os_win32.cpp rename to os_win32.c index bd7acd0..a757f84 100644 --- a/os_win32.cpp +++ b/os_win32.c @@ -1,7 +1,7 @@ -#ifndef OS_IMPL_WIN32_CPP -#define OS_IMPL_WIN32_CPP +#ifndef OS_IMPL_WIN32_C +#define OS_IMPL_WIN32_C -#include "Windows.h" +#include "Windows.h" #include "os.h" void *os_alloc(size_t commitSize) {