Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions sjsonnet/src/sjsonnet/Std.scala
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,10 @@ class Std(private val additionalNativeFunctions: Map[String, Val.Builtin] = Map.
} else if (keyF.isInstanceOf[Val.False]) {
arr.asStrictArray.min(ev)
} else {
arr.asStrictArray.map(v => keyF.asInstanceOf[Val.Func].apply1(v, pos.fileScope.noOffsetPos)(ev)).min(ev)
val minTuple = arr.asStrictArray
.map(v => keyF.asInstanceOf[Val.Func].apply1(v, pos.fileScope.noOffsetPos)(ev))
.zipWithIndex.min((x: (Val, Int), y: (Val, Int)) => ev.compare(x._1, y._1))
arr.force(minTuple._2)
}
}
}
Expand All @@ -207,7 +210,10 @@ class Std(private val additionalNativeFunctions: Map[String, Val.Builtin] = Map.
} else if (keyF.isInstanceOf[Val.False]) {
arr.asStrictArray.max(ev)
} else {
arr.asStrictArray.map(v => keyF.asInstanceOf[Val.Func].apply1(v, pos.fileScope.noOffsetPos)(ev)).max(ev)
val maxTuple = arr.asStrictArray
.map(v => keyF.asInstanceOf[Val.Func].apply1(v, pos.fileScope.noOffsetPos)(ev))
.zipWithIndex.max((x: (Val, Int), y: (Val, Int)) => ev.compare(x._1, y._1))
arr.force(maxTuple._2)
}
}
}
Expand Down
Loading