diff options
author | Profpatsch <mail@profpatsch.de> | 2018-06-05 18:43:42 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2018-06-05 18:45:20 +0200 |
commit | f98272d6e293a9deae83a9274f1061f0121e84c9 (patch) | |
tree | df5839195566477e37c6145fd4800a741e466b35 /lib/trivial.nix | |
parent | 6842319f8148cfb9d1644ebc0465169d75d91317 (diff) | |
download | nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.tar nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.tar.gz nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.tar.bz2 nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.tar.lz nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.tar.xz nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.tar.zst nixpkgs-f98272d6e293a9deae83a9274f1061f0121e84c9.zip |
Revert "lib: bitAnd, bitOr, bitXor"
Diffstat (limited to 'lib/trivial.nix')
-rw-r--r-- | lib/trivial.nix | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index 86e3c939dd6..251cb796db0 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,38 +1,4 @@ { lib }: -let - zipIntBits = f: x: y: - let - # (intToBits 6) -> [ 0 1 1 ] - intToBits = x: - if x==0 then - [] - else - let - headbit = if (x / 2) * 2 != x then 1 else 0; # x & 1 - tailbits = if x < 0 then 9223372036854775807 + ((x+1) / 2) else x / 2; # x >>> 1 - in - [headbit] ++ (intToBits tailbits); - - # (bitsToInt [ 0 1 1 ]) -> 6 - bitsToInt = l: - if l==[] then - 0 - else - (builtins.head l) + (2 * (bitsToInt (builtins.tail l))); - - zipListsWith' = fst: snd: - if fst==[] && snd==[] then - [] - else if fst==[] then - [(f 0 (builtins.head snd))] ++ (zipListsWith' [] (builtins.tail snd)) - else if snd==[] then - [(f (builtins.head fst) 0 )] ++ (zipListsWith' (builtins.tail fst) [] ) - else - [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd)); - in - assert (builtins.isInt x) && (builtins.isInt y); - bitsToInt (zipListsWith' (intToBits x) (intToBits y)); -in rec { /* The identity function @@ -65,15 +31,6 @@ rec { /* boolean “and” */ and = x: y: x && y; - /* bitwise “and” */ - bitAnd = builtins.bitAnd or zipIntBits (a: b: if a==1 && b==1 then 1 else 0); - - /* bitwise “or” */ - bitOr = builtins.bitOr or zipIntBits (a: b: if a==1 || b==1 then 1 else 0); - - /* bitwise “xor” */ - bitXor = builtins.bitXor or zipIntBits (a: b: if a!=b then 1 else 0); - /* Convert a boolean to a string. Note that toString on a bool returns "1" and "". */ |