X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=src%2FMain.hs;h=7b3bd7b0884847a456545903594130e9a8504539;hp=7686ae30fb989e0cd3ee51d2dca2ac9e6980629b;hb=706e492881f05238ace00fefc6ec9cb0000ea2e9;hpb=64dfebebdecd1119ab8345a6de34597f6a878a98

diff --git a/src/Main.hs b/src/Main.hs
index 7686ae3..7b3bd7b 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,10 +2,9 @@ import Data.List (intercalate, intersperse)
 import System.Exit (ExitCode(..), exitWith)
 import System.IO (stderr, hPutStrLn)
 
-import Text.Regex.Posix
-
 import Cidr (Cidr,
              from_string,
+             is_valid_cidr,
              min_first_octet,
              min_second_octet,
              min_third_octet,
@@ -70,11 +69,6 @@ cidr_to_regex cidr =
       max4   = max_fourth_octet cidr
 
 
--- Will return True if the passed String is in CIDR notation, False
--- otherwise.
-is_valid_cidr :: String -> Bool
-is_valid_cidr cidr = cidr =~ "([0-9]{1,3}\\.){3}[0-9]{1,3}/[0-9]{1,2}"
-
 
 -- Take a list of Strings, and return a regular expression matching
 -- any of them.
@@ -95,7 +89,7 @@ numeric_range 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 (is_valid_cidr cidr)
+  if (Cidr.is_valid_cidr cidr)
     then do
       return ()
     else do