Drop definitions along with deprecations.

This commit is contained in:
Kei Hibino 2016-02-20 14:48:47 +09:00
parent 935d2d3dfb
commit f05bc0ad0f
2 changed files with 2 additions and 21 deletions

View File

@ -6,8 +6,6 @@ module Database.PostgreSQL.Parser
, netAddress
, v4HostAddress, decMask4
, v6HostAddress, decMask6
, hostAddress
) where
import Control.Applicative ((<$>), pure, (<*>), (<*), (*>), (<|>), many, some, optional)
@ -19,7 +17,7 @@ import Numeric (readDec, readHex)
import Text.Parser.List (runParser, evalParser, eof, noteP, satisfy', satisfy)
import qualified Text.Parser.List as P
import Data.PostgreSQL.NetworkAddress (NetAddress (..), HostAddress, V4HostAddress, V6HostAddress)
import Data.PostgreSQL.NetworkAddress (NetAddress (..), V4HostAddress, V6HostAddress)
import qualified Data.PostgreSQL.NetworkAddress as D
@ -74,9 +72,6 @@ slash = char '/'
v4HostAddress :: Parser V4HostAddress
v4HostAddress = D.V4HostAddress <$> decW8 <* dot <*> decW8 <* dot <*> decW8 <* dot <*> decW8
hostAddress :: Parser HostAddress
hostAddress = D.hostAddress <$> decW8 <* dot <*> decW8 <* dot <*> decW8 <* dot <*> decW8
_exampleHostAddress :: [Either String V4HostAddress]
_exampleHostAddress =
[ evalParser (v4HostAddress <* eof) s

View File

@ -4,8 +4,6 @@ module Database.PostgreSQL.Printer
, v4HostAddress
, v6HostAddress
, netAddress
, hostAddress
) where
import Numeric (showInt, showHex)
@ -13,8 +11,7 @@ import Numeric (showInt, showHex)
import Text.Printer.List (token, list, execPrinter)
import qualified Text.Printer.List as P
import Data.PostgreSQL.NetworkAddress
(HostAddress, hostAddressOctets,
V4HostAddress, v4HostAddressOctets, V6HostAddress, v6HostAddressWords, NetAddress (..))
(V4HostAddress, v4HostAddressOctets, V6HostAddress, v6HostAddressWords, NetAddress (..))
type Printer a = P.Printer Char a
@ -50,17 +47,6 @@ v4HostAddress ha = do
dot
dec d
hostAddress :: Printer HostAddress
hostAddress ha = do
let (a, b, c, d) = hostAddressOctets ha
dec a
dot
dec b
dot
dec c
dot
dec d
v6HostAddress :: Printer V6HostAddress
v6HostAddress ha = do
let (a, b, c, d, e, f, g, h) = v6HostAddressWords ha