76d91e3 · vty · git.iko.soy

git.iko.soy/vty

start removing informal Writer structure and replace with Blaze.Builders Writer

commit76d91e3ac22fd8dee7c0ae848139f42f6a4f9c4c authorCorey O'Connor <coreyoconnor@gmail.com> dateSun 26 Jan 2014, 14:58 (13 years ago) parentb34a7f0

5 files changed+3−40

compare with master

unifiedsplit

src/Data/Marshalling.hs−30 src/Data/Terminfo/Eval.hs−1 src/Graphics/Vty/Input/Internal.hs+2−6 src/Graphics/Vty/Output/Interface.hs−2 vty.cabal+1−1

src/Data/Marshalling.hsdeleted−30

@@ -1,30 +0,0 @@

1−{-# LANGUAGE BangPatterns #-}

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

1515 where

1616

1717import Data.ByteString.Internal ( memcpy )

18−import Data.Marshalling

1918import Data.Terminfo.Parse

2019

2120import Control.Monad.Identity

src/Graphics/Vty/Input/Internal.hs+2−6

@@ -12,8 +12,7 @@ import Codec.Binary.UTF8.Generic (decode)

1212import Control.Applicative

1313import Control.Concurrent

1414import Control.Lens

15−import Control.Exception (try, IOException)

16−import Control.Monad (when, void, mzero, forM_)

15+import Control.Monad (when, mzero, forM_)

1716import Control.Monad.IO.Class (liftIO)

1817import Control.Monad.Trans.State (StateT(..), evalStateT)

1918import Control.Monad.Trans.Reader (ReaderT(..))

@@ -30,10 +29,7 @@ import Data.Word

3029import Foreign ( allocaArray, peekArray, Ptr )

3130import Foreign.C.Types (CInt(..))

3231

33−import System.Posix.IO ( fdReadBuf

34− , setFdOption

35− , FdOption(..)

36− )

32+import System.Posix.IO (fdReadBuf)

3733import System.Posix.Types (Fd(..))

3834

3935data Config = Config

src/Graphics/Vty/Output/Interface.hs−2

@@ -12,8 +12,6 @@ module Graphics.Vty.Output.Interface ( module Graphics.Vty.Output.Interface

1212

1313import Graphics.Vty.Prelude

1414

15−import Data.Marshalling

16−

1715import Graphics.Vty.Picture

1816import Graphics.Vty.PictureToSpans

1917import Graphics.Vty.Span

vty.cabal+1−1

@@ -39,6 +39,7 @@ tested-with: GHC >= 7.6.2

3939library

4040 default-language: Haskell2010

4141 build-depends: base >= 4 && < 5,

42+ blaze-builder >= 0.3.3.2 && < 0.4,

4243 bytestring,

4344 containers,

4445 data-default >= 0.5.3,

@@ -73,7 +74,6 @@ library

7374 Codec.Binary.UTF8.Debug

7475 Data.Terminfo.Parse

7576 Data.Terminfo.Eval

76− Data.Marshalling

7777 Graphics.Vty.Debug

7878 Graphics.Vty.DisplayAttributes

7979 Graphics.Vty.Image.Internal