Use func in lenientops (#16641)

This commit is contained in:
konsumlamm 2021-01-09 00:24:41 +01:00 • committed by GitHub
commit b7ff0b2a11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,49 +8,49 @@
# #
## This module offers implementations of common binary operations ## This module offers implementations of common binary operations
## like ``+``, ``-``, ``*``, ``/`` and comparison operations, ## like `+`, `-`, `*`, `/` and comparison operations,
## which work for mixed float/int operands. ## which work for mixed float/int operands.
## All operations convert the integer operand into the ## All operations convert the integer operand into the
## type of the float operand. For numerical expressions, the return ## type of the float operand. For numerical expressions, the return
## type is always the type of the float involved in the expression, ## type is always the type of the float involved in the expression,
## i.e., there is no auto conversion from float32 to float64. ## i.e., there is no auto conversion from float32 to float64.
## ##
## Note: In general, auto-converting from int to float loses ## **Note:** In general, auto-converting from int to float loses
## information, which is why these operators live in a separate ## information, which is why these operators live in a separate
## module. Use with care. ## module. Use with care.
## ##
## Regarding binary comparison, this module only provides unequal operators. ## Regarding binary comparison, this module only provides unequal operators.
## The equality operator ``==`` is omitted, because depending on the use case ## The equality operator `==` is omitted, because depending on the use case
## either casting to float or rounding to int might be preferred, and users ## either casting to float or rounding to int might be preferred, and users
## should make an explicit choice. ## should make an explicit choice.
proc `+`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.noSideEffect, inline.} = func `+`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.inline.} =
F(i) + f F(i) + f
proc `+`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.noSideEffect, inline.} = func `+`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.inline.} =
f + F(i) f + F(i)
proc `-`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.noSideEffect, inline.} = func `-`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.inline.} =
F(i) - f F(i) - f
proc `-`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.noSideEffect, inline.} = func `-`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.inline.} =
f - F(i) f - F(i)
proc `*`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.noSideEffect, inline.} = func `*`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.inline.} =
F(i) * f F(i) * f
proc `*`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.noSideEffect, inline.} = func `*`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.inline.} =
f * F(i) f * F(i)
proc `/`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.noSideEffect, inline.} = func `/`*[I: SomeInteger, F: SomeFloat](i: I, f: F): F {.inline.} =
F(i) / f F(i) / f
proc `/`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.noSideEffect, inline.} = func `/`*[I: SomeInteger, F: SomeFloat](f: F, i: I): F {.inline.} =
f / F(i) f / F(i)
proc `<`*[I: SomeInteger, F: SomeFloat](i: I, f: F): bool {.noSideEffect, inline.} = func `<`*[I: SomeInteger, F: SomeFloat](i: I, f: F): bool {.inline.} =
F(i) < f F(i) < f
proc `<`*[I: SomeInteger, F: SomeFloat](f: F, i: I): bool {.noSideEffect, inline.} = func `<`*[I: SomeInteger, F: SomeFloat](f: F, i: I): bool {.inline.} =
f < F(i) f < F(i)
proc `<=`*[I: SomeInteger, F: SomeFloat](i: I, f: F): bool {.noSideEffect, inline.} = func `<=`*[I: SomeInteger, F: SomeFloat](i: I, f: F): bool {.inline.} =
F(i) <= f F(i) <= f
proc `<=`*[I: SomeInteger, F: SomeFloat](f: F, i: I): bool {.noSideEffect, inline.} = func `<=`*[I: SomeInteger, F: SomeFloat](f: F, i: I): bool {.inline.} =
f <= F(i) f <= F(i)
# Note that we must not defined `>=` and `>`, because system.nim already has a # Note that we must not defined `>=` and `>`, because system.nim already has a