style: format entire depot with nixpkgs-fmt
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo
tazjin
parent
2d10d60fac
commit
aa122cbae7
310 changed files with 7278 additions and 5490 deletions
|
|
@ -47,12 +47,12 @@ let
|
|||
if i == 0
|
||||
then ""
|
||||
else go (bitShiftR i 4)
|
||||
+ string.charAt (bitAnd i 15) hexdigits;
|
||||
+ string.charAt (bitAnd i 15) hexdigits;
|
||||
sign = lib.optionalString (int < 0) "-";
|
||||
in
|
||||
if int == 0
|
||||
then "0"
|
||||
else "${sign}${go (abs int)}";
|
||||
if int == 0
|
||||
then "0"
|
||||
else "${sign}${go (abs int)}";
|
||||
|
||||
fromHexMap = builtins.listToAttrs
|
||||
(lib.imap0 (i: c: { name = c; value = i; })
|
||||
|
|
@ -72,11 +72,12 @@ let
|
|||
val = v.val + (fromHexMap."${d}" * v.mul);
|
||||
mul = v.mul * 16;
|
||||
})
|
||||
{ val = 0; mul = 1; } digits;
|
||||
{ val = 0; mul = 1; }
|
||||
digits;
|
||||
in
|
||||
if negative
|
||||
then -parsed.val
|
||||
else parsed.val;
|
||||
if negative
|
||||
then -parsed.val
|
||||
else parsed.val;
|
||||
|
||||
# A nix integer is a 64bit signed integer
|
||||
maxBound = 9223372036854775807;
|
||||
|
|
@ -99,7 +100,8 @@ let
|
|||
|
||||
inRange = a: b: x: x >= a && x <= b;
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit
|
||||
maxBound
|
||||
minBound
|
||||
|
|
|
|||
|
|
@ -31,22 +31,262 @@ let
|
|||
];
|
||||
|
||||
expectedBytes = [
|
||||
"00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F"
|
||||
"10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B" "1C" "1D" "1E" "1F"
|
||||
"20" "21" "22" "23" "24" "25" "26" "27" "28" "29" "2A" "2B" "2C" "2D" "2E" "2F"
|
||||
"30" "31" "32" "33" "34" "35" "36" "37" "38" "39" "3A" "3B" "3C" "3D" "3E" "3F"
|
||||
"40" "41" "42" "43" "44" "45" "46" "47" "48" "49" "4A" "4B" "4C" "4D" "4E" "4F"
|
||||
"50" "51" "52" "53" "54" "55" "56" "57" "58" "59" "5A" "5B" "5C" "5D" "5E" "5F"
|
||||
"60" "61" "62" "63" "64" "65" "66" "67" "68" "69" "6A" "6B" "6C" "6D" "6E" "6F"
|
||||
"70" "71" "72" "73" "74" "75" "76" "77" "78" "79" "7A" "7B" "7C" "7D" "7E" "7F"
|
||||
"80" "81" "82" "83" "84" "85" "86" "87" "88" "89" "8A" "8B" "8C" "8D" "8E" "8F"
|
||||
"90" "91" "92" "93" "94" "95" "96" "97" "98" "99" "9A" "9B" "9C" "9D" "9E" "9F"
|
||||
"A0" "A1" "A2" "A3" "A4" "A5" "A6" "A7" "A8" "A9" "AA" "AB" "AC" "AD" "AE" "AF"
|
||||
"B0" "B1" "B2" "B3" "B4" "B5" "B6" "B7" "B8" "B9" "BA" "BB" "BC" "BD" "BE" "BF"
|
||||
"C0" "C1" "C2" "C3" "C4" "C5" "C6" "C7" "C8" "C9" "CA" "CB" "CC" "CD" "CE" "CF"
|
||||
"D0" "D1" "D2" "D3" "D4" "D5" "D6" "D7" "D8" "D9" "DA" "DB" "DC" "DD" "DE" "DF"
|
||||
"E0" "E1" "E2" "E3" "E4" "E5" "E6" "E7" "E8" "E9" "EA" "EB" "EC" "ED" "EE" "EF"
|
||||
"F0" "F1" "F2" "F3" "F4" "F5" "F6" "F7" "F8" "F9" "FA" "FB" "FC" "FD" "FE" "FF"
|
||||
"00"
|
||||
"01"
|
||||
"02"
|
||||
"03"
|
||||
"04"
|
||||
"05"
|
||||
"06"
|
||||
"07"
|
||||
"08"
|
||||
"09"
|
||||
"0A"
|
||||
"0B"
|
||||
"0C"
|
||||
"0D"
|
||||
"0E"
|
||||
"0F"
|
||||
"10"
|
||||
"11"
|
||||
"12"
|
||||
"13"
|
||||
"14"
|
||||
"15"
|
||||
"16"
|
||||
"17"
|
||||
"18"
|
||||
"19"
|
||||
"1A"
|
||||
"1B"
|
||||
"1C"
|
||||
"1D"
|
||||
"1E"
|
||||
"1F"
|
||||
"20"
|
||||
"21"
|
||||
"22"
|
||||
"23"
|
||||
"24"
|
||||
"25"
|
||||
"26"
|
||||
"27"
|
||||
"28"
|
||||
"29"
|
||||
"2A"
|
||||
"2B"
|
||||
"2C"
|
||||
"2D"
|
||||
"2E"
|
||||
"2F"
|
||||
"30"
|
||||
"31"
|
||||
"32"
|
||||
"33"
|
||||
"34"
|
||||
"35"
|
||||
"36"
|
||||
"37"
|
||||
"38"
|
||||
"39"
|
||||
"3A"
|
||||
"3B"
|
||||
"3C"
|
||||
"3D"
|
||||
"3E"
|
||||
"3F"
|
||||
"40"
|
||||
"41"
|
||||
"42"
|
||||
"43"
|
||||
"44"
|
||||
"45"
|
||||
"46"
|
||||
"47"
|
||||
"48"
|
||||
"49"
|
||||
"4A"
|
||||
"4B"
|
||||
"4C"
|
||||
"4D"
|
||||
"4E"
|
||||
"4F"
|
||||
"50"
|
||||
"51"
|
||||
"52"
|
||||
"53"
|
||||
"54"
|
||||
"55"
|
||||
"56"
|
||||
"57"
|
||||
"58"
|
||||
"59"
|
||||
"5A"
|
||||
"5B"
|
||||
"5C"
|
||||
"5D"
|
||||
"5E"
|
||||
"5F"
|
||||
"60"
|
||||
"61"
|
||||
"62"
|
||||
"63"
|
||||
"64"
|
||||
"65"
|
||||
"66"
|
||||
"67"
|
||||
"68"
|
||||
"69"
|
||||
"6A"
|
||||
"6B"
|
||||
"6C"
|
||||
"6D"
|
||||
"6E"
|
||||
"6F"
|
||||
"70"
|
||||
"71"
|
||||
"72"
|
||||
"73"
|
||||
"74"
|
||||
"75"
|
||||
"76"
|
||||
"77"
|
||||
"78"
|
||||
"79"
|
||||
"7A"
|
||||
"7B"
|
||||
"7C"
|
||||
"7D"
|
||||
"7E"
|
||||
"7F"
|
||||
"80"
|
||||
"81"
|
||||
"82"
|
||||
"83"
|
||||
"84"
|
||||
"85"
|
||||
"86"
|
||||
"87"
|
||||
"88"
|
||||
"89"
|
||||
"8A"
|
||||
"8B"
|
||||
"8C"
|
||||
"8D"
|
||||
"8E"
|
||||
"8F"
|
||||
"90"
|
||||
"91"
|
||||
"92"
|
||||
"93"
|
||||
"94"
|
||||
"95"
|
||||
"96"
|
||||
"97"
|
||||
"98"
|
||||
"99"
|
||||
"9A"
|
||||
"9B"
|
||||
"9C"
|
||||
"9D"
|
||||
"9E"
|
||||
"9F"
|
||||
"A0"
|
||||
"A1"
|
||||
"A2"
|
||||
"A3"
|
||||
"A4"
|
||||
"A5"
|
||||
"A6"
|
||||
"A7"
|
||||
"A8"
|
||||
"A9"
|
||||
"AA"
|
||||
"AB"
|
||||
"AC"
|
||||
"AD"
|
||||
"AE"
|
||||
"AF"
|
||||
"B0"
|
||||
"B1"
|
||||
"B2"
|
||||
"B3"
|
||||
"B4"
|
||||
"B5"
|
||||
"B6"
|
||||
"B7"
|
||||
"B8"
|
||||
"B9"
|
||||
"BA"
|
||||
"BB"
|
||||
"BC"
|
||||
"BD"
|
||||
"BE"
|
||||
"BF"
|
||||
"C0"
|
||||
"C1"
|
||||
"C2"
|
||||
"C3"
|
||||
"C4"
|
||||
"C5"
|
||||
"C6"
|
||||
"C7"
|
||||
"C8"
|
||||
"C9"
|
||||
"CA"
|
||||
"CB"
|
||||
"CC"
|
||||
"CD"
|
||||
"CE"
|
||||
"CF"
|
||||
"D0"
|
||||
"D1"
|
||||
"D2"
|
||||
"D3"
|
||||
"D4"
|
||||
"D5"
|
||||
"D6"
|
||||
"D7"
|
||||
"D8"
|
||||
"D9"
|
||||
"DA"
|
||||
"DB"
|
||||
"DC"
|
||||
"DD"
|
||||
"DE"
|
||||
"DF"
|
||||
"E0"
|
||||
"E1"
|
||||
"E2"
|
||||
"E3"
|
||||
"E4"
|
||||
"E5"
|
||||
"E6"
|
||||
"E7"
|
||||
"E8"
|
||||
"E9"
|
||||
"EA"
|
||||
"EB"
|
||||
"EC"
|
||||
"ED"
|
||||
"EE"
|
||||
"EF"
|
||||
"F0"
|
||||
"F1"
|
||||
"F2"
|
||||
"F3"
|
||||
"F4"
|
||||
"F5"
|
||||
"F6"
|
||||
"F7"
|
||||
"F8"
|
||||
"F9"
|
||||
"FA"
|
||||
"FB"
|
||||
"FC"
|
||||
"FD"
|
||||
"FE"
|
||||
"FF"
|
||||
];
|
||||
|
||||
hexByte = i: string.fit { width = 2; char = "0"; } (int.toHex i);
|
||||
|
|
@ -64,14 +304,18 @@ let
|
|||
];
|
||||
|
||||
testHex = it "checks conversion to hex" (lib.flatten [
|
||||
(lib.imap0 (i: hex: [
|
||||
(assertEq "hexByte ${toString i} == ${hex}" (hexByte i) hex)
|
||||
(assertEq "${toString i} == fromHex ${hex}" i (int.fromHex hex))
|
||||
]) expectedBytes)
|
||||
(builtins.map ({ left, right }: [
|
||||
(assertEq "toHex ${toString left} == ${right}" (int.toHex left) right)
|
||||
(assertEq "${toString left} == fromHex ${right}" left (int.fromHex right))
|
||||
]) hexInts)
|
||||
(lib.imap0
|
||||
(i: hex: [
|
||||
(assertEq "hexByte ${toString i} == ${hex}" (hexByte i) hex)
|
||||
(assertEq "${toString i} == fromHex ${hex}" i (int.fromHex hex))
|
||||
])
|
||||
expectedBytes)
|
||||
(builtins.map
|
||||
({ left, right }: [
|
||||
(assertEq "toHex ${toString left} == ${right}" (int.toHex left) right)
|
||||
(assertEq "${toString left} == fromHex ${right}" left (int.fromHex right))
|
||||
])
|
||||
hexInts)
|
||||
]);
|
||||
|
||||
testBasic = it "checks basic int operations" [
|
||||
|
|
@ -94,20 +338,23 @@ let
|
|||
];
|
||||
|
||||
testExp = it "checks exponentiation"
|
||||
(builtins.map ({ left, right }:
|
||||
assertEq
|
||||
"2 ^ ${toString left} == ${toString right}"
|
||||
(int.exp 2 left) right) expNumbers);
|
||||
(builtins.map
|
||||
({ left, right }:
|
||||
assertEq
|
||||
"2 ^ ${toString left} == ${toString right}"
|
||||
(int.exp 2 left)
|
||||
right)
|
||||
expNumbers);
|
||||
|
||||
shifts = [
|
||||
{ a = 2; b = 5; c = 64; op = "<<"; }
|
||||
{ a = -2; b = 5; c = -64; op = "<<"; }
|
||||
{ a = 2; b = 5; c = 64; op = "<<"; }
|
||||
{ a = -2; b = 5; c = -64; op = "<<"; }
|
||||
{ a = 123; b = 4; c = 1968; op = "<<"; }
|
||||
{ a = 1; b = 8; c = 256; op = "<<"; }
|
||||
{ a = 256; b = 8; c = 1; op = ">>"; }
|
||||
{ a = 374; b = 2; c = 93; op = ">>"; }
|
||||
{ a = 2; b = 2; c = 0; op = ">>"; }
|
||||
{ a = 99; b = 9; c = 0; op = ">>"; }
|
||||
{ a = 1; b = 8; c = 256; op = "<<"; }
|
||||
{ a = 256; b = 8; c = 1; op = ">>"; }
|
||||
{ a = 374; b = 2; c = 93; op = ">>"; }
|
||||
{ a = 2; b = 2; c = 0; op = ">>"; }
|
||||
{ a = 99; b = 9; c = 0; op = ">>"; }
|
||||
];
|
||||
|
||||
checkShift = { a, b, c, op }@args:
|
||||
|
|
@ -116,15 +363,18 @@ let
|
|||
"<<" = int.bitShiftL;
|
||||
">>" = int.bitShiftR;
|
||||
};
|
||||
in assertEq "${toString a} ${op} ${toString b} == ${toString c}" (f a b) c;
|
||||
in
|
||||
assertEq "${toString a} ${op} ${toString b} == ${toString c}" (f a b) c;
|
||||
|
||||
checkShiftRDivExp = n:
|
||||
assertEq "${toString n} >> 5 == ${toString n} / 2 ^ 5"
|
||||
(int.bitShiftR n 5) (int.div n (int.exp 2 5));
|
||||
(int.bitShiftR n 5)
|
||||
(int.div n (int.exp 2 5));
|
||||
|
||||
checkShiftLMulExp = n:
|
||||
assertEq "${toString n} >> 6 == ${toString n} * 2 ^ 6"
|
||||
(int.bitShiftL n 5) (int.mul n (int.exp 2 5));
|
||||
(int.bitShiftL n 5)
|
||||
(int.mul n (int.exp 2 5));
|
||||
|
||||
testBit = it "checks bitwise operations" (lib.flatten [
|
||||
(builtins.map checkShift shifts)
|
||||
|
|
@ -160,11 +410,11 @@ let
|
|||
]);
|
||||
|
||||
divisions = [
|
||||
{ a = 2; b = 1; c = 2; mod = 0;}
|
||||
{ a = 2; b = 2; c = 1; mod = 0;}
|
||||
{ a = 20; b = 10; c = 2; mod = 0;}
|
||||
{ a = 12; b = 5; c = 2; mod = 2;}
|
||||
{ a = 23; b = 4; c = 5; mod = 3;}
|
||||
{ a = 2; b = 1; c = 2; mod = 0; }
|
||||
{ a = 2; b = 2; c = 1; mod = 0; }
|
||||
{ a = 20; b = 10; c = 2; mod = 0; }
|
||||
{ a = 12; b = 5; c = 2; mod = 2; }
|
||||
{ a = 23; b = 4; c = 5; mod = 3; }
|
||||
];
|
||||
|
||||
checkDiv = n: { a, b, c, mod }: [
|
||||
|
|
@ -176,28 +426,34 @@ let
|
|||
testDivMod = it "checks integer division and modulo"
|
||||
(lib.flatten [
|
||||
(builtins.map (checkDiv "+a / +b") divisions)
|
||||
(builtins.map (fun.rl (checkDiv "-a / +b") (x: x // {
|
||||
a = -x.a;
|
||||
c = -x.c;
|
||||
mod = -x.mod;
|
||||
})) divisions)
|
||||
(builtins.map (fun.rl (checkDiv "+a / -b") (x: x // {
|
||||
b = -x.b;
|
||||
c = -x.c;
|
||||
})) divisions)
|
||||
(builtins.map (fun.rl (checkDiv "-a / -b") (x: x // {
|
||||
a = -x.a;
|
||||
b = -x.b;
|
||||
mod = -x.mod;
|
||||
})) divisions)
|
||||
(builtins.map
|
||||
(fun.rl (checkDiv "-a / +b") (x: x // {
|
||||
a = -x.a;
|
||||
c = -x.c;
|
||||
mod = -x.mod;
|
||||
}))
|
||||
divisions)
|
||||
(builtins.map
|
||||
(fun.rl (checkDiv "+a / -b") (x: x // {
|
||||
b = -x.b;
|
||||
c = -x.c;
|
||||
}))
|
||||
divisions)
|
||||
(builtins.map
|
||||
(fun.rl (checkDiv "-a / -b") (x: x // {
|
||||
a = -x.a;
|
||||
b = -x.b;
|
||||
mod = -x.mod;
|
||||
}))
|
||||
divisions)
|
||||
]);
|
||||
|
||||
in
|
||||
runTestsuite "nix.int" [
|
||||
testBounds
|
||||
testHex
|
||||
testBasic
|
||||
testExp
|
||||
testBit
|
||||
testDivMod
|
||||
]
|
||||
runTestsuite "nix.int" [
|
||||
testBounds
|
||||
testHex
|
||||
testBasic
|
||||
testExp
|
||||
testBit
|
||||
testDivMod
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue