X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=b2fc64b5eb71a441226f7772b2ed8e591afb9ca3;hb=e8b41784eaa68049f7a7354916c9c9920050db70;hp=a86eebf90081f0807a8628d35cff6c7a677d20c2;hpb=6c076a2622dd9a6bfc96ed05f8478b5150db176a;p=hath.git

diff --git a/src/Main.hs b/src/Main.hs
index a86eebf..b2fc64b 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,10 +1,19 @@
-import Data.List (intercalate, intersperse)
+import Data.List ((\\), intercalate, intersperse)
+import Data.Maybe (catMaybes, isNothing)
 import System.Exit (ExitCode(..), exitWith)
 import System.IO (stderr, hPutStrLn)
 
 import Cidr (Cidr(..),
              cidr_from_string,
-             is_valid_cidr)
+             combine_all,
+             max_octet1,
+             max_octet2,
+             max_octet3,
+             max_octet4,
+             min_octet1,
+             min_octet2,
+             min_octet3,
+             min_octet4 )
 
 import CommandLine (help_set,
                     help_text,
@@ -13,7 +22,6 @@ import CommandLine (help_set,
                     parse_errors,
                     parse_mode)
     
-import IPv4Address
 import Octet
     
 -- Some exit codes, used in the ExitFailure constructor.
@@ -54,14 +62,14 @@ cidr_to_regex cidr =
       range2 = numeric_range min2 max2
       range3 = numeric_range min3 max3
       range4 = numeric_range min4 max4
-      min1   = octet_to_int (min_octet1 (ipv4address cidr) (maskbits cidr))
-      min2   = octet_to_int (min_octet2 (ipv4address cidr) (maskbits cidr))
-      min3   = octet_to_int (min_octet3 (ipv4address cidr) (maskbits cidr))
-      min4   = octet_to_int (min_octet4 (ipv4address cidr) (maskbits cidr))
-      max1   = octet_to_int (max_octet1 (ipv4address cidr) (maskbits cidr))
-      max2   = octet_to_int (max_octet2 (ipv4address cidr) (maskbits cidr))
-      max3   = octet_to_int (max_octet3 (ipv4address cidr) (maskbits cidr))
-      max4   = octet_to_int (max_octet4 (ipv4address cidr) (maskbits cidr))
+      min1   = octet_to_int (min_octet1 cidr)
+      min2   = octet_to_int (min_octet2 cidr)
+      min3   = octet_to_int (min_octet3 cidr)
+      min4   = octet_to_int (min_octet4 cidr)
+      max1   = octet_to_int (max_octet1 cidr)
+      max2   = octet_to_int (max_octet2 cidr)
+      max3   = octet_to_int (max_octet3 cidr)
+      max4   = octet_to_int (max_octet4 cidr)
 
 
 
@@ -81,18 +89,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,15 +115,38 @@ main = do
   input <- inputfunc
 
   let cidr_strings = lines input
-  mapM validate_or_die cidr_strings
-  let cidrs = map Cidr.cidr_from_string cidr_strings
+  let cidrs = map cidr_from_string cidr_strings
+
+  if (any isNothing cidrs)
+    then do
+      putStrLn "Error: not valid CIDR notation."
+      exitWith (ExitFailure exit_invalid_cidr)
+    else do -- Nothing
+
+  -- Filter out only the valid ones.
+  let valid_cidrs = catMaybes cidrs
 
   -- Get the mode of operation.
   mode <- CommandLine.parse_mode
 
   case mode of
     Regex -> do
-        let regexes = map cidr_to_regex cidrs
-        putStrLn $ alternate regexes
+      let regexes = map cidr_to_regex valid_cidrs
+      putStrLn $ alternate regexes
     Reduce -> do
-        putStr input
+      _ <- mapM (putStrLn . show) (combine_all valid_cidrs)
+      return ()
+    Dupe -> do
+       _ <- mapM (putStrLn . show) dupes
+       return ()
+       where
+         dupes = valid_cidrs \\ (combine_all valid_cidrs)
+    Diff -> do
+       _ <- mapM putStrLn deletions
+       _ <- mapM putStrLn additions
+       return ()
+       where
+         dupes = valid_cidrs \\ (combine_all valid_cidrs)
+         deletions = map (\s -> "-" ++ (show s)) dupes
+         newcidrs = (combine_all valid_cidrs) \\ valid_cidrs
+         additions = map (\s -> "+" ++ (show s)) newcidrs