Open-Argon/argon-v3
1
0
Fork 0
mirror of https://github.com/Open-Argon/argon-v3.git synced 2025-12-06 08:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken sort function

Browse Source
This commit is contained in:
William Bell
2023-07-28 19:42:31 +02:00
parent ab94c9ff65
commit b2bd683e08
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sortany.go
View File

@@ -4,8 +4,6 @@ import (
"fmt"
)
type keyCache map[any]any
func quickSort(list []any, getKey func(any) (any, ArErr)) ([]any, ArErr) {
if len(list) <= 1 {
return list, ArErr{}
@@ -15,21 +13,19 @@ func quickSort(list []any, getKey func(any) (any, ArErr)) ([]any, ArErr) {
var left []any
var right []any
var cache = make(keyCache)
for _, v := range list[1:] {
val, err := getkeyCache(getKey, v, cache)
val, err := getkeyCache(getKey, v)
if err.EXISTS {
return nil, err
}
pivotval, err := getkeyCache(getKey, pivot, cache)
pivotval, err := getkeyCache(getKey, pivot)
if err.EXISTS {
return nil, err
}
comp, comperr := compare(val, pivotval)
if comperr != nil {
return nil, ArErr{
TYPE: "TypeError",
TYPE: "Runtime Error",
message: comperr.Error(),
EXISTS: true,
}
@@ -53,16 +49,11 @@ func quickSort(list []any, getKey func(any) (any, ArErr)) ([]any, ArErr) {
return append(append(left, pivot), right...), ArErr{}
}
func getkeyCache(getKey func(any) (any, ArErr), index any, cache keyCache) (any, ArErr) {
key := ArValidToAny(index)
if cacheval, ok := cache[key]; ok {
return cacheval, ArErr{}
}
val, err := getKey(index)
func getkeyCache(getKey func(any) (any, ArErr), key any) (any, ArErr) {
val, err := getKey(key)
if err.EXISTS {
return nil, err
}
cache[key] = val
return val, ArErr{}
}