jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

followup #16182 (#17472)

Browse source 
* fix nim js cmp fails at CT

* followup #16182
This commit is contained in:
flywind 2021-03-24 03:18:36 +08:00 • committed by GitHub
commit 28221e8a33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/algorithm.nim
View file

@ -336,12 +336,12 @@ template `<-`(a, b) =
else: else:
copyMem(addr(a), addr(b), sizeof(T)) copyMem(addr(a), addr(b), sizeof(T))
proc merge[T](a, b: var openArray[T], lo, m, hi: int, proc mergeAlt[T](a, b: var openArray[T], lo, m, hi: int,
cmp: proc (x, y: T): int {.closure.}, order: SortOrder) = cmp: proc (x, y: T): int {.closure.}, order: SortOrder) =
# Optimization: If max(left) <= min(right) there is nothing to do! # Optimization: If max(left) <= min(right) there is nothing to do!
# 1 2 3 4 ## 5 6 7 8 # 1 2 3 4 ## 5 6 7 8
# -> O(n) for sorted arrays. # -> O(n) for sorted arrays.
# On random data this saves up to 40% of merge calls. # On random data this saves up to 40% of mergeAlt calls.
if cmp(a[m], a[m+1]) * order <= 0: return if cmp(a[m], a[m+1]) * order <= 0: return
var j = lo var j = lo
# copy a[j..m] into b: # copy a[j..m] into b:
@ -424,7 +424,7 @@ func sort*[T](a: var openArray[T],
while s < n: while s < n:
var m = n-1-s var m = n-1-s
while m >= 0: while m >= 0:
merge(a, b, max(m-s+1, 0), m, m+s, cmp, order) mergeAlt(a, b, max(m-s+1, 0), m, m+s, cmp, order)
dec(m, s*2) dec(m, s*2)
s = s*2 s = s*2