From 3d4ad9739cb2055bb037e9795fae7e015dc186e4 Mon Sep 17 00:00:00 2001 From: Arne Döring Date: Mon, 2 Sep 2019 11:21:26 +0200 Subject: fix min/max for float numbers (#12068) --- lib/system.nim | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/system.nim b/lib/system.nim index 6b1421160..05dc43ab2 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -2880,17 +2880,21 @@ proc max*[T](x: openArray[T]): T = for i in 1..high(x): if result < x[i]: result = x[i] -proc abs*(x: float): float {.magic: "AbsF64", noSideEffect.} = +proc abs*(x: float64): float64 {.noSideEffect, inline.} = if x < 0.0: -x else: x -proc min*(x, y: float): float {.magic: "MinF64", noSideEffect.} = - if x <= y: x else: y -proc max*(x, y: float): float {.magic: "MaxF64", noSideEffect.} = - if y <= x: x else: y - -proc min*[T](x, y: T): T {.inline.}= +proc abs*(x: float32): float32 {.noSideEffect, inline.} = + if x < 0.0: -x else: x +proc min*(x, y: float32): float32 {.noSideEffect, inline.} = + if x <= y or y != y: x else: y +proc min*(x, y: float64): float64 {.noSideEffect, inline.} = + if x <= y or y != y: x else: y +proc max*(x, y: float32): float32 {.noSideEffect, inline.} = + if y <= x or y != y: x else: y +proc max*(x, y: float64): float64 {.noSideEffect, inline.} = + if y <= x or y != y: x else: y +proc min*[T: not SomeFloat](x, y: T): T {.inline.} = if x <= y: x else: y - -proc max*[T](x, y: T): T {.inline.}= +proc max*[T: not SomeFloat](x, y: T): T {.inline.} = if y <= x: x else: y {.pop.} -- cgit 1.4.1-2-gfad0