From: Michael Orlitzky Date: Sun, 21 Apr 2024 02:49:48 +0000 (-0400) Subject: src/IPv4Address.hs: fix -Woperator-whitespace warnings X-Git-Tag: 0.5.8~1 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=feff8474098037df0f6573ad6ebe5a95093fea95;p=hath.git src/IPv4Address.hs: fix -Woperator-whitespace warnings --- diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs index 38aec8d..f9fd8c2 100644 --- a/src/IPv4Address.hs +++ b/src/IPv4Address.hs @@ -205,13 +205,13 @@ instance Enum IPv4Address where -- Chop off the higher octets. x1 = x `mod` 2^32, would be -- redundant. - x2 = x `mod` 2^(24 :: Integer) - x3 = x `mod` 2^(16 :: Integer) - x4 = (fromIntegral $ x `mod` 2^(8 :: Integer)) :: Int + x2 = x `mod` (2 ^ (24 :: Integer)) + x3 = x `mod` (2 ^ (16 :: Integer)) + x4 = (fromIntegral $ x `mod` (2 ^ (8 :: Integer))) :: Int -- Perform right-shifts. x4 doesn't need a shift. - shifted_x1 = (fromIntegral $ x `quot` 2^(24 :: Integer)) :: Int - shifted_x2 = (fromIntegral $ x2 `quot` 2^(16 :: Integer)) :: Int - shifted_x3 = fromIntegral $ x3 `quot` 2^(8 :: Integer) :: Int + shifted_x1 = (fromIntegral $ x `quot` (2 ^ (24 :: Integer))) :: Int + shifted_x2 = (fromIntegral $ x2 `quot` (2 ^ (16 :: Integer))) :: Int + shifted_x3 = (fromIntegral $ x3 `quot` (2 ^ (8 :: Integer))) :: Int oct1 = toEnum shifted_x1 :: Octet oct2 = toEnum shifted_x2 :: Octet oct3 = toEnum shifted_x3 :: Octet @@ -226,9 +226,9 @@ instance Enum IPv4Address where oct2 = fromEnum (octet2 addr) oct3 = fromEnum (octet3 addr) oct4 = fromEnum (octet4 addr) - shifted_oct1 = oct1 * 2^(24 :: Integer) - shifted_oct2 = oct2 * 2^(16 :: Integer) - shifted_oct3 = oct3 * 2^(8 :: Integer) + shifted_oct1 = oct1 * (2 ^ (24 :: Integer)) + shifted_oct2 = oct2 * (2 ^ (16 :: Integer)) + shifted_oct3 = oct3 * (2 ^ (8 :: Integer)) -- | Given two addresses, find the number of the most significant bit -- where they differ. If the addresses are the same, return @@ -386,7 +386,7 @@ prop_from_enum_to_enum_inverses_x64 = where prop :: (Small Int64) -> Property prop x = - 0 <= x && x <= 2^(32 :: Integer) - 1 ==> + 0 <= x && x <= (2 ^ (32 :: Integer)) - 1 ==> fromIntegral (fromEnum (toEnum (fromIntegral x) :: IPv4Address)) == x -- According to the QuickCheck documentation, we need the "Large"