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

Fix core:slice.rotate_left

Browse Source 
This commit includes two fixes:
- a temporary cast to make the function compile
- a fix to a logic error that caused the function to hang or return
  incorrect results
This commit is contained in:
Andrea Piseri
2022-12-21 21:09:22 +01:00
parent 0829ac30f7
commit 385d2a143c
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/slice/ptr.odin
+5 -13
View File
@@ -73,25 +73,17 @@ ptr_rotate :: proc(left: int, mid: ^$T, right: int) {
left, mid, right := left, mid, right left, mid, right := left, mid, right
// TODO(bill): Optimization with a buffer for smaller ranges // TODO(bill): Optimization with a buffer for smaller ranges
if left >= right { for left > 0 && right > 0 {
for { if left >= right {
ptr_swap_non_overlapping(ptr_sub(mid, right), mid, right) ptr_swap_non_overlapping(ptr_sub(mid, right), mid, right * size_of(T))
mid = ptr_sub(mid, right) mid = ptr_sub(mid, right)
left -= right left -= right
if left < right { } else {
break ptr_swap_non_overlapping(ptr_sub(mid, left), mid, left * size_of(T))
}
}
} else {
for {
ptr_swap_non_overlapping(ptr_sub(mid, left), mid, left)
mid = ptr_add(mid, left) mid = ptr_add(mid, left)
right -= left right -= left
if right < left {
break
}
} }
} }
} }
core/slice/slice.odin
+4 -2
View File
@@ -218,8 +218,10 @@ rotate_left :: proc(array: $T/[]$E, mid: int) {
n := len(array) n := len(array)
m := mid %% n m := mid %% n
k := n - m k := n - m
p := raw_data(array) // FIXME: (ap29600) this cast is a temporary fix for the compiler not matching
ptr_rotate(mid, ptr_add(p, mid), k) // [^T] with $P/^$T
p := cast(^int)raw_data(array)
ptr_rotate(m, ptr_add(p, m), k)
} }
rotate_right :: proc(array: $T/[]$E, k: int) { rotate_right :: proc(array: $T/[]$E, k: int) {
rotate_left(array, -k) rotate_left(array, -k)