Update Cidr for the new definition of apply_mask.

Replace min/max_host with one-liners thanks to the new apply_mask.

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 41ea9ee9a711b6af63c928419f77a7363fbaf20e..8fc014f6cf5b062f8ae019d3b990c22a9604e9b8 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -55,7 +55,7 @@ equivalent Cidr.None Cidr.None = True
 equivalent Cidr.None _ = False
 equivalent _ Cidr.None = False
 equivalent (Cidr addr1 mbits1) (Cidr addr2 mbits2) =
-    (mbits1 == mbits2) && ((apply_mask addr1 mbits1) == (apply_mask addr2 mbits2))
+    (mbits1 == mbits2) && ((apply_mask addr1 mbits1 B.Zero) == (apply_mask addr2 mbits2 B.Zero))
 
 -- Returns the mask portion of a CIDR address. That is, everything
 -- after the trailing slash.
@@ -91,157 +91,14 @@ min_host :: Cidr -> IPv4Address
 min_host Cidr.None                 = IPv4Address.None
 min_host (Cidr IPv4Address.None _) = IPv4Address.None
 min_host (Cidr _ Maskbits.None)    = IPv4Address.None
-min_host (Cidr addr mask)
-    | mask == ThirtyTwo = addr
-    | mask == ThirtyOne = addr { octet4 = apply_mask oct4 Seven }
-    | mask == Thirty = addr { octet4 = apply_mask oct4 Six }
-    | mask == TwentyNine = addr { octet4 = apply_mask oct4 Five }
-    | mask == TwentyEight = addr { octet4 = apply_mask oct4 Four }
-    | mask == TwentySeven = addr { octet4 = apply_mask oct4 Three }
-    | mask == TwentySix = addr { octet4 = apply_mask oct4 Two }
-    | mask == TwentyFive = addr { octet4 = apply_mask oct4 One }
-    | mask == TwentyFour = addr { octet4 = min_octet }
-    | mask == TwentyThree = addr { octet3 = apply_mask oct3 Seven,
-                                   octet4 = min_octet }
-    | mask == TwentyTwo = addr { octet3 = apply_mask oct3 Six,
-                                 octet4 = min_octet }
-    | mask == TwentyOne = addr { octet3 = apply_mask oct3 Five,
-                                 octet4 = min_octet }
-    | mask == Twenty = addr { octet3 = apply_mask oct3 Four,
-                              octet4 = min_octet }
-    | mask == Nineteen = addr { octet3 = apply_mask oct3 Three,
-                                octet4 = min_octet }
-    | mask == Eighteen = addr { octet3 = apply_mask oct3 Two,
-                                octet4 = min_octet }
-    | mask == Seventeen = addr { octet3 = apply_mask oct3 One,
-                                 octet4 = min_octet }
-    | mask == Sixteen = addr { octet3 = min_octet,
-                               octet4 = min_octet }
-    | mask == Fifteen = addr { octet2 = apply_mask oct2 Seven,
-                               octet3 = min_octet,
-                               octet4 = min_octet }
-    | mask == Fourteen = addr { octet2 = apply_mask oct2 Six,
-                                octet3 = min_octet,
-                                octet4 = min_octet }
-    | mask == Thirteen = addr { octet2 = apply_mask oct2 Five,
-                                octet3 = min_octet,
-                                octet4 = min_octet }
-    | mask == Twelve = addr { octet2 = apply_mask oct2 Four,
-                              octet3 = min_octet,
-                              octet4 = min_octet }
-    | mask == Eleven = addr { octet2 = apply_mask oct2 Three,
-                              octet3 = min_octet,
-                              octet4 = min_octet }
-    | mask == Ten = addr { octet2 = apply_mask oct2 Two,
-                           octet3 = min_octet,
-                           octet4 = min_octet }
-    | mask == Nine = addr { octet2 = apply_mask oct2 One,
-                            octet3 = min_octet,
-                            octet4 = min_octet }
-    | mask == Eight = min_address { octet1 = oct1 }
-    | mask == Seven = min_address { octet1 = apply_mask oct1 Seven }
-    | mask == Six = min_address { octet1 = apply_mask oct1 Six }
-    | mask == Five = min_address { octet1 = apply_mask oct1 Five }
-    | mask == Four = min_address { octet1 = apply_mask oct1 Four }
-    | mask == Three = min_address { octet1 = apply_mask oct1 Three }
-    | mask == Two = min_address { octet1 = apply_mask oct1 Two }
-    | mask == One = min_address { octet1 = apply_mask oct1 One }
-    | mask == Zero = min_address
-    | otherwise = addr
-    where
-      oct1 = (octet1 addr)
-      oct2 = (octet2 addr)
-      oct3 = (octet3 addr)
-      oct4 = (octet4 addr)
-
+min_host (Cidr addr mask) = apply_mask addr mask B.Zero
 
 
 max_host :: Cidr -> IPv4Address
 max_host Cidr.None                 = IPv4Address.None
 max_host (Cidr IPv4Address.None _) = IPv4Address.None
 max_host (Cidr _ Maskbits.None)    = IPv4Address.None
