@@ -70,13 +70,13 @@ import Control.Concurrent.MVar ( MVar
7070 , withMVar
7171 )
7272import Control.Category ((>>>))
73−import Control.Applicative ((<*>), (*>), (<$>))
73+import Control.Applicative ((<$>))
7474import Control.Monad (forM, forM_, void, when, unless)
7575import Control.Exception (IOException, SomeException, handle, throw, try, bracketOnError)
7676import Data.IORef (IORef, newIORef, writeIORef, readIORef)
7777import Data.ByteString (ByteString)
7878import qualified Data.ByteString as BS (concat)
79−import qualified Data.ByteString.Char8 as BSC (pack, unpack)
79+import qualified Data.ByteString.Char8 as BSC (pack, unpack, split)
8080import Data.Int (Int32)
8181import Data.IntMap (IntMap)
8282import qualified Data.IntMap as IntMap (empty)
@@ -85,7 +85,6 @@ import qualified Data.IntSet as IntSet (empty, insert, elems, singleton, null, d
8585import Data.Map (Map)
8686import qualified Data.Map as Map (empty, elems, size)
8787import Data.Lens.Lazy (Lens, lens, intMapLens, mapLens, (^.), (^=), (^+=), (^%=))
88−import Text.Regex.Applicative (RE, few, anySym, sym, many, match)
8988import System.IO (hPutStrLn, stderr)
9089
9190-- $design
@@ -733,12 +732,14 @@ encodeEndPointAddress host port ix = EndPointAddress . BSC.pack $
733732 host ++ ":" ++ port ++ ":" ++ show ix
734733
735734-- | Decode end point address
736−-- TODO: This uses regular expression parsing, which is nice, but unnecessary
737735decodeEndPointAddress :: EndPointAddress -> Maybe (N.HostName, N.ServiceName, EndPointId)
738−decodeEndPointAddress (EndPointAddress bs) = match endPointAddressRE (BSC.unpack bs)
739− where
740− endPointAddressRE :: RE Char (N.HostName, N.ServiceName, EndPointId)
741− endPointAddressRE = (,,) <$> few anySym <*> (sym ':' *> few anySym) <*> (sym ':' *> (read <$> many anySym))
736+decodeEndPointAddress (EndPointAddress bs) = case map BSC.unpack $ BSC.split ':' bs of
737+ [host, port, endPointIdStr] ->
738+ case reads endPointIdStr of
739+ [(endPointId, "")] -> Just (host, port, endPointId)
740+ _ -> Nothing
741+ _ ->
742+ Nothing
742743
743744-- | Do a (blocking) remote request
744745--