X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIPv4Address.hs;h=e72dd592ee1c2f1ad8a3fe5dad6fe26fc43701b1;hb=9200fe5fcab505e5a331514a6ee687c6f78011b1;hp=6d1e56ec38becf939b0ceede6c0262fb0a2beee6;hpb=4b16a47bd77a82d63072497514476faeba6b8e83;p=hath.git diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs index 6d1e56e..e72dd59 100644 --- a/src/IPv4Address.hs +++ b/src/IPv4Address.hs @@ -46,8 +46,6 @@ instance Arbitrary IPv4Address where oct4 <- arbitrary :: Gen Octet return (IPv4Address oct1 oct2 oct3 oct4) - coarbitrary _ = variant 0 - instance Maskable IPv4Address where @@ -61,46 +59,79 @@ instance Maskable IPv4Address where | mask == TwentySeven = addr { octet4 = (apply_mask oct4 Three bit) } | mask == TwentySix = addr { octet4 = (apply_mask oct4 Two bit) } | mask == TwentyFive = addr { octet4 = (apply_mask oct4 One bit) } - | mask == TwentyFour = addr { octet4 = min_octet } + | mask == TwentyFour = addr { octet4 = (apply_mask oct4 Zero bit) } | mask == TwentyThree = addr { octet3 = (apply_mask oct3 Seven bit), - octet4 = min_octet } + octet4 = (apply_mask oct4 Zero bit) } | mask == TwentyTwo = addr { octet3 = (apply_mask oct3 Six bit), - octet4 = min_octet } + octet4 = (apply_mask oct4 Zero bit) } | mask == TwentyOne = addr { octet3 = (apply_mask oct3 Five bit), - octet4 = min_octet } + octet4 = (apply_mask oct4 Zero bit) } | mask == Twenty = addr { octet3 = (apply_mask oct3 Four bit), - octet4 = min_octet } + octet4 = (apply_mask oct4 Zero bit) } | mask == Nineteen = addr { octet3 = (apply_mask oct3 Three bit), - octet4 = min_octet } + octet4 = (apply_mask oct4 Zero bit) } | mask == Eighteen = addr { octet3 = (apply_mask oct3 Two bit), - octet4 = min_octet } + octet4 = (apply_mask oct4 Zero bit) } | mask == Seventeen = addr { octet3 = (apply_mask oct3 One bit), - octet4 = min_octet } - | mask == Sixteen = addr { octet3 = min_octet, - octet4 = min_octet } - | mask == Fifteen = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 Seven bit) } - | mask == Fourteen = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 Six bit) } - | mask == Thirteen = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 Five bit) } - | mask == Twelve = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 Four bit) } - | mask == Eleven = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 Three bit) } - | mask == Ten = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 Two bit) } - | mask == Nine = min_address { octet1 = oct1, - octet2 = (apply_mask oct2 One bit) } - | mask == Eight = min_address { octet1 = oct1 } - | mask == Seven = min_address { octet1 = (apply_mask oct1 Seven bit) } - | mask == Six = min_address { octet1 = (apply_mask oct1 Six bit) } - | mask == Five = min_address { octet1 = (apply_mask oct1 Five bit) } - | mask == Four = min_address { octet1 = (apply_mask oct1 Four bit) } - | mask == Three = min_address { octet1 = (apply_mask oct1 Three bit) } - | mask == Two = min_address { octet1 = (apply_mask oct1 Two bit) } - | mask == One = min_address { octet1 = (apply_mask oct1 One bit) } - | mask == Zero = min_address + octet4 = (apply_mask oct4 Zero bit) } + | mask == Sixteen = addr { octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit) } + | mask == Fifteen = addr { octet2 = (apply_mask oct2 Seven bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit) } + | mask == Fourteen = addr { octet2 = (apply_mask oct2 Six bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Thirteen = addr { octet2 = (apply_mask oct2 Five bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Twelve = addr { octet2 = (apply_mask oct2 Four bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Eleven = addr { octet2 = (apply_mask oct2 Three bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Ten = addr { octet2 = (apply_mask oct2 Two bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Nine = addr { octet2 = (apply_mask oct2 One bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Eight = addr { octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Seven = addr { octet1 = (apply_mask oct1 Seven bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Six = addr { octet1 = (apply_mask oct1 Six bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Five = addr { octet1 = (apply_mask oct1 Five bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Four = addr { octet1 = (apply_mask oct1 Four bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Three = addr { octet1 = (apply_mask oct1 Three bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Two = addr { octet1 = (apply_mask oct1 Two bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == One = addr { octet1 = (apply_mask oct1 One bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} + | mask == Zero = addr { octet1 = (apply_mask oct1 Zero bit), + octet2 = (apply_mask oct2 Zero bit), + octet3 = (apply_mask oct3 Zero bit), + octet4 = (apply_mask oct4 Zero bit)} | otherwise = IPv4Address.None where oct1 = (octet1 addr)