krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Reworked generic structures, read more

Browse Source 
The following structures are now more independant:

- Toy_Array
- Toy_Stack
- Toy_Bucket
- Toy_String

I reworked a lot of the memory allocation, so now there are more direct
calls to malloc() or realloc(), rather than relying on the macros from
toy_memory.h.

I've also split toy_memory into proper array and bucket files, because
it makes more sense this way, rather than having them both jammed into
one file. This means the eventual hashtable structure can also stand on
its own.

Toy_Array is a new wrapper around raw array pointers, and all of the
structures have their metadata embedded into their allocated memory now,
using variable length array members.

A lot of 'capacity' and 'count' variables were changed to 'size_t'
types, but this doesn't seem to be a problem anywhere.

If the workflow fails, then I'll leave it for tonight - I'm too tired,
and I don't want to overdo myself.
This commit is contained in:
Kayne Ruse
2024-10-01 20:24:52 +10:00
parent 53b0fc158c
commit 7b453bc35f
34 changed files with 566 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/cases/test_string.c
View File

@@ -1,9 +1,10 @@
#include "toy_string.h"
#include "toy_console_colors.h"
#include "toy_memory.h"
#include "toy_bucket.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int test_sizeof_string_64bit() {
@@ -34,8 +35,7 @@ int test_string_allocation() {
//allocate a single string from a c-string
{
//setup
Toy_Bucket* bucket = NULL;
Toy_initBucket(&bucket, 1024);
Toy_Bucket* bucket = Toy_allocateBucket(1024);
const char* cstring = "Hello world";
Toy_String* str = Toy_createString(&bucket, cstring);
@@ -77,8 +77,7 @@ int test_string_allocation() {
//copy and deep copy a string
{
//setup
Toy_Bucket* bucket = NULL;
Toy_initBucket(&bucket, 1024);
Toy_Bucket* bucket = Toy_allocateBucket(1024);
const char* cstring = "Hello world";
Toy_String* str = Toy_createString(&bucket, cstring);
@@ -104,8 +103,7 @@ int test_string_allocation() {
//allocate a zero-length string
{
//setup
Toy_Bucket* bucket = NULL;
Toy_initBucket(&bucket, 1024);
Toy_Bucket* bucket = Toy_allocateBucket(1024);
const char* cstring = "";
Toy_String* str = Toy_createString(&bucket, cstring);
@@ -133,8 +131,7 @@ int test_string_allocation() {
int test_string_concatenation() {
//one big bucket o' fun
Toy_Bucket* bucket = NULL;
Toy_initBucket(&bucket, 1024);
Toy_Bucket* bucket = Toy_allocateBucket(1024);
//concatenate two strings, and check the refcounts
{
@@ -191,12 +188,12 @@ int test_string_concatenation() {
strcmp(buffer, "Hello world") != 0)
{
fprintf(stderr, TOY_CC_ERROR "ERROR: Failed to get the raw buffer from concatenated string\n" TOY_CC_RESET);
TOY_FREE_ARRAY(char, buffer, result->length + 1);
free(buffer);
Toy_freeBucket(&bucket);
return -1;
}
TOY_FREE_ARRAY(char, buffer, result->length + 1);
free(buffer);
Toy_freeString(result);
Toy_freeString(first);
Toy_freeString(second);
@@ -224,8 +221,7 @@ int test_string_with_stressed_bucket() {
};
//setup
Toy_Bucket* bucket = NULL;
Toy_initBucket(&bucket, 128); //deliberately too short for one bucket
Toy_Bucket* bucket = Toy_allocateBucket(128);//deliberately too much data for one bucket
//stress
Toy_String* str = Toy_createString(&bucket, testData[0]);
@@ -250,7 +246,7 @@ int test_string_with_stressed_bucket() {
strlen(buffer) != 36)
{
fprintf(stderr, TOY_CC_ERROR "ERROR: Unexpected state of the raw buffer after string stress test: '%s'\n" TOY_CC_RESET, buffer);
Toy_reallocate(buffer, 0, 0); //direct call to free, regardless of size
free(buffer);
Toy_freeBucket(&bucket);
return -1;
}
@@ -258,13 +254,13 @@ int test_string_with_stressed_bucket() {
if (bucket->next == NULL) //just to make sure
{
fprintf(stderr, TOY_CC_ERROR "ERROR: Unexpected state of the bucket after string stress test\n" TOY_CC_RESET);
Toy_reallocate(buffer, 0, 0); //direct call to free, regardless of size
free(buffer);
Toy_freeBucket(&bucket);
return -1;
}
//clean up
TOY_FREE_ARRAY(char, buffer, str->length);
free(buffer);
Toy_freeBucket(&bucket);
}