aboutsummaryrefslogtreecommitdiff
path: root/String.c
diff options
context:
space:
mode:
Diffstat (limited to 'String.c')
-rw-r--r--String.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/String.c b/String.c
index 2467189..d5bcb88 100644
--- a/String.c
+++ b/String.c
@@ -11,12 +11,12 @@ struct StringMeta {
};
static inline struct StringMeta*
-String_metadata(String s) {
+S_metadata(String s) {
return (struct StringMeta*)(s - sizeof(struct StringMeta));
}
String
-String_new(BumpArena b, const char* str) {
+S_new(BumpArena b, const char* str) {
if (NULL == b || NULL == str)
return NULL;
@@ -25,7 +25,7 @@ String_new(BumpArena b, const char* str) {
.length = strlen(str),
};
- void* start = Balloc(b, sizeof(sm) + sm.length + 1);
+ void* start = B_alloc(b, sizeof(sm) + sm.length + 1);
memcpy(start, &sm, sizeof(sm));
start += sizeof(sm);
@@ -35,7 +35,7 @@ String_new(BumpArena b, const char* str) {
}
String
-String_newlen(BumpArena b, usize length) {
+S_newlen(BumpArena b, usize length) {
if (NULL == b)
return NULL;
@@ -44,7 +44,7 @@ String_newlen(BumpArena b, usize length) {
.length = length,
};
- void* start = Balloc(b, sizeof(sm) + sm.length + 1);
+ void* start = B_alloc(b, sizeof(sm) + sm.length + 1);
memcpy(start, &sm, sizeof(sm));
start += sizeof(sm);
@@ -54,42 +54,42 @@ String_newlen(BumpArena b, usize length) {
}
static inline usize
-String_allocated(String s) {
- return sizeof(struct StringMeta) + String_length(s) + 1;
+S_allocated(String s) {
+ return sizeof(struct StringMeta) + S_length(s) + 1;
}
String
-String_dup(BumpArena b, String s) {
+S_dup(BumpArena b, String s) {
if (NULL == b || NULL == s)
return NULL;
- usize allocated = String_allocated(s);
+ usize allocated = S_allocated(s);
- void* start = Balloc(b, allocated);
+ void* start = B_alloc(b, allocated);
memcpy(start, s - sizeof(struct StringMeta), allocated);
return NULL;
}
usize
-String_length(String s) {
+S_length(String s) {
if (NULL == s)
return 0;
- return String_metadata(s)->length;
+ return S_metadata(s)->length;
}
Result
-String_append(String s, const char* str) {
+S_append(String s, const char* str) {
if (NULL == s)
return R_Uninitialized;
- struct StringMeta* sm = String_metadata(s);
+ struct StringMeta* sm = S_metadata(s);
usize strlength = strlen(str);
if (sm->length - strlen(s) < strlength) {
- if (!Bresizeable(sm->b, s))
+ if (!B_resizeable(sm->b, s))
return R_Err;
- Bresize(sm->b, sizeof(*sm) + (sm->length += strlength) + 1);
+ B_resize(sm->b, sizeof(*sm) + (sm->length += strlength) + 1);
}
strcat(s, str);
@@ -97,18 +97,18 @@ String_append(String s, const char* str) {
}
Result
-String_prepend(String s, const char* str) {
+S_prepend(String s, const char* str) {
if (NULL == s)
return R_Uninitialized;
- struct StringMeta* sm = String_metadata(s);
+ struct StringMeta* sm = S_metadata(s);
usize strlength = strlen(str);
- if (!Bresizeable(sm->b, s))
+ if (!B_resizeable(sm->b, s))
return R_Err;
usize orig_len = sm->length;
- RETURN_NOTOK(Bresize(sm->b, sizeof(*sm) + (sm->length += strlength) + 1));
+ RETURN_NOTOK(B_resize(sm->b, sizeof(*sm) + (sm->length += strlength) + 1));
for (usize i = orig_len; i > 0; --i)
s[i - 1 + strlength] = s[i - 1];
@@ -119,7 +119,7 @@ String_prepend(String s, const char* str) {
}
usize
-String_find(String s, char c) {
+S_find(String s, char c) {
if (NULL == s)
return -1;
@@ -131,7 +131,7 @@ String_find(String s, char c) {
}
static String
-String_vconcat(BumpArena b, va_list args) {
+S_vconcat(BumpArena b, va_list args) {
usize length = 0;
va_list temp;
@@ -142,7 +142,7 @@ String_vconcat(BumpArena b, va_list args) {
va_end(temp);
printf("%lu\n", length);
- String result = String_newlen(b, length);
+ String result = S_newlen(b, length);
if (0 < length) {
for (const char* str = va_arg(args, const char*); str != NULL; str = va_arg(args, const char*))
@@ -152,78 +152,78 @@ String_vconcat(BumpArena b, va_list args) {
}
String
-String_concat(BumpArena b, ...) {
+S_concat(BumpArena b, ...) {
va_list args;
usize length = 0;
va_start(args, b);
- String result = String_vconcat(b, args);
+ String result = S_vconcat(b, args);
va_end(args);
return result;
}
static String
-String_vprintf(BumpArena b, const char* fmt, va_list args) {
+S_vprintf(BumpArena b, const char* fmt, va_list args) {
va_list temp;
va_copy(temp, args);
usize length = vsnprintf(NULL, 0, fmt, temp);
va_end(temp);
- String result = String_newlen(b, length);
+ String result = S_newlen(b, length);
vsnprintf(result, length, fmt, args);
return result;
}
String
-String_printf(BumpArena b, const char* fmt, ...) {
+S_printf(BumpArena b, const char* fmt, ...) {
va_list args;
va_start(args, fmt);
- String result = String_vprintf(b, fmt, args);
+ String result = S_vprintf(b, fmt, args);
va_end(args);
return result;
}
String
-String_Gnew(const char* str) {
- return String_new(g_arena, str);
+SG_new(const char* str) {
+ return S_new(g_arena, str);
}
String
-String_Gnewlen(usize length) {
- return String_newlen(g_arena, length);
+SG_newlen(usize length) {
+ return S_newlen(g_arena, length);
}
String
-String_Gdup(String s) {
- return String_dup(g_arena, s);
+SG_dup(String s) {
+ return S_dup(g_arena, s);
}
String
-String_Gconcat(const char* str, ...) {
+SG_concat(const char* str, ...) {
if (str == NULL)
return NULL;
va_list args;
va_start(args, str);
- String result = String_vconcat(g_arena, args);
+ String result = S_vconcat(g_arena, args);
va_end(args);
- String_prepend(result, str);
+ S_prepend(result, str);
return result;
}
String
-String_Gprintf(const char* fmt, ...) {
+SG_printf(const char* fmt, ...) {
va_list args;
va_start(args, fmt);
- String result = String_vprintf(g_arena, fmt, args);
+ String result = S_vprintf(g_arena, fmt, args);
va_end(args);
return result;