-max_host (Cidr addr mask)
-    | mask == ThirtyTwo = addr
-    | mask == ThirtyOne = addr { octet4 = oct4 { b8 = B.One } }
-    | mask == Thirty = addr { octet4 = oct4 { b7 = B.One, b8 = B.One } }
-    | mask == TwentyNine = addr { octet4 = oct4 { b6 = B.One,
-                                                  b7 = B.One,
-                                                  b8 = B.One } }
-    | mask == TwentyEight = addr { octet4 = oct4 { b5 = B.One,
-                                                   b6 = B.One,
-                                                   b7 = B.One,
-                                                   b8 = B.One } }
-    | mask == TwentySeven = addr { octet4 = oct4 { b4 = B.One,
-                                                   b5 = B.One,
-                                                   b6 = B.One,
-                                                   b7 = B.One,
-                                                   b8 = B.One } }
-    | mask == TwentySix = addr { octet4 = oct4 { b3 = B.One,
-                                                 b4 = B.One,
-                                                 b5 = B.One,
-                                                 b6 = B.One,
-                                                 b7 = B.One,
-                                                 b8 = B.One } }
-    | mask == TwentyFive = addr { octet4 = oct4 { b2 = B.One,
-                                                  b3 = B.One,
-                                                  b4 = B.One,
-                                                  b5 = B.One,
-                                                  b6 = B.One,
-                                                  b7 = B.One,
-                                                  b8 = B.One } }
-    | mask == TwentyFour = addr { octet4 = max_octet }
-    | mask == TwentyThree = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 a21 a22 a23 B.One) (max_octet)
-    | mask == TwentyTwo = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 a21 a22 B.One B.One) (max_octet)
-    | mask == TwentyOne = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 a21 B.One B.One B.One) (max_octet)
-    | mask == Twenty = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 B.One B.One B.One B.One) (max_octet)
-    | mask == Nineteen = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 B.One B.One B.One B.One B.One) (max_octet)
-    | mask == Eighteen = ipv4address_from_octets oct1 oct2 (Octet a17 a18 B.One B.One B.One B.One B.One B.One) (max_octet)
-    | mask == Seventeen = ipv4address_from_octets oct1 oct2 (Octet a17 B.One B.One B.One B.One B.One B.One B.One) (max_octet)
-    | mask == Sixteen = ipv4address_from_octets oct1 oct2 (max_octet) (max_octet)
-    | mask == Fifteen = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 a13 a14 a15 B.One) (max_octet) (max_octet)
-    | mask == Fourteen = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 a13 a14 B.One B.One) (max_octet) (max_octet)
-    | mask == Thirteen = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 a13 B.One B.One B.One) (max_octet) (max_octet)
-    | mask == Twelve = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 B.One B.One B.One B.One) (max_octet) (max_octet)
-    | mask == Eleven = ipv4address_from_octets oct1 (Octet a9 a10 a11 B.One B.One B.One B.One B.One) (max_octet) (max_octet)
-    | mask == Ten = ipv4address_from_octets oct1 (Octet a9 a10 B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet)
-    | mask == Nine = ipv4address_from_octets oct1 (Octet a9 B.One B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet)
-    | mask == Eight = ipv4address_from_octets oct1 (max_octet) (max_octet) (max_octet)
-    | mask == Seven = ipv4address_from_octets (Octet a1 a2 a3 a4 a5 a6 a7 B.One) (max_octet) (max_octet) (max_octet)
-    | mask == Six = ipv4address_from_octets (Octet a1 a2 a3 a4 a5 a6 B.One B.One) (max_octet) (max_octet) (max_octet)
-    | mask == Five = ipv4address_from_octets (Octet a1 a2 a3 a4 a5 B.One B.One B.One) (max_octet) (max_octet) (max_octet)
-    | mask == Four = ipv4address_from_octets (Octet a1 a2 a3 a4 B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet)
-    | mask == Three = ipv4address_from_octets (Octet a1 a2 a3 B.One B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet)
-    | mask == Two = ipv4address_from_octets (Octet a1 a2 B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet)
-    | mask == One = ipv4address_from_octets (Octet a1 B.One B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet)
-    | mask == Zero = ipv4address_from_octets (max_octet) (max_octet) (max_octet) (max_octet)
-    | otherwise = addr
-    where
-      a1  = (b1 oct1)
-      a2  = (b2 oct1)
-      a3  = (b3 oct1)
-      a4  = (b4 oct1)
-      a5  = (b5 oct1)
-      a6  = (b6 oct1)
-      a7  = (b7 oct1)
-      a9  = (b1 oct2)
-      a10 = (b2 oct2)
-      a11 = (b3 oct2)
-      a12 = (b4 oct2)
-      a13 = (b5 oct2)
-      a14 = (b6 oct2)
-      a15 = (b7 oct2)
-      a17 = (b1 oct3)
-      a18 = (b2 oct3)
-      a19 = (b3 oct3)
-      a20 = (b4 oct3)
-      a21 = (b5 oct3)
-      a22 = (b6 oct3)
-      a23 = (b7 oct3)
-      oct1 = (octet1 addr)
-      oct2 = (octet2 addr)
-      oct3 = (octet3 addr)
-      oct4 = (octet4 addr)
-
+max_host (Cidr addr mask) = apply_mask addr mask B.One
 
 
 min_octet1 :: Cidr -> Octet
@@ -313,8 +170,8 @@ contains (Cidr addr1 mbits1) (Cidr addr2 mbits2)
     | mbits1 > mbits2 = False
     | otherwise = addr1masked == addr2masked
     where
-      addr1masked = apply_mask addr1 mbits1
-      addr2masked = apply_mask addr2 mbits1
+      addr1masked = apply_mask addr1 mbits1 B.Zero
+      addr2masked = apply_mask addr2 mbits1 B.Zero
 
 
 contains_proper :: Cidr -> Cidr -> Bool