From 1b7390b71484de63c8ded01371a1dd2adf93909e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 8 May 2010 11:51:01 -0400 Subject: [PATCH] Fixed the Octet to/from Int functions. --- src/Octet.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Octet.hs b/src/Octet.hs index c40d450..aaff3d2 100644 --- a/src/Octet.hs +++ b/src/Octet.hs @@ -27,7 +27,7 @@ octet_to_int x = 8 * (bit_to_int (b5 x)) + 4 * (bit_to_int (b6 x)) + 2 * (bit_to_int (b7 x)) + - 0 * (bit_to_int (b8 x)) + 1 * (bit_to_int (b8 x)) @@ -36,14 +36,14 @@ octet_from_int x | (x < 0) || (x > 255) = Octet.None | otherwise = (Octet a1 a2 a3 a4 a5 a6 a7 a8) where - a1 = if (x `mod` 128) > 0 then One else Zero - a2 = if (x `mod` 64) > 0 then One else Zero - a3 = if (x `mod` 32) > 0 then One else Zero - a4 = if (x `mod` 16) > 0 then One else Zero - a5 = if (x `mod` 8) > 0 then One else Zero - a6 = if (x `mod` 4) > 0 then One else Zero - a7 = if (x `mod` 2) > 0 then One else Zero - a8 = if (x `mod` 1) > 0 then One else Zero + a1 = if (x > 128) then One else Zero + a2 = if ((x `mod` 128) >= 64) then One else Zero + a3 = if ((x `mod` 64) >= 32) then One else Zero + a4 = if ((x `mod` 32) >= 16) then One else Zero + a5 = if ((x `mod` 16) >= 8) then One else Zero + a6 = if ((x `mod` 8) >= 4) then One else Zero + a7 = if ((x `mod` 4) >= 2) then One else Zero + a8 = if ((x `mod` 2) == 1) then One else Zero octet_from_string :: String -> Octet -- 2.43.2