X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=174efe28258e608ac48c488ae8225522699b7057;hb=e47e94c4121f7b1669df1a97fbaf8e8c434c256d;hp=26d54d143ab9cd82672198e358b2ec4501860fb5;hpb=9dcb70651417b7e91ccea3186b409befac2e6f71;p=hath.git diff --git a/src/Main.hs b/src/Main.hs index 26d54d1..174efe2 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -4,7 +4,6 @@ where import Control.Monad (when) import Data.List ((\\), intercalate) import Data.Maybe (catMaybes, isNothing) -import Data.String.Utils (splitWs) import System.Exit (ExitCode( ExitFailure ), exitWith) import System.IO (stderr, hPutStrLn) import Text.Read (readMaybe) @@ -21,7 +20,9 @@ import Cidr ( min_octet2, min_octet3, min_octet4 ) -import CommandLine (Args(..), get_args) +import CommandLine( + Args( Regexed, Reduced, Duped, Diffed, Listed, barriers ), + get_args ) import ExitCodes ( exit_invalid_cidr ) import Octet () @@ -101,7 +102,7 @@ main = do -- This reads stdin. input <- getContents - let cidr_strings = splitWs input + let cidr_strings = words input let cidrs = map readMaybe cidr_strings :: [Maybe Cidr] when (any isNothing cidrs) $ do