From ac5f5a33e94054396de66a37043e226349b6c91c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 18 Dec 2022 21:17:07 +0000 Subject: `gb_internal` a lot --- src/array.cpp | 150 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'src/array.cpp') diff --git a/src/array.cpp b/src/array.cpp index d08bd647f..c633078f6 100644 --- a/src/array.cpp +++ b/src/array.cpp @@ -23,32 +23,32 @@ struct Array { } }; -template void array_init (Array *array, gbAllocator const &a); -template void array_init (Array *array, gbAllocator const &a, isize count); -template void array_init (Array *array, gbAllocator const &a, isize count, isize capacity); -template Array array_make (gbAllocator const &a); -template Array array_make (gbAllocator const &a, isize count); -template Array array_make (gbAllocator const &a, isize count, isize capacity); -template Array array_make_from_ptr (T *data, isize count, isize capacity); -template void array_free (Array *array); -template void array_add (Array *array, T const &t); -template T * array_add_and_get (Array *array); -template void array_add_elems (Array *array, T const *elems, isize elem_count); -template T array_pop (Array *array); -template void array_clear (Array *array); -template void array_reserve (Array *array, isize capacity); -template void array_resize (Array *array, isize count); -template void array_set_capacity (Array *array, isize capacity); -template Array array_slice (Array const &array, isize lo, isize hi); -template Array array_clone (gbAllocator const &a, Array const &array); - -template void array_ordered_remove (Array *array, isize index); -template void array_unordered_remove(Array *array, isize index); - -template void array_copy(Array *array, Array const &data, isize offset); -template void array_copy(Array *array, Array const &data, isize offset, isize count); - -template T *array_end_ptr(Array *array); +template gb_internal void array_init (Array *array, gbAllocator const &a); +template gb_internal void array_init (Array *array, gbAllocator const &a, isize count); +template gb_internal void array_init (Array *array, gbAllocator const &a, isize count, isize capacity); +template gb_internal Array array_make (gbAllocator const &a); +template gb_internal Array array_make (gbAllocator const &a, isize count); +template gb_internal Array array_make (gbAllocator const &a, isize count, isize capacity); +template gb_internal Array array_make_from_ptr (T *data, isize count, isize capacity); +template gb_internal void array_free (Array *array); +template gb_internal void array_add (Array *array, T const &t); +template gb_internal T * array_add_and_get (Array *array); +template gb_internal void array_add_elems (Array *array, T const *elems, isize elem_count); +template gb_internal T array_pop (Array *array); +template gb_internal void array_clear (Array *array); +template gb_internal void array_reserve (Array *array, isize capacity); +template gb_internal void array_resize (Array *array, isize count); +template gb_internal void array_set_capacity (Array *array, isize capacity); +template gb_internal Array array_slice (Array const &array, isize lo, isize hi); +template gb_internal Array array_clone (gbAllocator const &a, Array const &array); + +template gb_internal void array_ordered_remove (Array *array, isize index); +template gb_internal void array_unordered_remove(Array *array, isize index); + +template gb_internal void array_copy(Array *array, Array const &data, isize offset); +template gb_internal void array_copy(Array *array, Array const &data, isize offset, isize count); + +template gb_internal T *array_end_ptr(Array *array); template @@ -56,14 +56,14 @@ struct Slice { T *data; isize count; - T &operator[](isize index) { + gb_inline T &operator[](isize index) { #if !defined(NO_ARRAY_BOUNDS_CHECK) GB_ASSERT_MSG(0 <= index && index < count, "Index %td is out of bounds ranges 0..<%td", index, count); #endif return data[index]; } - T const &operator[](isize index) const { + gb_inline T const &operator[](isize index) const { #if !defined(NO_ARRAY_BOUNDS_CHECK) GB_ASSERT_MSG(0 <= index && index < count, "Index %td is out of bounds ranges 0..<%td", index, count); #endif @@ -71,12 +71,12 @@ struct Slice { } }; -template Slice slice_from_array(Array const &a); +template gb_internal Slice slice_from_array(Array const &a); template -Slice slice_make(gbAllocator const &allocator, isize count) { +gb_internal Slice slice_make(gbAllocator const &allocator, isize count) { GB_ASSERT(count >= 0); Slice s = {}; s.data = gb_alloc_array(allocator, T, count); @@ -86,7 +86,7 @@ Slice slice_make(gbAllocator const &allocator, isize count) { } template -void slice_init(Slice *s, gbAllocator const &allocator, isize count) { +gb_internal void slice_init(Slice *s, gbAllocator const &allocator, isize count) { GB_ASSERT(count >= 0); s->data = gb_alloc_array(allocator, T, count); if (count > 0) { @@ -96,23 +96,23 @@ void slice_init(Slice *s, gbAllocator const &allocator, isize count) { } template -void slice_free(Slice *s, gbAllocator const &allocator) { +gb_internal void slice_free(Slice *s, gbAllocator const &allocator) { gb_free(allocator, s->data); } template -void slice_resize(Slice *s, gbAllocator const &allocator, isize new_count) { +gb_internal void slice_resize(Slice *s, gbAllocator const &allocator, isize new_count) { resize_array_raw(&s->data, allocator, s->count, new_count); s->count = new_count; } template -Slice slice_from_array(Array const &a) { +gb_internal Slice slice_from_array(Array const &a) { return {a.data, a.count}; } template -Slice slice_array(Array const &array, isize lo, isize hi) { +gb_internal Slice slice_array(Array const &array, isize lo, isize hi) { GB_ASSERT(0 <= lo && lo <= hi && hi <= array.count); Slice out = {}; isize len = hi-lo; @@ -125,30 +125,30 @@ Slice slice_array(Array const &array, isize lo, isize hi) { template -Slice slice_clone(gbAllocator const &allocator, Slice const &a) { +gb_internal Slice slice_clone(gbAllocator const &allocator, Slice const &a) { T *data = cast(T *)gb_alloc_copy_align(allocator, a.data, a.count*gb_size_of(T), gb_align_of(T)); return {data, a.count}; } template -Slice slice_clone_from_array(gbAllocator const &allocator, Array const &a) { +gb_internal Slice slice_clone_from_array(gbAllocator const &allocator, Array const &a) { auto c = array_clone(allocator, a); return {c.data, c.count}; } template -void slice_copy(Slice *slice, Slice const &data) { +gb_internal void slice_copy(Slice *slice, Slice const &data) { isize n = gb_min(slice->count, data.count); gb_memmove(slice->data, data.data, gb_size_of(T)*n); } template -void slice_copy(Slice *slice, Slice const &data, isize offset) { +gb_internal void slice_copy(Slice *slice, Slice const &data, isize offset) { isize n = gb_clamp(slice->count-offset, 0, data.count); gb_memmove(slice->data+offset, data.data, gb_size_of(T)*n); } template -void slice_copy(Slice *slice, Slice const &data, isize offset, isize count) { +gb_internal void slice_copy(Slice *slice, Slice const &data, isize offset, isize count) { isize n = gb_clamp(slice->count-offset, 0, gb_min(data.count, count)); gb_memmove(slice->data+offset, data.data, gb_size_of(T)*n); } @@ -156,7 +156,7 @@ void slice_copy(Slice *slice, Slice const &data, isize offset, isize count template -gb_inline Slice slice(Slice const &array, isize lo, isize hi) { +gb_internal gb_inline Slice slice(Slice const &array, isize lo, isize hi) { GB_ASSERT(0 <= lo && lo <= hi && hi <= array.count); Slice out = {}; isize len = hi-lo; @@ -169,7 +169,7 @@ gb_inline Slice slice(Slice const &array, isize lo, isize hi) { template -void slice_ordered_remove(Slice *array, isize index) { +gb_internal void slice_ordered_remove(Slice *array, isize index) { GB_ASSERT(0 <= index && index < array->count); isize bytes = gb_size_of(T) * (array->count-(index+1)); @@ -178,7 +178,7 @@ void slice_ordered_remove(Slice *array, isize index) { } template -void slice_unordered_remove(Slice *array, isize index) { +gb_internal void slice_unordered_remove(Slice *array, isize index) { GB_ASSERT(0 <= index && index < array->count); isize n = array->count-1; @@ -190,18 +190,18 @@ void slice_unordered_remove(Slice *array, isize index) { template -void array_copy(Array *array, Array const &data, isize offset) { +gb_internal void array_copy(Array *array, Array const &data, isize offset) { gb_memmove(array->data+offset, data.data, gb_size_of(T)*data.count); } template -void array_copy(Array *array, Array const &data, isize offset, isize count) { +gb_internal void array_copy(Array *array, Array const &data, isize offset, isize count) { gb_memmove(array->data+offset, data.data, gb_size_of(T)*gb_min(data.count, count)); } template -T *array_end_ptr(Array *array) { +gb_internal T *array_end_ptr(Array *array) { if (array->count > 0) { return &array->data[array->count-1]; } @@ -210,18 +210,18 @@ T *array_end_ptr(Array *array) { template -gb_inline void array_init(Array *array, gbAllocator const &a) { +gb_internal gb_inline void array_init(Array *array, gbAllocator const &a) { isize cap = ARRAY_GROW_FORMULA(0); array_init(array, a, 0, cap); } template -gb_inline void array_init(Array *array, gbAllocator const &a, isize count) { +gb_internal gb_inline void array_init(Array *array, gbAllocator const &a, isize count) { array_init(array, a, count, count); } template -gb_inline void array_init(Array *array, gbAllocator const &a, isize count, isize capacity) { +gb_internal gb_inline void array_init(Array *array, gbAllocator const &a, isize count, isize capacity) { array->allocator = a; array->data = nullptr; if (capacity > 0) { @@ -234,7 +234,7 @@ gb_inline void array_init(Array *array, gbAllocator const &a, isize count, is template -gb_inline Array array_make_from_ptr(T *data, isize count, isize capacity) { +gb_internal gb_inline Array array_make_from_ptr(T *data, isize count, isize capacity) { Array a = {0}; a.data = data; a.count = count; @@ -244,7 +244,7 @@ gb_inline Array array_make_from_ptr(T *data, isize count, isize capacity) { template -gb_inline Array array_make(gbAllocator const &a) { +gb_internal gb_inline Array array_make(gbAllocator const &a) { isize capacity = ARRAY_GROW_FORMULA(0); Array array = {}; array.allocator = a; @@ -254,7 +254,7 @@ gb_inline Array array_make(gbAllocator const &a) { return array; } template -gb_inline Array array_make(gbAllocator const &a, isize count) { +gb_internal gb_inline Array array_make(gbAllocator const &a, isize count) { Array array = {}; array.allocator = a; array.data = gb_alloc_array(a, T, count); @@ -263,7 +263,7 @@ gb_inline Array array_make(gbAllocator const &a, isize count) { return array; } template -gb_inline Array array_make(gbAllocator const &a, isize count, isize capacity) { +gb_internal gb_inline Array array_make(gbAllocator const &a, isize count, isize capacity) { Array array = {}; array.allocator = a; array.data = gb_alloc_array(a, T, capacity); @@ -275,7 +275,7 @@ gb_inline Array array_make(gbAllocator const &a, isize count, isize capacity) template -gb_inline void array_free(Array *array) { +gb_internal gb_inline void array_free(Array *array) { if (array->allocator.proc != nullptr) { gb_free(array->allocator, array->data); } @@ -284,7 +284,7 @@ gb_inline void array_free(Array *array) { } template -void array__grow(Array *array, isize min_capacity) { +gb_internal void array__grow(Array *array, isize min_capacity) { isize new_capacity = ARRAY_GROW_FORMULA(array->capacity); if (new_capacity < min_capacity) { new_capacity = min_capacity; @@ -293,7 +293,7 @@ void array__grow(Array *array, isize min_capacity) { } template -void array_add(Array *array, T const &t) { +gb_internal void array_add(Array *array, T const &t) { if (array->capacity < array->count+1) { array__grow(array, 0); } @@ -302,7 +302,7 @@ void array_add(Array *array, T const &t) { } template -T *array_add_and_get(Array *array) { +gb_internal T *array_add_and_get(Array *array) { if (array->count < array->capacity) { return &array->data[array->count++]; } @@ -314,7 +314,7 @@ T *array_add_and_get(Array *array) { template -void array_add_elems(Array *array, T const *elems, isize elem_count) { +gb_internal void array_add_elems(Array *array, T const *elems, isize elem_count) { GB_ASSERT(elem_count >= 0); if (array->capacity < array->count+elem_count) { array__grow(array, array->count+elem_count); @@ -325,26 +325,26 @@ void array_add_elems(Array *array, T const *elems, isize elem_count) { template -gb_inline T array_pop(Array *array) { +gb_internal gb_inline T array_pop(Array *array) { GB_ASSERT(array->count > 0); array->count--; return array->data[array->count]; } template -void array_clear(Array *array) { +gb_internal void array_clear(Array *array) { array->count = 0; } template -void array_reserve(Array *array, isize capacity) { +gb_internal void array_reserve(Array *array, isize capacity) { if (array->capacity < capacity) { array_set_capacity(array, capacity); } } template -void array_resize(Array *array, isize count) { +gb_internal void array_resize(Array *array, isize count) { if (array->capacity < count) { array__grow(array, count); } @@ -352,7 +352,7 @@ void array_resize(Array *array, isize count) { } template -void array_set_capacity(Array *array, isize capacity) { +gb_internal void array_set_capacity(Array *array, isize capacity) { if (capacity == array->capacity) { return; } @@ -381,7 +381,7 @@ void array_set_capacity(Array *array, isize capacity) { template -gb_inline Array array_slice(Array const &array, isize lo, isize hi) { +gb_internal gb_inline Array array_slice(Array const &array, isize lo, isize hi) { GB_ASSERT(0 <= lo && lo <= hi && hi <= array.count); Array out = {}; isize len = hi-lo; @@ -394,7 +394,7 @@ gb_inline Array array_slice(Array const &array, isize lo, isize hi) { } template -Array array_clone(gbAllocator const &allocator, Array const &array) { +gb_internal Array array_clone(gbAllocator const &allocator, Array const &array) { auto clone = array_make(allocator, array.count, array.count); array_copy(&clone, array, 0); return clone; @@ -402,7 +402,7 @@ Array array_clone(gbAllocator const &allocator, Array const &array) { template -void array_ordered_remove(Array *array, isize index) { +gb_internal void array_ordered_remove(Array *array, isize index) { GB_ASSERT(0 <= index && index < array->count); isize bytes = gb_size_of(T) * (array->count-(index+1)); @@ -411,7 +411,7 @@ void array_ordered_remove(Array *array, isize index) { } template -void array_unordered_remove(Array *array, isize index) { +gb_internal void array_unordered_remove(Array *array, isize index) { GB_ASSERT(0 <= index && index < array->count); isize n = array->count-1; @@ -424,35 +424,35 @@ void array_unordered_remove(Array *array, isize index) { template -T *begin(Array &array) { +gb_internal T *begin(Array &array) { return array.data; } template -T const *begin(Array const &array) { +gb_internal T const *begin(Array const &array) { return array.data; } template -T *end(Array &array) { +gb_internal T *end(Array &array) { return array.data + array.count; } template -T const *end(Array const &array) { +gb_internal T const *end(Array const &array) { return array.data + array.count; } template -T *begin(Slice &array) { +gb_internal T *begin(Slice &array) { return array.data; } template -T const *begin(Slice const &array) { +gb_internal T const *begin(Slice const &array) { return array.data; } template -T *end(Slice &array) { +gb_internal T *end(Slice &array) { return array.data + array.count; } template -T const *end(Slice const &array) { +gb_internal T const *end(Slice const &array) { return array.data + array.count; } -- cgit v1.2.3