X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIPv4Address.hs;h=80a499ec88f66e1907471ea7e0fb2af10ac9d5c3;hb=8a3ca8823d4e8b8adbf3060ec056aafaf9813ded;hp=fca1d0fe006cc33c659f4e883bfda3897f83f4d2;hpb=13b975060857b8acd64b7231074dc4a0c0a2915a;p=hath.git diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs index fca1d0f..80a499e 100644 --- a/src/IPv4Address.hs +++ b/src/IPv4Address.hs @@ -9,22 +9,28 @@ where import Test.Tasty ( TestTree, testGroup ) import Test.Tasty.HUnit ( (@?=), testCase ) import Test.Tasty.QuickCheck ( - Arbitrary(..), + Arbitrary( arbitrary ), Gen, Property, (==>), testProperty ) -import Maskable (Maskable(..)) -import Maskbits (Maskbits(..)) -import Octet (Octet(..)) +import Maskable ( Maskable( apply_mask) ) +import Maskbits ( + Maskbits( + Zero, One, Two, Three, Four, Five, Six, Seven, Eight, + Nine, Ten, Eleven, Twelve, Thirteen, Fourteen, Fifteen, Sixteen, + Seventeen, Eighteen, Nineteen, Twenty, TwentyOne, TwentyTwo, TwentyThree, + TwentyFour, TwentyFive, TwentySix, TwentySeven, TwentyEight, TwentyNine, + Thirty, ThirtyOne, ThirtyTwo ) ) +import Octet ( Octet( b1, b2, b3, b4, b5, b6, b7, b8) ) data IPv4Address = IPv4Address { octet1 :: Octet, octet2 :: Octet, octet3 :: Octet, octet4 :: Octet } - deriving (Eq) + deriving (Eq, Ord) instance Show IPv4Address where