From 6641181e0a078caf3e05ee4080fb807f45b9198b Mon Sep 17 00:00:00 2001 From: Mineplay Date: Fri, 11 Jul 2025 06:29:03 -0500 Subject: [PATCH] feat(string): implemented insert after string function --- Include/Fledasty/Strings/String.h | 1 + Src/Strings/String.c | 35 +++++++++++++++++++++++++++++++ Src/Strings/UTF8String.c | 4 ++++ Tests/Main.c | 2 ++ 4 files changed, 42 insertions(+) diff --git a/Include/Fledasty/Strings/String.h b/Include/Fledasty/Strings/String.h index 89f54a3..83c22e3 100644 --- a/Include/Fledasty/Strings/String.h +++ b/Include/Fledasty/Strings/String.h @@ -41,5 +41,6 @@ FledastyError fledasty_string_free(FledastyString *current_string); FledastyError fledasty_string_append(FledastyString *current_string, char *character_string, const size_t character_string_size); FledastyError fledasty_string_insert_at_index(FledastyString *current_string, const size_t index, char *character_string, const size_t character_string_size); FledastyError fledasty_string_insert_before_string(FledastyString *current_string, char *before_character_string, const size_t before_character_string_size, char *character_string, const size_t character_string_size); +FledastyError fledasty_string_insert_after_string(FledastyString *current_string, char *after_character_string, const size_t after_character_string_size, char *character_string, const size_t character_string_size); #endif diff --git a/Src/Strings/String.c b/Src/Strings/String.c index a8608ab..80d1f95 100644 --- a/Src/Strings/String.c +++ b/Src/Strings/String.c @@ -111,6 +111,8 @@ FledastyError fledasty_string_insert_before_string(FledastyString *current_strin hallocy_copy_memory(current_string->character_string + index, character_string, character_string_size); current_string->size += character_string_size; + current_string->character_string[current_string->size] = '\0'; + return FLEDASTY_ERROR_NONE; } @@ -119,3 +121,36 @@ FledastyError fledasty_string_insert_before_string(FledastyString *current_strin return FLEDASTY_ERROR_VALUE_NOT_FOUND; } + +FledastyError fledasty_string_insert_after_string(FledastyString *current_string, char *after_character_string, const size_t after_character_string_size, char *character_string, const size_t character_string_size) { + if (current_string == NULL || after_character_string == NULL || after_character_string_size == 0 || character_string == NULL || character_string_size == 0) { + return FLEDASTY_ERROR_INVALID_POINTER; + } + + size_t index = 0; + while (index < (current_string->size - after_character_string_size)) { + if (hallocy_compare_memory(current_string->character_string + index, after_character_string, after_character_string_size)) { + if (current_string->capacity <= current_string->size + character_string_size) { + current_string->capacity += (current_string->capacity > character_string_size) ? current_string->capacity : character_string_size + 1; + current_string->character_string = (char*)hallocy_realloc(current_string->character_string, current_string->capacity * sizeof(char)); + + if (current_string->character_string == NULL) { + return FLEDASTY_ERROR_FAILED_ALLOCATION; + } + } + + index += after_character_string_size; + hallocy_move_memory(current_string->character_string + (index + character_string_size), current_string->character_string + index, current_string->size - index + 1); + hallocy_copy_memory(current_string->character_string + index, character_string, character_string_size); + + current_string->size += character_string_size; + current_string->character_string[current_string->size] = '\0'; + + return FLEDASTY_ERROR_NONE; + } + + index += 1; + } + + return FLEDASTY_ERROR_VALUE_NOT_FOUND; +} diff --git a/Src/Strings/UTF8String.c b/Src/Strings/UTF8String.c index 0418c34..3b1c281 100644 --- a/Src/Strings/UTF8String.c +++ b/Src/Strings/UTF8String.c @@ -125,6 +125,8 @@ FledastyError fledasty_utf8_string_insert_before_string(FledastyUtf8String *curr hallocy_copy_memory(current_string->character_string + index, character_string, character_string_size); current_string->size += character_string_size; + current_string->character_string[current_string->size] = '\0'; + return FLEDASTY_ERROR_NONE; } @@ -160,6 +162,8 @@ FledastyError fledasty_utf8_string_insert_after_string(FledastyUtf8String *curre hallocy_copy_memory(current_string->character_string + index, character_string, character_string_size); current_string->size += character_string_size; + current_string->character_string[current_string->size] = '\0'; + return FLEDASTY_ERROR_NONE; } diff --git a/Tests/Main.c b/Tests/Main.c index 44a994d..ed49f2e 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -291,6 +291,8 @@ int main() { printf("%s\n", normal_test_string.character_string); fledasty_string_insert_before_string(&normal_test_string, "nd", 2, "Hello", 5); printf("%s\n", normal_test_string.character_string); + fledasty_string_insert_after_string(&normal_test_string, "nd", 2, "Bye", 3); + printf("%s\n", normal_test_string.character_string); fledasty_string_free(&normal_test_string); printf("Done\n");