Simplify Read instance code.

diff --git a/src/Cidr.hs b/src/Cidr.hs
index dc2b556361f759904c453d5896390f292df72d71..368cf765e380219a1a4cc89354ddd8e9936335e1 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -85,7 +85,7 @@ octets_from_cidr_string s =
 
 instance Read Cidr where
   -- | Parse everything or nothing.
-  readsPrec _ = \s ->
+  readsPrec _ s =
     case (octets_from_cidr_string s) of
       [oct1, oct2, oct3, oct4] ->
         case (maskbits_from_cidr_string s) of

diff --git a/src/Maskbits.hs b/src/Maskbits.hs
index 51701f562276ece9cc216a0d9cb649624ff7fe1c..5eb7649972a29b18e760c693351258a7bed8330b 100644 (file)
--- a/src/Maskbits.hs
+++ b/src/Maskbits.hs
@@ -118,12 +118,12 @@ instance Arbitrary Maskbits where
 
 
 instance Read Maskbits where
-  readsPrec _ = \s ->
+  readsPrec _ s =
     case (reads s :: [(Int, String)]) of
       []              -> []
       (x,leftover):_  -> go x leftover
     where
       go :: Int -> String -> [(Maskbits, String)]
-      go y s
-        | y < minBound || y > maxBound = []
-        | otherwise = [(toEnum y, s)]
+      go x' leftover'
+        | x' < minBound || x' > maxBound = []
+        | otherwise = [(toEnum x', leftover')]

diff --git a/src/Octet.hs b/src/Octet.hs
index c472f8da6e8c85552c32256f5409e0daeb86c5b8..6d6c8c85f79265ab95eb6013082a8ef61c4af5ee 100644 (file)
--- a/src/Octet.hs
+++ b/src/Octet.hs
@@ -136,15 +136,15 @@ instance Enum Octet where
 
 
 instance Read Octet where
-  readsPrec _ = \s ->
+  readsPrec _ s =
     case (reads s :: [(Int, String)]) of
       []              -> []
       (x,leftover):_  -> go x leftover
     where
       go :: Int -> String -> [(Octet, String)]
-      go y s
-        | y < minBound || y > maxBound = []
-        | otherwise = [(toEnum y, s)]
+      go x' leftover'
+        | x' < minBound || x' > maxBound = []
+        | otherwise = [(toEnum x', leftover')]
 
 
 -- Test lists.