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

Remove return value from append

Browse Source
This commit is contained in:
gingerBill
2018-12-14 14:40:27 +00:00
parent b1d0d82254
commit 47e31c3de8
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime/core.odin
+6 -9
View File
@@ -467,8 +467,8 @@ delete_key :: proc(m: ^$T/map[$K]$V, key: K) {
@(builtin) @(builtin)
append_elem :: proc(array: ^$T/[dynamic]$E, arg: E, loc := #caller_location) -> int { append_elem :: proc(array: ^$T/[dynamic]$E, arg: E, loc := #caller_location) {
if array == nil do return 0; if array == nil do return;
arg_len := 1; arg_len := 1;
@@ -484,14 +484,13 @@ append_elem :: proc(array: ^$T/[dynamic]$E, arg: E, loc := #caller_location) ->
mem.copy(mem.ptr_offset(data, a.len), &arg, size_of(E)); mem.copy(mem.ptr_offset(data, a.len), &arg, size_of(E));
a.len += arg_len; a.len += arg_len;
} }
return len(array);
} }
@(builtin) @(builtin)
append_elems :: proc(array: ^$T/[dynamic]$E, args: ..E, loc := #caller_location) -> int { append_elems :: proc(array: ^$T/[dynamic]$E, args: ..E, loc := #caller_location) {
if array == nil do return 0; if array == nil do return;
arg_len := len(args); arg_len := len(args);
if arg_len <= 0 do return len(array); if arg_len <= 0 do return;
if cap(array) <= len(array)+arg_len { if cap(array) <= len(array)+arg_len {
@@ -506,18 +505,16 @@ append_elems :: proc(array: ^$T/[dynamic]$E, args: ..E, loc := #caller_location)
mem.copy(mem.ptr_offset(data, a.len), &args[0], size_of(E) * arg_len); mem.copy(mem.ptr_offset(data, a.len), &args[0], size_of(E) * arg_len);
a.len += arg_len; a.len += arg_len;
} }
return len(array);
} }
@(builtin) append :: proc{append_elem, append_elems}; @(builtin) append :: proc{append_elem, append_elems};
@(builtin) @(builtin)
append_string :: proc(array: ^$T/[dynamic]$E/u8, args: ..string, loc := #caller_location) -> int { append_string :: proc(array: ^$T/[dynamic]$E/u8, args: ..string, loc := #caller_location) {
for arg in args { for arg in args {
append(array = array, args = ([]E)(arg), loc = loc); append(array = array, args = ([]E)(arg), loc = loc);
} }
return len(array);
} }
@(builtin) @(builtin)