gingerBill 6 dienas atpakaļ
vecāks
revīzija
9e068c254b
1 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
  1. 6 6
      core/slice/sort.odin

+ 6 - 6
core/slice/sort.odin

@@ -348,11 +348,11 @@ sort_by_key :: proc(data: $T/[]$E, key: proc(E) -> $K) where ORD(K) {
 	ctx := &Context{key}
 	ctx := &Context{key}
 
 
 	sort_by_generic_cmp(data, proc(lhs, rhs: rawptr, user_data: rawptr) -> Ordering {
 	sort_by_generic_cmp(data, proc(lhs, rhs: rawptr, user_data: rawptr) -> Ordering {
-		x, y := (^E)(lhs)^, (^E)(rhs)^
+		i, j := (^E)(lhs)^, (^E)(rhs)^
 
 
 		ctx := (^Context)(user_data)
 		ctx := (^Context)(user_data)
-		a := k(i)
-		b := k(j)
+		a := ctx.key(i)
+		b := ctx.key(j)
 		switch {
 		switch {
 		case a < b: return .Less
 		case a < b: return .Less
 		case a > b: return .Greater
 		case a > b: return .Greater
@@ -368,11 +368,11 @@ reverse_sort_by_key :: proc(data: $T/[]$E, key: proc(E) -> $K) where ORD(K) {
 	ctx := &Context{key}
 	ctx := &Context{key}
 
 
 	sort_by_generic_cmp(data, proc(lhs, rhs: rawptr, user_data: rawptr) -> Ordering {
 	sort_by_generic_cmp(data, proc(lhs, rhs: rawptr, user_data: rawptr) -> Ordering {
-		x, y := (^E)(lhs)^, (^E)(rhs)^
+		i, j := (^E)(lhs)^, (^E)(rhs)^
 
 
 		ctx := (^Context)(user_data)
 		ctx := (^Context)(user_data)
-		a := k(i)
-		b := k(j)
+		a := ctx.key(i)
+		b := ctx.key(j)
 		switch {
 		switch {
 		case a < b: return .Greater
 		case a < b: return .Greater
 		case a > b: return .Less
 		case a > b: return .Less