git.iko.soy/typeable/attoparsec
on master help sign in
Simplify Michel's code into working shape
commitf7b9b27c981acbe7b391c89b45bae3610740698e authorBryan O'Sullivan <bos@serpentine.com> dateSat 28 Mar 2015, 10:09 (12 years ago) parent2543085
3 files changed+7−11
attoparsec.cabal+3 tests/QC/IPv6/Internal.hs+3−10 tests/QC/IPv6/Types.hs+1−1
attoparsec.cabal+3
@@ -29,6 +29,7 @@ extra-source-files:
2929 examples/Makefile
3030 tests/*.hs
3131 tests/QC/*.hs
32+ tests/QC/IPv6/*.hs
3233
3334Flag developer
3435 Description: Whether to build the library in development mode
@@ -82,6 +83,8 @@ test-suite tests
8283 QC.ByteString
8384 QC.Combinator
8485 QC.Common
86+ QC.IPv6.Internal
87+ QC.IPv6.Types
8588 QC.Rechunked
8689 QC.Simple
8790 QC.Text
tests/QC/IPv6/Internal.hs+3−10
@@ -13,7 +13,7 @@
1313
1414{-# LANGUAGE OverloadedStrings #-}
1515
16−module Text.IPv6Addr.Internal
16+module QC.IPv6.Internal
1717 ( expandTokens
1818 , macAddr
1919 , maybeIPv6AddrTokens
@@ -26,7 +26,6 @@ module Text.IPv6Addr.Internal
2626 , fromDoubleColon
2727 , fromIPv6Addr
2828 , toDoubleColon
29− , networkInterfacesIPv6AddrList
3029 ) where
3130
3231import Control.Monad (replicateM)
@@ -35,13 +34,13 @@ import Data.Char (isDigit,isHexDigit,toLower)
3534import Data.Monoid ((<>))
3635import Control.Applicative ((<|>),(<*))
3736import Data.List (group,isSuffixOf,elemIndex,elemIndices,intersperse)
37+import Data.Word (Word32)
3838import Numeric (showHex)
3939import qualified Data.Text as T
4040import qualified Data.Text.Read as R (decimal)
4141import Data.Maybe (fromJust)
42−import Network.Info
4342
44−import Text.IPv6Addr.Types
43+import QC.IPv6.Types
4544
4645tok0 = "0"
4746
@@ -250,12 +249,6 @@ toDoubleColon tks =
250249ipv6TokensToIPv6Addr :: [IPv6AddrToken] -> Maybe IPv6Addr
251250ipv6TokensToIPv6Addr l = Just $ IPv6Addr $ ipv6TokensToText l
252251
253−networkInterfacesIPv6AddrList :: IO [(String,IPv6)]
254−networkInterfacesIPv6AddrList =
255− getNetworkInterfaces >>= \n -> return $ map networkInterfacesIPv6Addr n
256− where
257− networkInterfacesIPv6Addr (NetworkInterface n _ a _) = (n,a)
258−
259252fullSixteenBit :: T.Text -> Maybe IPv6AddrToken
260253fullSixteenBit t =
261254 case parse ipv6AddrFullChunk t of
tests/QC/IPv6/Types.hs+1−1
@@ -11,7 +11,7 @@
1111
1212-- -----------------------------------------------------------------------------
1313
14−module Text.IPv6Addr.Types where
14+module QC.IPv6.Types where
1515
1616import qualified Data.Text as T
1717