diff options
author | sterni <sternenseemann@systemli.org> | 2023-08-05T15·47+0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2023-08-09T12·12+0000 |
commit | 81fc87e29ebee143aa27ff6167556db76a803d12 (patch) | |
tree | 79dc8e43c0c37392ce99cef8ce960dac163363f4 /users/sterni/nix/int/default.nix | |
parent | 55a3b3eb81a1c37b0c5345e68c03520c85564e3d (diff) |
refactor(nix/sterni/int): rename div & mod to quot & rem r/6479
This mirrors the terminology Haskell uses: quot and rem truncate towards zero which is also the case for builtins.div. We can give us the option to introduce Haskell-style int.div and int.mod (to complete the confusion) which would truncate towards negative infinity. Change-Id: Ibebb0a01a73c9718cd62121b2fc2a19c3a4be0de Reviewed-on: https://cl.tvl.fyi/c/depot/+/9009 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'users/sterni/nix/int/default.nix')
-rw-r--r-- | users/sterni/nix/int/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/users/sterni/nix/int/default.nix b/users/sterni/nix/int/default.nix index e1d7e1fe7e4f..870744522361 100644 --- a/users/sterni/nix/int/default.nix +++ b/users/sterni/nix/int/default.nix @@ -23,7 +23,7 @@ let bitShiftR = bit: count: if count == 0 then bit - else div (bitShiftR bit (count - 1)) 2; + else (bitShiftR bit (count - 1)) / 2; bitShiftL = bit: count: if count == 0 @@ -85,8 +85,13 @@ let odd = x: bitAnd x 1 == 1; even = x: bitAnd x 1 == 0; - inherit (builtins) div; - mod = a: b: let res = a / b; in a - (res * b); + quot' = builtins.div; # no typecheck + rem = a: b: + assert builtins.isInt a && builtins.isInt b; + let res = quot' a b; in a - (res * b); + quot = a: b: + assert builtins.isInt a && builtins.isInt b; + quot' a b; in { @@ -96,8 +101,8 @@ in exp odd even - div - mod + quot + rem bitShiftR bitShiftL bitOr |