Don't validate the CIDR strings; rather, check whether the type of the returned Cidrs...

diff --git a/src/Main.hs b/src/Main.hs
index a86eebf90081f0807a8628d35cff6c7a677d20c2..2fdcfd0459c1b2c88ecd2980e6de90a4a709cd95 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -3,8 +3,7 @@ import System.Exit (ExitCode(..), exitWith)
 import System.IO (stderr, hPutStrLn)
 
 import Cidr (Cidr(..),
-             cidr_from_string,
-             is_valid_cidr)
+             cidr_from_string)
 
 import CommandLine (help_set,
                     help_text,
@@ -81,18 +80,6 @@ numeric_range x y =
        upper = maximum [x,y]
 
 
--- Take a CIDR String, and exit with a failure if it's invalid.
-validate_or_die :: String -> IO ()
-validate_or_die cidr = do
-  if (Cidr.is_valid_cidr cidr)
-    then do
-      return ()
-    else do
-        putStrLn "Error: not valid CIDR notation."
-        exitWith (ExitFailure exit_invalid_cidr)
-
-
-
 main :: IO ()
 main = do
   -- First, check for any errors that occurred while parsing
@@ -119,9 +106,14 @@ main = do
   input <- inputfunc
 
   let cidr_strings = lines input
-  mapM validate_or_die cidr_strings
   let cidrs = map Cidr.cidr_from_string cidr_strings
 
+  if (any (== Cidr.None) cidrs)
+    then do
+      putStrLn "Error: not valid CIDR notation."
+      exitWith (ExitFailure exit_invalid_cidr)
+    else do -- Nothing
+
   -- Get the mode of operation.
   mode <- CommandLine.parse_mode