Timerix/tlibc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewritten Array and List, changed str.size -> .len

Browse Source
This commit is contained in:
Timerix
2025-11-25 14:13:25 +05:00
parent b557881168
commit 82bd234d08
48 changed files with 389 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/string/StringBuilder.c
View File

@@ -8,41 +8,40 @@ void StringBuilder_destroy(StringBuilder* b){
}
str StringBuilder_getStr(StringBuilder* b){
if(b->buffer.size == 0 || ((char*)b->buffer.data)[b->buffer.size - 1] != '\0'){
List_push(&b->buffer, u8, '\0');
// '\0' at the end doesn't increase buffer.size
b->buffer.size -= 1;
if(b->buffer.len == 0 || b->buffer.data[b->buffer.len - 1] != '\0'){
List_char_push(&b->buffer, '\0');
// '\0' at the end doesn't increase buffer.len
b->buffer.len -= 1;
}
str result = str_construct((char*)b->buffer.data, b->buffer.size, true);
str result = str_construct(b->buffer.data, b->buffer.len, true);
return result;
}
bool StringBuilder_equals(const StringBuilder* a, const StringBuilder* b){
str a_str = str_construct((char*)a->buffer.data, a->buffer.size, false);
str b_str = str_construct((char*)b->buffer.data, b->buffer.size, false);
str a_str = str_construct(a->buffer.data, a->buffer.len, false);
str b_str = str_construct(b->buffer.data, b->buffer.len, false);
return str_equals(a_str, b_str);
}
void StringBuilder_removeFromEnd(StringBuilder* b, u32 count){
if(count < b->buffer.size){
b->buffer.size -= count;
if(count < b->buffer.len){
b->buffer.len -= count;
}
else{
b->buffer.size = 0;
b->buffer.len = 0;
}
}
void StringBuilder_append_char(StringBuilder* b, char c){
List_push(&b->buffer, u8, c);
List_char_push(&b->buffer, c);
}
void StringBuilder_append_str(StringBuilder* b, str s){
if(s.data == NULL)
return;
List_push_size(&b->buffer, s.data, s.size);
List_char_pushMany(&b->buffer, s.data, s.len);
}
void StringBuilder_append_cstr(StringBuilder* b, cstr s){
@@ -78,7 +77,7 @@ void StringBuilder_append_memory(StringBuilder* b, Array(u8) mem, bool uppercase
return;
char buf[8];
for (u32 i=0; i < mem.size; i++) {
for (u32 i=0; i < mem.len; i++) {
sprintf(buf, uppercase ? "%02X" : "%02x", ((u8*)mem.data)[i]);
StringBuilder_append_str(b, str_construct(buf, 2, true));
}

74
src/string/str.c
View File

@@ -2,17 +2,17 @@
#include "tlibc/string/StringBuilder.h"
str str_copy(const str self){
if(self.data == NULL || self.size == 0)
if(self.data == NULL || self.len == 0)
return self;
str copy = str_construct((char*)malloc(self.size + 1), self.size, true);
memcpy(copy.data, self.data, self.size);
copy.data[copy.size] = '\0';
str copy = str_construct((char*)malloc(self.len + 1), self.len, true);
memcpy(copy.data, self.data, self.len);
copy.data[copy.len] = '\0';
return copy;
}
bool str_equals(const str self, const str other){
if(self.size != other.size)
if(self.len != other.len)
return false;
if(self.data == other.data)
return true;
@@ -23,26 +23,26 @@ bool str_equals(const str self, const str other){
strncmp: 1.611s
memcmp: 0.710s
*/
return memcmp(self.data, other.data, self.size) == 0;
return memcmp(self.data, other.data, self.len) == 0;
}
str str_reverse(str s){
if(s.data == NULL || s.size == 0)
if(s.data == NULL || s.len == 0)
return s;
str r = str_construct(malloc(s.size), s.size, s.isZeroTerminated);
for(u32 i = 0; i < s.size; i++ )
r.data[i] = s.data[s.size - i - 1];
str r = str_construct(malloc(s.len), s.len, s.isZeroTerminated);
for(u32 i = 0; i < s.len; i++ )
r.data[i] = s.data[s.len - i - 1];
return r;
}
i32 str_seek(const str src, const str fragment, u32 startIndex){
if(src.size == 0 || fragment.size == 0)
if(src.len == 0 || fragment.len == 0)
return -1;
for(u32 i = startIndex; i < src.size - fragment.size + 1; i++){
for(u32 i = startIndex; i < src.len - fragment.len + 1; i++){
for(u32 j = 0;; j++){
if(j == fragment.size)
if(j == fragment.len)
return i;
if(src.data[i + j] != fragment.data[j])
break;
@@ -52,16 +52,16 @@ i32 str_seek(const str src, const str fragment, u32 startIndex){
}
i32 str_seekReverse(const str src, const str fragment, u32 startIndex){
if(src.size == 0 || fragment.size == 0)
if(src.len == 0 || fragment.len == 0)
return -1;
if(startIndex > src.size - 1)
startIndex = src.size - 1;
for(u32 i = startIndex; i >= fragment.size - 1; i--){
if(startIndex > src.len - 1)
startIndex = src.len - 1;
for(u32 i = startIndex; i >= fragment.len - 1; i--){
for(u32 j = 0;; j++){
if(j == fragment.size)
if(j == fragment.len)
return i - j + 1;
if(src.data[i - j] != fragment.data[fragment.size - 1 - j])
if(src.data[i - j] != fragment.data[fragment.len - 1 - j])
break;
}
}
@@ -69,7 +69,7 @@ i32 str_seekReverse(const str src, const str fragment, u32 startIndex){
}
i32 str_seekChar(const str src, char c, u32 startIndex){
for(u32 i = startIndex; i < src.size; i++){
for(u32 i = startIndex; i < src.len; i++){
if(src.data[i] == c)
return i;
}
@@ -77,8 +77,8 @@ i32 str_seekChar(const str src, char c, u32 startIndex){
}
i32 str_seekCharReverse(const str src, char c, u32 startIndex){
if(startIndex > src.size - 1)
startIndex = src.size - 1;
if(startIndex > src.len - 1)
startIndex = src.len - 1;
for(u32 i = startIndex; i != (u32)-1; i--){
if(src.data[i] == c)
return i;
@@ -87,36 +87,36 @@ i32 str_seekCharReverse(const str src, char c, u32 startIndex){
}
bool str_startsWith(const str src, const str fragment){
if(src.size < fragment.size)
if(src.len < fragment.len)
return false;
str src_fragment = str_null;
src_fragment.data = src.data;
src_fragment.size = fragment.size;
src_fragment.len = fragment.len;
return str_equals(src_fragment, fragment);
}
bool str_endsWith(const str src, const str fragment){
if(src.size < fragment.size)
if(src.len < fragment.len)
return false;
str src_fragment = str_null;
src_fragment.data = (char*)(src.data + src.size - fragment.size);
src_fragment.size = fragment.size;
src_fragment.data = (char*)(src.data + src.len - fragment.len);
src_fragment.len = fragment.len;
return str_equals(src_fragment, fragment);
}
u32 str_hash32(const str s){
u8* ubuf = (u8*)s.data;
u32 hash=0;
for (u32 i = 0; i < s.size; i++)
for (u32 i = 0; i < s.len; i++)
hash = (hash<<6) + (hash<<16) - hash + ubuf[i];
return hash;
}
str str_toUpper(const str src){
str r = str_copy(src);
for (u32 i = 0; i < r.size; i++){
for (u32 i = 0; i < r.len; i++){
if(char_isLatinLower(r.data[i]))
r.data[i] = r.data[i] - 'a' + 'A';
}
@@ -125,7 +125,7 @@ str str_toUpper(const str src){
str str_toLower(const str src){
str r = str_copy(src);
for (u32 i = 0; i < r.size; i++){
for (u32 i = 0; i < r.len; i++){
if(char_isLatinUpper(r.data[i]))
r.data[i] = r.data[i] - 'A' + 'a';
}
@@ -133,7 +133,7 @@ str str_toLower(const str src){
}
str hex_to_str(Array(u8) buf, bool uppercase){
StringBuilder sb = StringBuilder_alloc(buf.size * 2 + 1);
StringBuilder sb = StringBuilder_alloc(buf.len * 2 + 1);
StringBuilder_append_memory(&sb, buf, uppercase);
return StringBuilder_getStr(&sb);
}
@@ -141,13 +141,13 @@ str hex_to_str(Array(u8) buf, bool uppercase){
void str_trim(str* line, bool set_zero_at_end){
// loop forward
bool stop = false;
while(line->size > 0 && !stop){
while(line->len > 0 && !stop){
char first_char = line->data[0];
switch(first_char){
case '\0': case '\r': case '\n':
case '\t': case ' ':
line->data++;
line->size--;
line->len--;
break;
default:
stop = true;
@@ -157,13 +157,13 @@ void str_trim(str* line, bool set_zero_at_end){
// loop backward
stop = false;
while(line->size > 0 && !stop)
while(line->len > 0 && !stop)
{
char last_char = line->data[line->size - 1];
char last_char = line->data[line->len - 1];
switch(last_char){
case '\0': case '\r': case '\n':
case '\t': case ' ':
line->size--;
line->len--;
break;
default:
stop = true;
@@ -172,7 +172,7 @@ void str_trim(str* line, bool set_zero_at_end){
}
if(set_zero_at_end){
line->data[line->size] = '\0';
line->data[line->len] = '\0';
line->isZeroTerminated = true;
}
}