git.iko.soy/vty
on master help sign in
Start the upgrade to parallel 2 and deepseq

Ignore-this: 1220be5e82cc30f40e7be675b582bf04 darcs-hash:20100112235802-f0a0d-d9c0460c63b186bf555b4c80efab560098fdc5da.gz

commit8c261253d5153aaddf7bd56d8b3c91de3a42203a authorcoreyoconnor <coreyoconnor@gmail.com> dateTue 12 Jan 2010, 15:58 (17 years ago) parent4fb2e88
3 files changed+4−3
compare with master
unifiedsplit
src/Data/Terminfo/Eval.hs+2−1 test/Makefile+1−1 vty.cabal+1−1
src/Data/Terminfo/Eval.hs+2−1
@@ -19,6 +19,7 @@ module Data.Terminfo.Eval ( cap_expression_required_bytes
1919import Data.Marshalling
2020import Data.Terminfo.Parse
2121
22+import Control.DeepSeq
2223import Control.Monad.Identity
2324import Control.Monad.Reader
2425import Control.Monad.State.Strict
@@ -154,7 +155,7 @@ serialize_cap_expression :: MonadIO m => CapExpression -> [CapParam] -> OutputBu
154155serialize_cap_expression cap params out_ptr = do
155156 let params' = apply_param_ops cap params
156157 (!out_ptr', _) <- runStateT (runReaderT (serialize_cap_ops out_ptr (cap_ops cap)) (cap, params')) []
157− return out_ptr'
158+ return $! out_ptr'
158159
159160serialize_cap_ops :: MonadIO m => OutputBuffer -> CapOps -> EvalT m OutputBuffer
160161serialize_cap_ops out_ptr ops = foldM serialize_cap_op out_ptr ops
test/Makefile+1−1
@@ -26,7 +26,7 @@ $(VERIF_TESTS)
2626$(shell mkdir -p objects )
2727
2828# 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
3030
3131GHC_PROF_ARGS=-prof -auto-all $(GHC_ARGS)
3232
vty.cabal+1−1
@@ -30,7 +30,7 @@ Build-Depends: base >= 4 && < 5, bytestring, containers, unix
3030Build-Depends: terminfo >= 0.3 && < 0.4
3131Build-Depends: utf8-string >= 0.3 && < 0.4
3232Build-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
3434Build-Depends: array
3535Build-Depends: parsec >= 2 && < 4
3636Build-Depends: vector-space >= 0.5 && < 0.6