ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #641 from Tetralux/fix-container-arraypushelems

Browse Source 
Fix container.Array.array_push_back_elems
This commit is contained in:
gingerBill
2020-05-15 08:49:26 +01:00
committed by GitHub
parent 8b066b2456 dc236d6830
commit 5f08c77d8b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/container/array.odin
+8 -5
View File
@@ -28,12 +28,12 @@ array_set
array_reserve array_reserve
array_resize array_resize
array_push = array_append :: proc{ array_push = array_append :: proc{
array_push_back, array_push_back,
array_push_back_elems, array_push_back_elems,
} }
array_push_front array_push_front
array_pop_back array_pop_back
array_pop_font array_pop_front
array_consume array_consume
array_trim array_trim
array_clear array_clear
@@ -78,6 +78,10 @@ array_slice :: proc(a: $A/Array($T)) -> []T {
return transmute([]T)s; return transmute([]T)s;
} }
array_cap_slice :: proc(a: $A/Array($T)) -> []T {
s := mem.Raw_Slice{a.data, a.cap};
return transmute([]T)s;
}
array_get :: proc(a: $A/Array($T), index: int, loc := #caller_location) -> T { array_get :: proc(a: $A/Array($T), index: int, loc := #caller_location) -> T {
runtime.bounds_check_error_loc(loc, index, array_len(a)); runtime.bounds_check_error_loc(loc, index, array_len(a));
@@ -136,7 +140,7 @@ array_pop_back :: proc(a: ^$A/Array($T), loc := #caller_location) -> T {
return item; return item;
} }
array_pop_font :: proc(a: ^$A/Array($T), loc := #caller_location) -> T { array_pop_front :: proc(a: ^$A/Array($T), loc := #caller_location) -> T {
assert(condition=a.len > 0, loc=loc); assert(condition=a.len > 0, loc=loc);
item := array_get(a^, 0); item := array_get(a^, 0);
s := array_slice(a^); s := array_slice(a^);
@@ -167,13 +171,12 @@ array_clone :: proc(a: $A/Array($T), allocator := context.allocator) -> A {
return res; return res;
} }
array_push_back_elems :: proc(a: ^$A/Array($T), items: ..T) { array_push_back_elems :: proc(a: ^$A/Array($T), items: ..T) {
if array_space(a^) < len(items) { if array_space(a^) < len(items) {
array_grow(a, a.len + len(items)); array_grow(a, a.len + len(items));
} }
offset := a.len; offset := a.len;
data := array_slice(a^); data := array_cap_slice(a^);
n := copy(data[a.len:], items); n := copy(data[a.len:], items);
a.len += n; a.len += n;
} }