diff options
| author | gingerBill <bill@gingerbill.org> | 2021-08-31 22:21:13 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2021-08-31 22:21:13 +0100 |
| commit | 251da264ed6e0f039931683c7b0d4b97e88c8d99 (patch) | |
| tree | c7a9a088477d2452c2cf850458c62d994a211df6 /core/runtime/dynamic_array_internal.odin | |
| parent | b176af27427a6c39448a71a8023e4a9877f0a51c (diff) | |
Remove unneeded semicolons from the core library
Diffstat (limited to 'core/runtime/dynamic_array_internal.odin')
| -rw-r--r-- | core/runtime/dynamic_array_internal.odin | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/core/runtime/dynamic_array_internal.odin b/core/runtime/dynamic_array_internal.odin index 340f3be5e..6f800de7a 100644 --- a/core/runtime/dynamic_array_internal.odin +++ b/core/runtime/dynamic_array_internal.odin @@ -1,103 +1,103 @@ package runtime __dynamic_array_make :: proc(array_: rawptr, elem_size, elem_align: int, len, cap: int, loc := #caller_location) { - array := (^Raw_Dynamic_Array)(array_); - array.allocator = context.allocator; - assert(array.allocator.procedure != nil); + array := (^Raw_Dynamic_Array)(array_) + array.allocator = context.allocator + assert(array.allocator.procedure != nil) if cap > 0 { - __dynamic_array_reserve(array_, elem_size, elem_align, cap, loc); - array.len = len; + __dynamic_array_reserve(array_, elem_size, elem_align, cap, loc) + array.len = len } } __dynamic_array_reserve :: proc(array_: rawptr, elem_size, elem_align: int, cap: int, loc := #caller_location) -> bool { - array := (^Raw_Dynamic_Array)(array_); + array := (^Raw_Dynamic_Array)(array_) // NOTE(tetra, 2020-01-26): We set the allocator before earlying-out below, because user code is usually written // assuming that appending/reserving will set the allocator, if it is not already set. if array.allocator.procedure == nil { - array.allocator = context.allocator; + array.allocator = context.allocator } - assert(array.allocator.procedure != nil); + assert(array.allocator.procedure != nil) if cap <= array.cap { - return true; + return true } - old_size := array.cap * elem_size; - new_size := cap * elem_size; - allocator := array.allocator; + old_size := array.cap * elem_size + new_size := cap * elem_size + allocator := array.allocator - new_data, err := allocator.procedure(allocator.data, .Resize, new_size, elem_align, array.data, old_size, loc); + new_data, err := allocator.procedure(allocator.data, .Resize, new_size, elem_align, array.data, old_size, loc) if err != nil { - return false; + return false } if new_data != nil || elem_size == 0 { - array.data = raw_data(new_data); - array.cap = min(cap, len(new_data)/elem_size); - return true; + array.data = raw_data(new_data) + array.cap = min(cap, len(new_data)/elem_size) + return true } - return false; + return false } __dynamic_array_resize :: proc(array_: rawptr, elem_size, elem_align: int, len: int, loc := #caller_location) -> bool { - array := (^Raw_Dynamic_Array)(array_); + array := (^Raw_Dynamic_Array)(array_) - ok := __dynamic_array_reserve(array_, elem_size, elem_align, len, loc); + ok := __dynamic_array_reserve(array_, elem_size, elem_align, len, loc) if ok { - array.len = len; + array.len = len } - return ok; + return ok } __dynamic_array_append :: proc(array_: rawptr, elem_size, elem_align: int, items: rawptr, item_count: int, loc := #caller_location) -> int { - array := (^Raw_Dynamic_Array)(array_); + array := (^Raw_Dynamic_Array)(array_) if items == nil { - return 0; + return 0 } if item_count <= 0 { - return 0; + return 0 } - ok := true; + ok := true if array.cap <= array.len+item_count { - cap := 2 * array.cap + max(8, item_count); - ok = __dynamic_array_reserve(array, elem_size, elem_align, cap, loc); + cap := 2 * array.cap + max(8, item_count) + ok = __dynamic_array_reserve(array, elem_size, elem_align, cap, loc) } // TODO(bill): Better error handling for failed reservation if !ok { - return array.len; + return array.len } - assert(array.data != nil); - data := uintptr(array.data) + uintptr(elem_size*array.len); + assert(array.data != nil) + data := uintptr(array.data) + uintptr(elem_size*array.len) - mem_copy(rawptr(data), items, elem_size * item_count); - array.len += item_count; - return array.len; + mem_copy(rawptr(data), items, elem_size * item_count) + array.len += item_count + return array.len } __dynamic_array_append_nothing :: proc(array_: rawptr, elem_size, elem_align: int, loc := #caller_location) -> int { - array := (^Raw_Dynamic_Array)(array_); + array := (^Raw_Dynamic_Array)(array_) - ok := true; + ok := true if array.cap <= array.len+1 { - cap := 2 * array.cap + max(8, 1); - ok = __dynamic_array_reserve(array, elem_size, elem_align, cap, loc); + cap := 2 * array.cap + max(8, 1) + ok = __dynamic_array_reserve(array, elem_size, elem_align, cap, loc) } // TODO(bill): Better error handling for failed reservation if !ok { - return array.len; + return array.len } - assert(array.data != nil); - data := uintptr(array.data) + uintptr(elem_size*array.len); - mem_zero(rawptr(data), elem_size); - array.len += 1; - return array.len; + assert(array.data != nil) + data := uintptr(array.data) + uintptr(elem_size*array.len) + mem_zero(rawptr(data), elem_size) + array.len += 1 + return array.len } |