From 7e4e763d8f2e15c4f2b2a77402f4fe0c4e8b5f68 Mon Sep 17 00:00:00 2001 From: segunkayode1 Date: Mon, 26 Feb 2024 01:52:17 +1100 Subject: string subview functions --- src/std/str.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/std/str.c b/src/std/str.c index 3b2770e..1e092bc 100644 --- a/src/std/str.c +++ b/src/std/str.c @@ -41,4 +41,28 @@ str8 str8_concat(arena* a, str8 left, str8 right) { dest[n_bytes - 1] = '\0'; return str8_create(dest, n_bytes); -} \ No newline at end of file +} + +str8 str8_substr(str8 s, u64 min, u64 max){ + s.buf = s.buf + (ptrdiff_t)min; + s.len = max - min; + return s; +} + +str8 str8_take(str8 s, u64 first_n){ + return str8_substr(s, 0, first_n); +} + +str8 str8_drop(str8 s, u64 last_n){ + return str8_substr(s, s.len - last_n, s.len); +} + +str8 str8_skip(str8 s, u64 n){ + return str8_substr(s, n, s.len); +} + +str8 str8_chop(str8 s, u64 n){ + return str8_substr(s, 0, s.len - n); +} + + -- cgit v1.2.3-70-g09d2 From 055b213beac82f1ca0fb10b2eebce6df3cb216b2 Mon Sep 17 00:00:00 2001 From: segunkayode1 Date: Mon, 26 Feb 2024 20:42:44 +1100 Subject: update --- src/std/str.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/std/str.c b/src/std/str.c index 1e092bc..7dafef1 100644 --- a/src/std/str.c +++ b/src/std/str.c @@ -1,6 +1,6 @@ #include "str.h" #include - +#include #include "mem.h" str8 str8_create(u8* buf, size_t len) { return (str8){ .buf = buf, .len = len }; } @@ -43,25 +43,29 @@ str8 str8_concat(arena* a, str8 left, str8 right) { return str8_create(dest, n_bytes); } -str8 str8_substr(str8 s, u64 min, u64 max){ - s.buf = s.buf + (ptrdiff_t)min; - s.len = max - min; - return s; +str8 str8_substr(str8 s, u64 min, u64 max) { + assert(min >= 0); + assert(min < s.len); + assert(max >= 0); + assert(max <= s.len); + uint8_t * start = s.buf + (ptrdiff_t)min; + size_t new_len = max - min; + return (str8) {.buf = start, .len = new_len }; } -str8 str8_take(str8 s, u64 first_n){ +str8 str8_take(str8 s, u64 first_n) { return str8_substr(s, 0, first_n); } -str8 str8_drop(str8 s, u64 last_n){ +str8 str8_drop(str8 s, u64 last_n) { return str8_substr(s, s.len - last_n, s.len); } -str8 str8_skip(str8 s, u64 n){ +str8 str8_skip(str8 s, u64 n) { return str8_substr(s, n, s.len); } -str8 str8_chop(str8 s, u64 n){ +str8 str8_chop(str8 s, u64 n) { return str8_substr(s, 0, s.len - n); } -- cgit v1.2.3-70-g09d2