on master help sign in
start removing informal Writer structure and replace with Blaze.Builders Writer
76d91e3Corey O'Connor
src/Data/Marshalling.hsdeleted−30
@@ -1,30 +0,0 @@
1−{-# LANGUAGE BangPatterns #-}
2−-- Copyright 2009 Corey O'Connor
3−module Data.Marshalling ( module Data.Marshalling
4− , module Data.Word
5− , module Foreign.Ptr
6− , module Foreign.ForeignPtr
7− , module Foreign.Marshal
8− , module Foreign.Storable
9− )
10− where
11−
12−import Control.Monad.Trans
13−
14−import Data.Word
15−
16−import Foreign.Ptr
17−import Foreign.ForeignPtr
18−import Foreign.Marshal
19−import Foreign.Storable
20−
21−type OutputBuffer = Ptr Word8
22−
23−string_to_bytes :: String -> [Word8]
24−string_to_bytes str = map (toEnum . fromEnum) str
25−
26−serialize_bytes :: MonadIO m => [Word8] -> OutputBuffer -> m OutputBuffer
27−serialize_bytes bytes !out_ptr = do
28− liftIO $! pokeArray out_ptr bytes
29− return $! out_ptr `plusPtr` ( length bytes )
30−
src/Data/Terminfo/Eval.hs−1
@@ -15,7 +15,6 @@ module Data.Terminfo.Eval ( cap_expression_required_bytes
15 where
15 where
16
16
17import Data.ByteString.Internal ( memcpy )
17import Data.ByteString.Internal ( memcpy )
18−import Data.Marshalling
19import Data.Terminfo.Parse
18import Data.Terminfo.Parse
20
19
21import Control.Monad.Identity
20import Control.Monad.Identity
src/Graphics/Vty/Input/Internal.hs+2−6
@@ -12,8 +12,7 @@ import Codec.Binary.UTF8.Generic (decode)
12import Control.Applicative
12import Control.Applicative
13import Control.Concurrent
13import Control.Concurrent
14import Control.Lens
14import Control.Lens
15−import Control.Exception (try, IOException)
16−import Control.Monad (when, void, mzero, forM_)
15+import Control.Monad (when, mzero, forM_)
17import Control.Monad.IO.Class (liftIO)
16import Control.Monad.IO.Class (liftIO)
18import Control.Monad.Trans.State (StateT(..), evalStateT)
17import Control.Monad.Trans.State (StateT(..), evalStateT)
19import Control.Monad.Trans.Reader (ReaderT(..))
18import Control.Monad.Trans.Reader (ReaderT(..))
@@ -30,10 +29,7 @@ import Data.Word
30import Foreign ( allocaArray, peekArray, Ptr )
29import Foreign ( allocaArray, peekArray, Ptr )
31import Foreign.C.Types (CInt(..))
30import Foreign.C.Types (CInt(..))
32
31
33−import System.Posix.IO ( fdReadBuf
32+import System.Posix.IO (fdReadBuf)
34− , setFdOption
35− , FdOption(..)
36− )
37import System.Posix.Types (Fd(..))
33import System.Posix.Types (Fd(..))
38
34
39data Config = Config
35data Config = Config
src/Graphics/Vty/Output/Interface.hs−2
@@ -12,8 +12,6 @@ module Graphics.Vty.Output.Interface ( module Graphics.Vty.Output.Interface
12
12
13import Graphics.Vty.Prelude
13import Graphics.Vty.Prelude
14
14
15−import Data.Marshalling
16−
17import Graphics.Vty.Picture
15import Graphics.Vty.Picture
18import Graphics.Vty.PictureToSpans
16import Graphics.Vty.PictureToSpans
19import Graphics.Vty.Span
17import Graphics.Vty.Span
vty.cabal+1−1
@@ -39,6 +39,7 @@ tested-with: GHC >= 7.6.2
39library
39library
40 default-language: Haskell2010
40 default-language: Haskell2010
41 build-depends: base >= 4 && < 5,
41 build-depends: base >= 4 && < 5,
42+ blaze-builder >= 0.3.3.2 && < 0.4,
42 bytestring,
43 bytestring,
43 containers,
44 containers,
44 data-default >= 0.5.3,
45 data-default >= 0.5.3,
@@ -73,7 +74,6 @@ library
73 Codec.Binary.UTF8.Debug
74 Codec.Binary.UTF8.Debug
74 Data.Terminfo.Parse
75 Data.Terminfo.Parse
75 Data.Terminfo.Eval
76 Data.Terminfo.Eval
76− Data.Marshalling
77 Graphics.Vty.Debug
77 Graphics.Vty.Debug
78 Graphics.Vty.DisplayAttributes
78 Graphics.Vty.DisplayAttributes
79 Graphics.Vty.Image.Internal
79 Graphics.Vty.Image.Internal