Update the min_address function to use record syntax.

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index ca6f3d331c243948e4e0567a5f57900fa76b2396..cf2eb063f9e9fe900ad17ba1ab6b8dfcf754208b 100644 (file)
--- a/src/IPv4Address.hs
+++ b/src/IPv4Address.hs
@@ -118,69 +118,89 @@ min_address :: IPv4Address -> Maskbits -> IPv4Address
 min_address IPv4Address.None _ = IPv4Address.None
 min_address _ Maskbits.None = IPv4Address.None
 min_address addr mask
-    | mask == ThirtyTwo = IPv4Address oct1 oct2 oct3 oct4
-    | mask == ThirtyOne = IPv4Address oct1 oct2 oct3 (Octet a25 a26 a27 a28 a29 a30 a31 B.Zero)
-    | mask == Thirty = IPv4Address oct1 oct2 oct3 (Octet a25 a26 a27 a28 a29 a30 B.Zero B.Zero)
-    | mask == TwentyNine = IPv4Address oct1 oct2 oct3 (Octet a25 a26 a27 a28 a29 B.Zero B.Zero B.Zero)
-    | mask == TwentyEight = IPv4Address oct1 oct2 oct3 (Octet a25 a26 a27 a28 B.Zero B.Zero B.Zero B.Zero)
-    | mask == TwentySeven = IPv4Address oct1 oct2 oct3 (Octet a25 a26 a27 B.Zero B.Zero B.Zero B.Zero B.Zero)
-    | mask == TwentySix = IPv4Address oct1 oct2 oct3 (Octet a25 a26 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero)
-    | mask == TwentyFive = IPv4Address oct1 oct2 oct3 (Octet a25 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero)
-    | mask == TwentyFour = IPv4Address oct1 oct2 oct3 (min_octet)
-    | mask == TwentyThree = IPv4Address oct1 oct2 (Octet a17 a18 a19 a20 a21 a22 a23 B.Zero) (min_octet)
-    | mask == TwentyTwo = IPv4Address oct1 oct2 (Octet a17 a18 a19 a20 a21 a22 B.Zero B.Zero) (min_octet)
-    | mask == TwentyOne = IPv4Address oct1 oct2 (Octet a17 a18 a19 a20 a21 B.Zero B.Zero B.Zero) (min_octet)
-    | mask == Twenty = IPv4Address oct1 oct2 (Octet a17 a18 a19 a20 B.Zero B.Zero B.Zero B.Zero) (min_octet)
-    | mask == Nineteen = IPv4Address oct1 oct2 (Octet a17 a18 a19 B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet)
-    | mask == Eighteen = IPv4Address oct1 oct2 (Octet a17 a18 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet)
-    | mask == Seventeen = IPv4Address oct1 oct2 (Octet a17 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet)
-    | mask == Sixteen = IPv4Address oct1 oct2 (min_octet) (min_octet)
-    | mask == Fifteen = IPv4Address oct1 (Octet a9 a10 a11 a12 a13 a14 a15 B.Zero) (min_octet) (min_octet)
-    | mask == Fourteen = IPv4Address oct1 (Octet a9 a10 a11 a12 a13 a14 B.Zero B.Zero) (min_octet) (min_octet)
-    | mask == Thirteen = IPv4Address oct1 (Octet a9 a10 a11 a12 a13 B.Zero B.Zero B.Zero) (min_octet) (min_octet)
-    | mask == Twelve = IPv4Address oct1 (Octet a9 a10 a11 a12 B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet)
-    | mask == Eleven = IPv4Address oct1 (Octet a9 a10 a11 B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet)
-    | mask == Ten = IPv4Address oct1 (Octet a9 a10 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet)
-    | mask == Nine = IPv4Address oct1 (Octet a9 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet)
-    | mask == Eight = IPv4Address oct1 (min_octet) (min_octet) (min_octet)
-    | mask == Seven = IPv4Address (Octet a1 a2 a3 a4 a5 a6 a7 B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == Six = IPv4Address (Octet a1 a2 a3 a4 a5 a6 B.Zero B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == Five = IPv4Address (Octet a1 a2 a3 a4 a5 B.Zero B.Zero B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == Four = IPv4Address (Octet a1 a2 a3 a4 B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == Three = IPv4Address (Octet a1 a2 a3 B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == Two = IPv4Address (Octet a1 a2 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == One = IPv4Address (Octet a1 B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero B.Zero) (min_octet) (min_octet) (min_octet)
-    | mask == Zero = IPv4Address (min_octet) (min_octet) (min_octet) (min_octet)
+    | 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 = addr { octet2 = min_octet,
+                             octet3 = min_octet,
+                             octet4 = min_octet }
+    | mask == Seven = addr { octet1 = apply_mask oct1 Seven,
+                             octet2 = min_octet,
+                             octet3 = min_octet,
+                             octet4 = min_octet }
+    | mask == Six = addr { octet1 = apply_mask oct1 Six,
+                           octet2 = min_octet,
+                           octet3 = min_octet,
+                           octet4 = min_octet }
+    | mask == Five = addr { octet1 = apply_mask oct1 Five,
+                            octet2 = min_octet,
+                            octet3 = min_octet,
+                            octet4 = min_octet }
+    | mask == Four = addr { octet1 = apply_mask oct1 Four,
+                            octet2 = min_octet,
+                            octet3 = min_octet,
+                            octet4 = min_octet }
+    | mask == Three = addr { octet1 = apply_mask oct1 Three,
+                             octet2 = min_octet,
+                             octet3 = min_octet,
+                             octet4 = min_octet }
+    | mask == Two = addr { octet1 = apply_mask oct1 Two,
+                           octet2 = min_octet,
+                           octet3 = min_octet,
+                           octet4 = min_octet }
+    | mask == One = addr { octet1 = apply_mask oct1 One,
+                           octet2 = min_octet,
+                           octet3 = min_octet,
+                           octet4 = min_octet }
+    | mask == Zero = addr { octet1 = min_octet,
+                            octet2 = min_octet,
+                            octet3 = min_octet,
+                            octet4 = min_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)
-      a25 = (b1 oct4)
-      a26 = (b2 oct4)
-      a27 = (b3 oct4)
-      a28 = (b4 oct4)
-      a29 = (b5 oct4)
-      a30 = (b6 oct4)
-      a31 = (b7 oct4)
       oct1 = (octet1 addr)
       oct2 = (octet2 addr)
       oct3 = (octet3 addr)