Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline On branch : master
http://hackage.haskell.org/trac/ghc/changeset/dee8c7f4c212ba529d8de4f0d7be849b2e7398d5 >--------------------------------------------------------------- commit dee8c7f4c212ba529d8de4f0d7be849b2e7398d5 Author: Judah Jacobson <[email protected]> Date: Fri Mar 23 17:36:38 2012 +0000 Remove the Encoding module. This change is in preparation for using ghc>=7.4's encodings. >--------------------------------------------------------------- System/Console/Haskeline/Backend/Posix.hsc | 2 - System/Console/Haskeline/Backend/Win32.hsc | 2 - System/Console/Haskeline/Encoding.hs | 40 ---------------------------- System/Console/Haskeline/Term.hs | 2 - haskeline.cabal | 1 - 5 files changed, 0 insertions(+), 47 deletions(-) diff --git a/System/Console/Haskeline/Backend/Posix.hsc b/System/Console/Haskeline/Backend/Posix.hsc index 27e24cc..9a18f6b 100644 --- a/System/Console/Haskeline/Backend/Posix.hsc +++ b/System/Console/Haskeline/Backend/Posix.hsc @@ -335,8 +335,6 @@ fileRunTerm h_in = do decoder' <- openPartialDecoder codeset return RunTerm {putStrOut = encoder >=> putTerm h_out, closeTerm = setLocale oldLocale >> return (), - encodeForTerm = encoder, - decodeForTerm = decoder, termOps = Right FileOps { inputHandle = h_in, getLocaleChar = getMultiByteChar h_in decoder', diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc index 445177f..dc003d8 100644 --- a/System/Console/Haskeline/Backend/Win32.hsc +++ b/System/Console/Haskeline/Backend/Win32.hsc @@ -379,8 +379,6 @@ fileRunTerm h_in = do return RunTerm { closeTerm = return (), putStrOut = putter, - encodeForTerm = unicodeToCodePage cp, - decodeForTerm = codePageToUnicode cp, termOps = Right FileOps { inputHandle = h_in, getLocaleChar = getMultiByteChar cp h_in, diff --git a/System/Console/Haskeline/Encoding.hs b/System/Console/Haskeline/Encoding.hs deleted file mode 100644 index c0a3e1c..0000000 --- a/System/Console/Haskeline/Encoding.hs +++ /dev/null @@ -1,40 +0,0 @@ -{- | - -This module exposes the console Unicode API which is used by the functions -in "System.Console.Haskeline". On POSIX systems, it uses @iconv@ plus the -console\'s locale; on Windows it uses the console's current code page. - -Characters or bytes which cannot be encoded/decoded (for example, not belonging -to the output range) will be ignored. --} - -module System.Console.Haskeline.Encoding ( - encode, - decode, - getEncoder, - getDecoder - ) where - -import System.Console.Haskeline.InputT -import System.Console.Haskeline.Term -import System.Console.Haskeline.Monads -import Data.ByteString (ByteString) - --- | Encode a Unicode 'String' into a 'ByteString' suitable for the current --- console. -encode :: MonadIO m => String -> InputT m ByteString -encode str = do - encoder <- asks encodeForTerm - liftIO $ encoder str - --- | Convert a 'ByteString' from the console's encoding into a Unicode 'String'. -decode :: MonadIO m => ByteString -> InputT m String -decode str = do - decoder <- asks decodeForTerm - liftIO $ decoder str - -getEncoder :: Monad m => InputT m (String -> IO ByteString) -getEncoder = asks encodeForTerm - -getDecoder :: Monad m => InputT m (ByteString -> IO String) -getDecoder = asks decodeForTerm diff --git a/System/Console/Haskeline/Term.hs b/System/Console/Haskeline/Term.hs index 9921651..d36079e 100644 --- a/System/Console/Haskeline/Term.hs +++ b/System/Console/Haskeline/Term.hs @@ -31,8 +31,6 @@ clearLine = flip drawLineDiff ([],[]) data RunTerm = RunTerm { -- | Write unicode characters to stdout. putStrOut :: String -> IO (), - encodeForTerm :: String -> IO ByteString, - decodeForTerm :: ByteString -> IO String, termOps :: Either TermOps FileOps, closeTerm :: IO () } diff --git a/haskeline.cabal b/haskeline.cabal index dd10632..244bef9 100644 --- a/haskeline.cabal +++ b/haskeline.cabal @@ -65,7 +65,6 @@ Library Exposed-Modules: System.Console.Haskeline System.Console.Haskeline.Completion - System.Console.Haskeline.Encoding System.Console.Haskeline.MonadException System.Console.Haskeline.History System.Console.Haskeline.IO _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
