git.iko.soy/vty
on master help sign in
Start the upgrade to parallel 2 and deepseq
8c26125coreyoconnor
src/Data/Terminfo/Eval.hs+2−1
compare with master
unifiedsplit
@@ -19,6 +19,7 @@ module Data.Terminfo.Eval ( cap_expression_required_bytes
19import Data.Marshalling
19import Data.Marshalling
20import Data.Terminfo.Parse
20import Data.Terminfo.Parse
21
21
22+import Control.DeepSeq
22import Control.Monad.Identity
23import Control.Monad.Identity
23import Control.Monad.Reader
24import Control.Monad.Reader
24import Control.Monad.State.Strict
25import Control.Monad.State.Strict
@@ -154,7 +155,7 @@ serialize_cap_expression :: MonadIO m => CapExpression -> [CapParam] -> OutputBu
154serialize_cap_expression cap params out_ptr = do
155serialize_cap_expression cap params out_ptr = do
155 let params' = apply_param_ops cap params
156 let params' = apply_param_ops cap params
156 (!out_ptr', _) <- runStateT (runReaderT (serialize_cap_ops out_ptr (cap_ops cap)) (cap, params')) []
157 (!out_ptr', _) <- runStateT (runReaderT (serialize_cap_ops out_ptr (cap_ops cap)) (cap, params')) []
157− return out_ptr'
158+ return $! out_ptr'
158
159
159serialize_cap_ops :: MonadIO m => OutputBuffer -> CapOps -> EvalT m OutputBuffer
160serialize_cap_ops :: MonadIO m => OutputBuffer -> CapOps -> EvalT m OutputBuffer
160serialize_cap_ops out_ptr ops = foldM serialize_cap_op out_ptr ops
161serialize_cap_ops out_ptr ops = foldM serialize_cap_op out_ptr ops
test/Makefile+1−1
@@ -26,7 +26,7 @@ $(VERIF_TESTS)
26$(shell mkdir -p objects )
26$(shell mkdir -p objects )
27
27
28# TODO: Tests should also be buildable referencing the currently installed vty
28# TODO: Tests should also be buildable referencing the currently installed vty
29−GHC_ARGS=--make -i../src -package parallel-1.1.0.1 -hide-package transformers -hide-package monads-fd -hide-package monads-tf -package QuickCheck-2.1.0.2 -ignore-package vty ../cbits/gwinsz.c ../cbits/set_term_timing.c ../cbits/mk_wcwidth.c -O -funbox-strict-fields -Wall -threaded -fno-full-laziness -fspec-constr -odir objects -hidir objects
29+GHC_ARGS=--make -i../src -package parallel -package deepseq-1.1.0.0 -hide-package transformers -hide-package monads-fd -hide-package monads-tf -package QuickCheck-2.1.0.2 -ignore-package vty ../cbits/gwinsz.c ../cbits/set_term_timing.c ../cbits/mk_wcwidth.c -O -funbox-strict-fields -Wall -threaded -fno-full-laziness -fspec-constr -odir objects -hidir objects
30
30
31GHC_PROF_ARGS=-prof -auto-all $(GHC_ARGS)
31GHC_PROF_ARGS=-prof -auto-all $(GHC_ARGS)
32
32
vty.cabal+1−1
@@ -30,7 +30,7 @@ Build-Depends: base >= 4 && < 5, bytestring, containers, unix
30Build-Depends: terminfo >= 0.3 && < 0.4
30Build-Depends: terminfo >= 0.3 && < 0.4
31Build-Depends: utf8-string >= 0.3 && < 0.4
31Build-Depends: utf8-string >= 0.3 && < 0.4
32Build-Depends: mtl >= 1.1.0.0 && < 1.2
32Build-Depends: mtl >= 1.1.0.0 && < 1.2
33−Build-Depends: ghc-prim, parallel < 2
33+Build-Depends: ghc-prim, parallel >= 2.2 && < 2.3, deepseq >= 1.1 && < 1.2
34Build-Depends: array
34Build-Depends: array
35Build-Depends: parsec >= 2 && < 4
35Build-Depends: parsec >= 2 && < 4
36Build-Depends: vector-space >= 0.5 && < 0.6
36Build-Depends: vector-space >= 0.5 && < 0.6