mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-31 10:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pop behaviour, and improve assert messages by using #caller_location

Browse Source
This commit is contained in:
gingerBill
2020-10-02 11:04:17 +01:00
parent 3a4f0d85a6
commit 8f28312705
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/runtime/core.odin
View File

@@ -599,31 +599,28 @@ remove_range :: proc(array: ^$D/[dynamic]$T, lo, hi: int, loc := #caller_locatio
@builtin
pop :: proc(array: ^$T/[dynamic]$E) -> E {
if len(array) == 0 {
return E{};
}
assert(len(array) > 0);
res := #no_bounds_check array[len(array)-1];
pop :: proc(array: ^$T/[dynamic]$E, loc := #caller_location) -> (res: E) #no_bounds_check {
assert(len(array) > 0, "", loc);
res = array[len(array)-1];
(^Raw_Dynamic_Array)(array).len -= 1;
return res;
}
@builtin
pop_safe :: proc(array: ^$T/[dynamic]$E) -> (E, bool) {
pop_safe :: proc(array: ^$T/[dynamic]$E) -> (res: E, ok: bool) #no_bounds_check {
if len(array) == 0 {
return E{}, false;
return;
}
res := #no_bounds_check array[len(array)-1];
res, ok = array[len(array)-1], true;
(^Raw_Dynamic_Array)(array).len -= 1;
return res, true;
return;
}
@builtin
pop_front :: proc(array: ^$T/[dynamic]$E) -> E #no_bounds_check {
assert(len(array) > 0);
res := array[0];
pop_front :: proc(array: ^$T/[dynamic]$E, loc := #caller_location) -> (res: E) #no_bounds_check {
assert(len(array) > 0, "", loc);
res = array[0];
if len(array) > 1 {
copy(array[0:], array[1:]);
}
@@ -632,16 +629,16 @@ pop_front :: proc(array: ^$T/[dynamic]$E) -> E #no_bounds_check {
}
@builtin
pop_front_safe :: proc(array: ^$T/[dynamic]$E) -> (E, bool) #no_bounds_check {
pop_front_safe :: proc(array: ^$T/[dynamic]$E) -> (res: E, ok: bool) #no_bounds_check {
if len(array) == 0 {
return E{}, false;
return;
}
res := array[0];
res, ok = array[0], true;
if len(array) > 1 {
copy(array[0:], array[1:]);
}
(^Raw_Dynamic_Array)(array).len -= 1;
return res, true;
return;
}