Compare commits

...
3 Commits
Author SHA1 Message Date
DarthMooMancer 8a52f22b8a REFACTOR: Fixed Arg 1 resize 2026-09-23 21:33:30 -04:00
DarthMooMancer f51a03c476 FEAT: Implemented a more streamlined error handler.
REFACTOR: Completely rewrote insert and cleaned up names and redundant code.
2026-09-18 11:42:40 -04:00
DarthMooMancer f1d5962442 REFACTOR: Error debugging for most functions 2026-09-17 08:10:52 -04:00
5 changed files with 447 additions and 328 deletions
+24 -19
View File
@@ -23,17 +23,20 @@ typedef struct
size_t max_size; size_t max_size;
} Vec8_t; } Vec8_t;
int
is_valid(const Vec8_t* vec);
Vec8_t Vec8_t
create(const char* buf, const int len); create(const char* buf, const size_t len);
Vec8_t Vec8_t
push_back(Vec8_t* vec, const char val); push_back(Vec8_t* vec, const char val);
Vec8_t Vec8_t
pop_back(Vec8_t* vec); pop_back(Vec8_t* ptr);
Vec8_t Vec8_t
reserve(Vec8_t* ptr, const size_t max_size); reserve(const Vec8_t* ptr, const size_t max_size);
Vec8_t Vec8_t
shrink_to_fit(Vec8_t* ptr); shrink_to_fit(Vec8_t* ptr);
@@ -53,16 +56,10 @@ max_size(const Vec8_t* ptr);
void delete (const Vec8_t* vec); void delete (const Vec8_t* vec);
Vec8_t Vec8_t
clear(Vec8_t* vec); clear(const Vec8_t* vec);
char char
at(const Vec8_t* vec, int idx); at(const Vec8_t* vec, const size_t idx);
__attribute__((overloadable)) Vec8_t*
erase(Vec8_t* vec, size_t iter);
__attribute__((overloadable)) Vec8_t*
erase(Vec8_t* vec, size_t iter_start, size_t iter_end);
void void
print_vec(const Vec8_t* vec); print_vec(const Vec8_t* vec);
@@ -83,25 +80,33 @@ int
empty(const Vec8_t* vec); empty(const Vec8_t* vec);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
resize(Vec8_t* vec, size_t size); erase(const Vec8_t* vec, const size_t iter);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
resize(Vec8_t* vec, size_t size, char val); erase(const Vec8_t* vec, const size_t iter_start, const size_t iter_end);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
assign(Vec8_t* vec, const Vec8_t* iterator, size_t iter_start, size_t iter_end); resize(const Vec8_t* vec, const size_t size);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
assign(Vec8_t* vec, const size_t amount, char val); resize(Vec8_t* vec, const size_t size, const char val);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
insert(Vec8_t* vec, size_t iter, char val); assign(const Vec8_t* vec, const Vec8_t* iterator, const size_t iter_start,
const size_t iter_end);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
insert(Vec8_t* vec, size_t iter, size_t amount, char val); assign(const Vec8_t* vec, const size_t amount, const char val);
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
insert(Vec8_t* dst_vec, size_t iter, Vec8_t* src_vec, size_t iter_start, insert(const Vec8_t* vec, const size_t iter, const char val);
size_t iter_end);
__attribute__((overloadable)) Vec8_t
insert(const Vec8_t* vec, const size_t iter, const size_t amount,
const char val);
__attribute__((overloadable)) Vec8_t
insert(const Vec8_t* dst_vec, const Vec8_t* src_vec, const size_t iter,
const size_t iter_start, const size_t iter_end);
#endif #endif
+8 -4
View File
@@ -3,16 +3,19 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#define CAPACITY 1024 #define CAPACITY 1024
#define SUCCESS 0 #define SUCCESS 0
#define FAILURE 1 #define FAILURE 1
#define ERR_ALLOC_FAIL 20 #define ERR_ALLOC_FAIL 20
#define ERR_BUF_NULL 21 #define ERR_BUF_NULL 21
#define ERR_BAD_TYPE 22 #define ERR_SIZE_ZERO 22
#define ERR_INVALID_SIZE 23 #define ERR_VECTOR_NULL 23
#define ERR_VECTOR_NULL 24 #define ERR_MAX_PASSED 24
#define ERR_MAX_PASSED 25 #define ERR_OUT_OF_BOUNDS 25
#define ERR_NULL 26
#define ERR_DOUBLE_BUF 27
extern const char* error_messages[]; extern const char* error_messages[];
@@ -22,6 +25,7 @@ extern const char* error_messages[];
error_messages[error_code]) /**< Print log error message*/ error_messages[error_code]) /**< Print log error message*/
#define find_len(arr) sizeof(arr) / sizeof(arr[0]) #define find_len(arr) sizeof(arr) / sizeof(arr[0])
static const size_t VEC_MAX = SIZE_MAX / sizeof(int); static const size_t VEC_MAX = SIZE_MAX / sizeof(int);
#endif #endif
+375 -287
View File
@@ -8,25 +8,43 @@
#include "utils.h" #include "utils.h"
// If -1 for len, returns a blank Vector with no allocated memory int
is_valid(const Vec8_t* vec)
{
if (vec == nullptr)
{
LOGERROR(ERR_VECTOR_NULL);
return ERR_VECTOR_NULL;
}
else if (vec->arr == nullptr)
{
LOGERROR(ERR_BUF_NULL);
return ERR_BUF_NULL;
}
return SUCCESS;
}
Vec8_t Vec8_t
create(const char* buf, const int len) create(const char* buf, const size_t len)
{ {
Vec8_t dst = { NULL, 0, CAPACITY, VEC_MAX }; Vec8_t dst = { NULL, 0, CAPACITY, VEC_MAX };
if (len > -1) if (len > dst.capacity)
{ {
char* dst_buf = calloc(CAPACITY, sizeof(char)); while (len > dst.capacity) dst.capacity *= 2;
dst.arr = dst_buf;
} }
if (!dst.arr) if (len > 0)
{ {
LOG("Warning! Buffer not allocated, be careful if this was " char* dst_buf = calloc(dst.capacity, sizeof(char));
"intentional"); if (!dst_buf)
{
LOGERROR(ERR_ALLOC_FAIL);
return dst; return dst;
} }
dst.arr = dst_buf;
}
if (buf) if (buf)
{ {
for (int i = 0; i < len; i++) for (size_t i = 0; i < len; i++)
{ {
dst.arr[i] = buf[i]; dst.arr[i] = buf[i];
dst.size++; dst.size++;
@@ -36,47 +54,47 @@ create(const char* buf, const int len)
} }
Vec8_t Vec8_t
push_back(Vec8_t* vec, const char val) push_back(Vec8_t* ptr, const char val)
{ {
if (!vec) if (is_valid(ptr) == ERR_VECTOR_NULL)
{ {
LOGERROR(ERR_VECTOR_NULL); return create(nullptr, 0);
return create(nullptr, -1);
} }
Vec8_t dst = { NULL, vec->size, CAPACITY, vec->max_size }; Vec8_t dst = { NULL, ptr->size, ptr->capacity, ptr->max_size };
if (!vec->arr) if (is_valid(ptr) == ERR_BUF_NULL)
{ {
LOGERROR(ERR_BUF_NULL); LOG("If you think this is wrong, reserve memory first");
return dst; return dst;
} }
if (vec->size + 1 > vec->max_size) if (ptr->size + 1 > ptr->max_size)
{ {
LOGERROR(ERR_MAX_PASSED); LOGERROR(ERR_MAX_PASSED);
dst = *vec; dst = *ptr;
return dst; return dst;
} }
char* dst_buf; char* dst_buf;
if (vec->size + 1 > vec->capacity) if (ptr->size + 1 > ptr->capacity)
{ {
if (vec->capacity * 2 > vec->max_size) if (ptr->capacity * 2 > ptr->max_size)
{ {
LOGERROR(ERR_MAX_PASSED); LOGERROR(ERR_MAX_PASSED);
dst = *vec; dst = *ptr;
return dst; return dst;
} }
dst.capacity = vec->capacity * 2; dst.capacity = ptr->capacity * 2;
dst_buf = reallocf(vec->arr, dst.capacity * sizeof(char)); dst_buf = realloc(ptr->arr, dst.capacity * sizeof(char));
if (!dst_buf) if (!dst_buf)
{ {
LOGERROR(ERR_ALLOC_FAIL); LOGERROR(ERR_ALLOC_FAIL);
dst = *ptr;
return dst; return dst;
} }
} }
else else
{ {
dst_buf = vec->arr; dst_buf = ptr->arr;
} }
dst.arr = dst_buf; dst.arr = dst_buf;
dst.arr[dst.size] = val; dst.arr[dst.size] = val;
@@ -85,50 +103,61 @@ push_back(Vec8_t* vec, const char val)
} }
Vec8_t Vec8_t
pop_back(Vec8_t* vec) pop_back(Vec8_t* ptr)
{ {
Vec8_t err = create(nullptr, -1); Vec8_t err = create(nullptr, 0);
if (!vec) if (is_valid(ptr) != SUCCESS)
{ {
LOGERROR(ERR_VECTOR_NULL);
return err; return err;
} }
if (!vec->arr) if (ptr->size < 1)
{ {
LOGERROR(ERR_BUF_NULL); LOGERROR(ERR_SIZE_ZERO);
return err; return err;
} }
if (vec->size < 1) Vec8_t dst = { NULL, ptr->size - 1, ptr->capacity, ptr->max_size };
{ dst.arr = ptr->arr;
LOGERROR(ERR_INVALID_SIZE);
return err;
}
Vec8_t dst = { NULL, vec->size - 1, vec->capacity, vec->max_size };
dst.arr = vec->arr;
dst.arr[dst.size] = 0; dst.arr[dst.size] = 0;
return dst; return dst;
} }
/*
* reallocf failure wipes the buffer — push_back (char.c:89-94), reserve
* (char.c:140-147). On alloc failure it frees ptr->arr, then returns arr ==
* NULL; caller keeps a dangling pointer. Silent heap corruption.
*
* */
Vec8_t Vec8_t
reserve(Vec8_t* ptr, const size_t max_size) reserve(const Vec8_t* ptr, const size_t max_size)
{ {
Vec8_t ret = create(nullptr, -1); Vec8_t ret = create(nullptr, 0);
if (!ptr) if (max_size == 0)
{ {
LOGERROR(ERR_VECTOR_NULL); LOGERROR(ERR_SIZE_ZERO);
return ret; return ret;
} }
if (!ptr->arr) if (is_valid(ptr) == ERR_VECTOR_NULL)
{
return ret;
}
ret.arr = ptr->arr;
if (is_valid(&ret) == ERR_BUF_NULL)
{ {
ret.arr = calloc(max_size, sizeof(char)); ret.arr = calloc(max_size, sizeof(char));
} }
if (ptr->arr) else if (is_valid(ptr) == SUCCESS)
{ {
ret.arr = reallocf(ptr->arr, max_size * sizeof(char)); ret.arr = realloc(ret.arr, max_size * sizeof(char));
if (!ret.arr)
{
LOGERROR(ERR_ALLOC_FAIL);
ret = *ptr;
return ret;
}
ret.size = ptr->size; ret.size = ptr->size;
if (ret.size > max_size) if (ret.size > max_size)
{ {
for (int i = max_size - 1; i > ret.size; i--) for (size_t i = max_size; i < ret.size; i++)
{ {
ret.arr[i] = 0; ret.arr[i] = 0;
} }
@@ -143,375 +172,434 @@ reserve(Vec8_t* ptr, const size_t max_size)
Vec8_t Vec8_t
shrink_to_fit(Vec8_t* ptr) shrink_to_fit(Vec8_t* ptr)
{ {
if (is_valid(ptr) != SUCCESS) return create(nullptr, 0);
if (ptr->size == 0)
{
LOGERROR(ERR_SIZE_ZERO);
return create(nullptr, 0);
}
return reserve(ptr, ptr->size); return reserve(ptr, ptr->size);
} }
int int
swap(Vec8_t* ptr, Vec8_t* ptr_other) swap(Vec8_t* ptr1, Vec8_t* ptr2)
{ {
Vec8_t empty = create(nullptr, 0); Vec8_t tmp = create(nullptr, 0);
if (ptr == nullptr || ptr_other == nullptr) return 0; if (is_valid(ptr1) == ERR_VECTOR_NULL ||
if (ptr->arr == nullptr || ptr_other->arr == nullptr) return 0; is_valid(ptr2) == ERR_VECTOR_NULL)
empty.arr = ptr->arr;
ptr->arr = nullptr;
ptr->arr = ptr_other->arr;
ptr_other->arr = nullptr;
ptr_other->arr = empty.arr;
if (ptr != nullptr && ptr_other != nullptr)
{ {
empty.capacity = ptr->capacity; return ERR_VECTOR_NULL;
ptr->capacity = ptr_other->capacity;
empty.size = ptr->size;
ptr->size = ptr_other->size;
ptr_other->capacity = empty.capacity;
ptr_other->size = empty.size;
return 1;
} }
free(ptr); if (is_valid(ptr1) == ERR_BUF_NULL || is_valid(ptr2) == ERR_BUF_NULL)
free(ptr_other); {
return 0; return ERR_BUF_NULL;
}
tmp.arr = ptr1->arr;
ptr1->arr = ptr2->arr;
ptr2->arr = tmp.arr;
tmp.capacity = ptr1->capacity;
tmp.size = ptr1->size;
tmp.max_size = ptr1->max_size;
ptr1->capacity = ptr2->capacity;
ptr1->size = ptr2->size;
ptr1->max_size = ptr2->max_size;
ptr2->capacity = tmp.capacity;
ptr2->size = tmp.size;
ptr2->max_size = tmp.max_size;
return SUCCESS;
} }
char* char*
data(const Vec8_t* ptr) data(const Vec8_t* ptr)
{ {
if (ptr == nullptr || ptr->arr == nullptr) return nullptr; if (is_valid(ptr) == ERR_BUF_NULL || is_valid(ptr) == ERR_VECTOR_NULL)
return nullptr;
return &ptr->arr[0]; return &ptr->arr[0];
} }
size_t size_t
capacity(const Vec8_t* ptr) capacity(const Vec8_t* ptr)
{ {
if (is_valid(ptr) == ERR_VECTOR_NULL)
{
return ERR_VECTOR_NULL;
}
if (is_valid(ptr) == ERR_BUF_NULL)
{
return ERR_BUF_NULL;
}
return ptr->capacity; return ptr->capacity;
} }
size_t size_t
max_size(const Vec8_t* ptr) max_size(const Vec8_t* ptr)
{ {
if (is_valid(ptr) == ERR_VECTOR_NULL)
{
return ERR_VECTOR_NULL;
}
if (is_valid(ptr) == ERR_BUF_NULL)
{
return ERR_BUF_NULL;
}
return ptr->max_size; return ptr->max_size;
} }
void void
delete(const Vec8_t* vec) delete(const Vec8_t* ptr)
{ {
if (vec->arr != nullptr) if (is_valid(ptr) == SUCCESS)
{ {
free((void*)vec->arr); free((void*)ptr->arr);
} }
} }
Vec8_t Vec8_t
clear(Vec8_t* vec) clear(const Vec8_t* ptr)
{ {
if (vec != nullptr && vec->size > 0) Vec8_t dst = create(nullptr, 0);
if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
{ {
for (int i = 0; i < vec->size; i++) return dst;
}
dst = *ptr;
if (dst.size > 0)
{ {
if (!vec->arr) continue; for (size_t i = 0; i < dst.size; i++)
vec->arr[i] = 0; {
dst.arr[i] = 0;
} }
vec->size = 0; dst.size = 0;
} }
return *vec; return dst;
} }
char char
at(const Vec8_t* vec, const int idx) at(const Vec8_t* ptr, const size_t idx)
{ {
if (vec == nullptr) if (is_valid(ptr) == ERR_VECTOR_NULL)
{ {
return -2; return ERR_VECTOR_NULL;
} }
if (vec->arr == nullptr) if (is_valid(ptr) == ERR_BUF_NULL)
{ {
return -3; return ERR_BUF_NULL;
} }
if (vec->size <= idx) if (idx >= ptr->size)
{ {
fprintf(stderr, fprintf(stderr,
"At Index: [%i] is out of bounds for size: [%zu]", idx, "At Index: [%zu] is out of bounds for size: [%zu]", idx,
vec->size); ptr->size);
exit(-4); return ERR_OUT_OF_BOUNDS;
// return -4;
} }
if (vec != nullptr && vec->arr != nullptr && vec->size > idx) return ptr->arr[idx];
{
return vec->arr[idx];
}
return -1;
}
__attribute__((overloadable)) Vec8_t*
erase(Vec8_t* vec, const size_t iter)
{
if (vec == nullptr) return nullptr;
if (vec->arr == nullptr) return nullptr;
if (iter >= vec->size) return nullptr;
memmove(&vec->arr[iter], &vec->arr[iter + 1],
(vec->size - iter - 1) * sizeof(char));
vec->arr[vec->size - 1] = 0;
vec->size--;
return vec;
}
__attribute__((overloadable)) Vec8_t*
erase(Vec8_t* vec, const size_t iter_start, const size_t iter_end)
{
if (vec == nullptr) return nullptr;
if (vec->arr == nullptr) return nullptr;
if (iter_start < 0 || iter_end > vec->size) return nullptr;
if (iter_start >= iter_end) return nullptr;
size_t diff = iter_end - iter_start;
memmove(&vec->arr[iter_start], &vec->arr[iter_end],
(vec->size - iter_end) * sizeof(char));
for (size_t i = vec->size - diff; i < vec->size; i++)
{
vec->arr[i] = 0;
}
vec->size -= diff;
return vec;
} }
void void
print_vec(const Vec8_t* vec) print_vec(const Vec8_t* ptr)
{ {
if (!vec) if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
{
LOGERROR(ERR_VECTOR_NULL);
return; return;
} for (size_t i = 0; i < ptr->size; i++) printf("%c ", ptr->arr[i]);
for (int i = 0; i < vec->size; i++)
{
if (vec->arr[i])
{
printf("%c ", at(vec, i));
}
else
{
LOGERROR(ERR_INVALID_SIZE);
}
}
printf("\n"); printf("\n");
} }
int int
begin(const Vec8_t* vec) begin(const Vec8_t* ptr)
{ {
if (vec != nullptr && vec->arr != nullptr && vec->size > 0) if (is_valid(ptr) == SUCCESS) return 0;
{ return FAILURE;
return 0;
}
return -1;
} }
int int
end(const Vec8_t* vec) end(const Vec8_t* ptr)
{ {
if (vec != nullptr && vec->arr != nullptr && vec->size > 0) if (is_valid(ptr) == SUCCESS)
{ {
return (int)(vec->size - 1); if (ptr->size != 0) return (int)(ptr->size - 1);
else return FAILURE;
} }
return -1; return FAILURE;
} }
char char
front(const Vec8_t* vec) front(const Vec8_t* ptr)
{ {
return at(vec, 0); if (is_valid(ptr) == ERR_VECTOR_NULL) return FAILURE;
if (ptr->size == 0) return FAILURE;
return at(ptr, 0);
} }
char char
back(const Vec8_t* vec) back(const Vec8_t* ptr)
{ {
if (vec) if (is_valid(ptr) == ERR_VECTOR_NULL) return FAILURE;
{ if (ptr->size == 0) return FAILURE;
return at(vec, (int)vec->size - 1); return at(ptr, ptr->size - 1);
}
return -1;
} }
int int
empty(const Vec8_t* vec) empty(const Vec8_t* ptr)
{ {
if (vec->size > 0) if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
{ return FAILURE;
return 1; if (ptr->size == 0) return SUCCESS;
} return FAILURE;
return 0;
} }
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
resize(Vec8_t* vec, size_t size) erase(const Vec8_t* ptr, const size_t iter)
{ {
Vec8_t nvec = create(nullptr, 0); Vec8_t dst = create(nullptr, 0);
if (vec == nullptr || vec->arr == nullptr) return nvec; if (is_valid(ptr) == ERR_VECTOR_NULL) return dst;
if (size <= 0 || vec->size <= 0) if (is_valid(ptr) == ERR_BUF_NULL) return dst;
{ if (iter >= ptr->size) return dst;
fprintf(stderr, dst = *ptr;
"Size or Vector Size is at or below 0 and is invalid"); memmove(&dst.arr[iter], &dst.arr[iter + 1],
return nvec; (dst.size - iter - 1) * sizeof(char));
} dst.arr[dst.size - 1] = 0;
for (size_t i = size; i < vec->size; i++) dst.size--;
{ return dst;
vec->arr[i] = '\0';
}
return *vec;
} }
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
resize(Vec8_t* vec, size_t size, char val) erase(const Vec8_t* ptr, const size_t iter_start, const size_t iter_end)
{ {
Vec8_t nvec = create(nullptr, 0); Vec8_t dst = create(nullptr, 0);
if (vec == nullptr || vec->arr == nullptr) return nvec; if (is_valid(ptr) == ERR_VECTOR_NULL) return dst;
if (size <= 0 || vec->size <= 0) if (is_valid(ptr) == ERR_BUF_NULL) return dst;
if (iter_end > ptr->size) return dst;
if (iter_start >= iter_end) return dst;
dst = *ptr;
size_t diff = iter_end - iter_start;
memmove(&dst.arr[iter_start], &dst.arr[iter_end],
(dst.size - iter_end) * sizeof(char));
for (size_t i = dst.size - diff; i < dst.size; i++)
{ {
fprintf(stderr, dst.arr[i] = 0;
"Size or Vector Size is at or below 0 and is invalid");
return nvec;
} }
if (size == vec->size) dst.size -= diff;
{ return dst;
fprintf(stderr,
"Size and Vector Size are equal to each other and is "
"invalid");
return nvec;
}
if (size < vec->size)
{
fprintf(stderr, "Size is below Vector Size is invalid");
return nvec;
}
if (size >= vec->capacity)
{
nvec = reserve(vec, size);
}
size_t ret = vec->size;
vec->size = vec->size + (size - vec->size);
for (size_t i = ret; i < vec->size; i++)
{
if (at(vec, (int)i) >= 0)
{
vec->arr[i] = val;
}
}
return *vec;
} }
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
assign(Vec8_t* vec, const Vec8_t* iterator, size_t iter_start, size_t iter_end) resize(const Vec8_t* ptr, const size_t size)
{ {
Vec8_t ret = create(nullptr, 0); Vec8_t dst = create(nullptr, 0);
if (vec == nullptr || vec->arr == nullptr) return ret; if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
if (iterator == nullptr || iterator->arr == nullptr) return ret; return dst;
if (iter_end <= iter_start) return ret; if (ptr->size == size)
vec = erase(vec, begin(vec), end(vec) + 1); {
size_t res = iter_end - iter_start; LOG("ERR :- Ptr size and size are the same");
*vec = reserve(vec, res); dst = *ptr;
return dst;
}
else if (ptr->size == 0)
{
dst = reserve(&dst, size);
}
else if (size > ptr->max_size)
{
LOGERROR(ERR_MAX_PASSED);
dst = *ptr;
return dst;
}
else if (size > ptr->capacity)
{
size_t tmp = ptr->capacity;
while (size > tmp)
{
tmp *= 2;
}
dst = reserve(ptr, tmp);
if (!dst.arr)
{
LOGERROR(ERR_BUF_NULL);
dst = *ptr;
return dst;
}
}
if (size < ptr->size)
{
dst = *ptr;
for (size_t i = ptr->size; i > size; i--)
{
dst.arr[i] = '\0';
}
}
if (ptr->size < size)
{
for (size_t i = ptr->size; i < size; i++)
{
dst.arr[i] = '\0';
}
}
dst.size = size;
return dst;
}
__attribute__((overloadable)) Vec8_t
resize(Vec8_t* ptr, const size_t size, const char val)
{
Vec8_t dst = create(nullptr, 0);
dst = *ptr;
if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
return dst;
if ((0 < size && size != dst.size && size < dst.size) ||
is_valid(ptr) == ERR_SIZE_ZERO)
{
LOGERROR(ERR_SIZE_ZERO);
return dst;
}
if ((0 < size && size < dst.size) || is_valid(ptr) == ERR_SIZE_ZERO)
{
LOGERROR(ERR_SIZE_ZERO);
return dst;
}
if (size >= dst.capacity)
{
dst = reserve(&dst, size);
}
dst.size = ptr->size + (size - ptr->size);
for (size_t i = ptr->size; i < dst.size; i++)
{
if (at(&dst, i) >= 0)
{
dst.arr[i] = val;
}
}
dst.size = size;
return dst;
}
__attribute__((overloadable)) Vec8_t
assign(const Vec8_t* ptr, const Vec8_t* iterator, const size_t iter_start,
const size_t iter_end)
{
Vec8_t dst = create(nullptr, 0);
if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
return dst;
if (is_valid(iterator) == ERR_VECTOR_NULL ||
is_valid(iterator) == ERR_BUF_NULL)
return dst;
if (iterator->size < iter_end || iter_end <= iter_start)
{
LOGERROR(ERR_OUT_OF_BOUNDS);
return dst;
}
dst = *ptr;
dst = erase(ptr, begin(ptr), end(ptr) + 1);
dst = reserve(&dst, (iter_end - iter_start));
for (size_t i = iter_start; i < iter_end; i++) for (size_t i = iter_start; i < iter_end; i++)
{ {
*vec = push_back(vec, at(iterator, (int)i)); dst = push_back(&dst, at(iterator, i));
} }
return *vec; return dst;
} }
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
assign(Vec8_t* vec, const size_t amount, char val) assign(const Vec8_t* ptr, const size_t amount, const char val)
{ {
if (vec == nullptr || vec->arr == nullptr) return create(nullptr, 0); Vec8_t dst = create(nullptr, 0);
vec = erase(vec, begin(vec), end(vec) + 1); if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
*vec = reserve(vec, amount); return create(nullptr, 0);
for (int i = 0; i < amount; i++) dst = *ptr;
dst = erase(&dst, begin(&dst), end(&dst) + 1);
dst = reserve(&dst, amount);
for (size_t i = 0; i < amount; i++)
{ {
*vec = push_back(vec, val); dst = push_back(&dst, val);
} }
return *vec; return dst;
} }
// TODO: Add error checking and null checking
// Follows array style
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
insert(Vec8_t* vec, size_t iter, char val) insert(const Vec8_t* ptr, const size_t iter, const char val)
{ {
size_t last = vec->size; Vec8_t dst = create(nullptr, 0);
*vec = push_back(vec, 0); if (is_valid(ptr) == ERR_VECTOR_NULL || is_valid(ptr) == ERR_BUF_NULL)
for (size_t i = vec->size - 1; i > iter; i--)
{ {
vec->arr[i] = vec->arr[i - 1]; return dst;
} }
vec->arr[iter] = val; if (ptr->max_size < ptr->size + 1)
{
LOGERROR(ERR_MAX_PASSED);
return dst;
}
if (iter > ptr->size)
{
LOGERROR(ERR_OUT_OF_BOUNDS);
return dst;
}
dst = *ptr;
dst = push_back(&dst, 0);
for (size_t i = dst.size - 1; i > iter; i--)
{
dst.arr[i] = dst.arr[i - 1];
}
dst.arr[iter] = val;
return *vec; return dst;
} }
// TODO: Add error checking and null checking
// Follows array style
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
insert(Vec8_t* vec, size_t iter, size_t amount, char val) insert(const Vec8_t* ptr, const size_t iter, const size_t amount,
const char val)
{ {
size_t last = vec->size; Vec8_t dst = create(nullptr, 0);
char cpy[vec->size - (iter)]; if (is_valid(ptr) != SUCCESS)
size_t cpy_size = (vec->size - (iter));
int k = 0;
for (size_t i = iter; i < vec->size; i++)
{ {
cpy[k] = vec->arr[i]; LOGERROR(ERR_NULL);
k++; return dst;
} }
for (int i = 0; i < amount; i++) if (iter > ptr->size)
{ {
*vec = push_back(vec, 0); LOGERROR(ERR_OUT_OF_BOUNDS);
return dst;
} }
if (amount <= 0)
if ((iter - 1) + amount <= last)
{ {
for (int i = iter; i < vec->size; i++) LOGERROR(ERR_SIZE_ZERO);
return dst;
}
dst = *ptr;
for (size_t i = iter; i < iter + amount; i++)
{ {
vec->arr[i] = 0; dst = insert(&dst, i, val);
} }
size_t j = iter - 1 + amount; return dst;
for (int i = 0; i < cpy_size; i++)
{
vec->arr[j + i] = cpy[i];
}
for (int i = iter; i < iter + amount - 1; i++)
{
vec->arr[i] = val;
}
}
else
{
return *vec;
}
return *vec;
} }
// TODO: Add error checking and null checking
// NOTE: It might be a good idea to move the iter ahead of the src_vec
__attribute__((overloadable)) Vec8_t __attribute__((overloadable)) Vec8_t
insert(Vec8_t* dst_vec, size_t iter, Vec8_t* src_vec, size_t iter_start, insert(const Vec8_t* dst_vec, const Vec8_t* src_vec, const size_t iter,
size_t iter_end) const size_t iter_start, const size_t iter_end)
{ {
size_t cpy_size = iter_end - iter_start; Vec8_t dst = create(nullptr, 0);
char cpy[cpy_size]; if (is_valid(dst_vec) != SUCCESS || is_valid(src_vec) != SUCCESS)
int j = 0;
for (int i = iter_start; i < iter_end; i++)
{ {
cpy[j] = src_vec->arr[i]; LOGERROR(ERR_NULL);
j++; return dst;
} }
for (int i = 0; i < cpy_size; i++) if (iter_end > src_vec->size || iter > dst_vec->size)
{ {
printf("%c ", cpy[i]); LOGERROR(ERR_OUT_OF_BOUNDS);
return dst;
} }
printf("\n"); if (dst_vec->arr == src_vec->arr)
for (int i = 0; i < iter_end - iter_start; i++)
{ {
insert(dst_vec, (iter_start - 1) + i, cpy[i]); LOGERROR(ERR_DOUBLE_BUF);
return dst;
} }
return *dst_vec; dst = *dst_vec;
for (size_t i = iter_start; i < iter_end; i++)
// Inserts over an iteration, [0, 5] {
dst = insert(&dst, iter + (i - iter_start), src_vec->arr[i]);
}
return dst;
} }
+39 -17
View File
@@ -6,10 +6,10 @@
*/ */
/* /*
* Types Wanted: * Types Wanted:
* Char * Char 8 Bits
* Float * Float 32 Bits with suffix of 'f'
* Int * Int 32 bits
* String * String 32 Bits with suffix of 's'
*/ */
#include <stddef.h> #include <stddef.h>
@@ -22,21 +22,43 @@
int int
main() main()
{ {
char arr[] = { 'a' }; char ar1[] = { '1', '2', '3', '4' };
// Vec8_t v1 = create(arr, find_len(arr)); char ar2[] = { 'a', 'b', 'c', 'd' };
// Vec8_t v1 = create((char[]) { 'a', 'b', 'c', 'd' }, 4); // Vec8_t v1;
Vec8_t v1 = create(nullptr, 0); Vec8_t v1 = create(ar2, find_len(ar2));
// print_vec(&v1);
// printf("Hello\n");
// v1 = assign(&v1, &v2, 0, 1);
v1 = reserve(&v1, 9);
print_vec(&v1);
v1 = insert(&v1, 1, 'x');
v1 = resize(&v1, 12);
// v1 = insert(&v1, 1, 5, 'a');
// printf("%c", at(&v1, 1));
// printf("RESERVED SIZE: %zu", v1.max_size);
print_vec(&v1);
// v2 = resize(&v2, 3);
// print_vec(&v2);
// if (swap(&v1, &v2))
// {
// print_vec(&v1);
// print_vec(&v2);
// }
// Vec8_t v1 = create(nullptr, 0);
// v1 = reserve(&v1, 10); // v1 = reserve(&v1, 10);
// v1 = pop_back(&v1); // v1 = pop_back(&v1);
for (int i = 0; i < 10; i++) // for (int i = 0; i < 10; i++)
{ // {
v1 = push_back(&v1, 'a'); // v1 = push_back(&v1, 'a');
} // }
print_vec(&v1); // print_vec(&v1);
printf("SIZE: %zu\n", v1.size); // printf("SIZE: %zu\n", v1.size);
v1 = push_back(&v1, 'a'); // v1 = push_back(&v1, 'a');
print_vec(&v1); // print_vec(&v1);
printf("SIZE: %zu\n", v1.size); // printf("SIZE: %zu\n", v1.size);
delete(&v1); delete(&v1);
// delete(&v2);
return 0; return 0;
} }
+4 -4
View File
@@ -3,10 +3,10 @@
const char* error_messages[] = { const char* error_messages[] = {
[ERR_ALLOC_FAIL] = "Calloc :- Failed to allocate", [ERR_ALLOC_FAIL] = "Calloc :- Failed to allocate",
[ERR_BUF_NULL] = "Buffer :- NULL", [ERR_BUF_NULL] = "Buffer :- NULL",
[ERR_BAD_TYPE] = "Type :- Does not match vector type", [ERR_SIZE_ZERO] = "Size :- Size is or is less than 0 or invalid",
[ERR_INVALID_SIZE] = "Size :- Size is 0 or invalid",
[ERR_VECTOR_NULL] = "Vector :- Given vector is null", [ERR_VECTOR_NULL] = "Vector :- Given vector is null",
[ERR_MAX_PASSED] = "Max :- Vector Max value is overloaded", [ERR_MAX_PASSED] = "Max :- Vector Max value is overloaded",
// [ERR_CREATION_FAIL] = "Buffer creation failed", [ERR_OUT_OF_BOUNDS] = "Bounds:- Value is out of bounds",
// [ERR_MALLOC_NULL] = "Malloc Failed to allocate", [ERR_NULL] = "Null:- Vector or buffer is null",
[ERR_DOUBLE_BUF] = "Buffer :- Both buffers are copies of each other",
}; };