git.iko.soy/distributed-process
on master help sign in
Cleanup
commitc18c62f0a65179d036d1e48143b8c7a792f3c749 authorEdsko de Vries <edsko@edsko.net> dateThu 16 Aug 2012, 15:11 (14 years ago) parent542483b
3 files changed+21−53
distributed-process/distributed-process.cabal+17−50 distributed-process/src/Control/Distributed/Process/Closure.hs+2−2 distributed-process/tests/TestClosure.hs+2−1
distributed-process/distributed-process.cabal+17−50
@@ -73,74 +73,41 @@ Library
7373 ghc-options: -Wall
7474 HS-Source-Dirs: src
7575 if flag(th)
76− Build-Depends: template-haskell >= 2.6 && < 2.9
76+ Build-Depends: template-haskell >= 2.6 && < 2.9
7777 Exposed-modules: Control.Distributed.Process.Internal.Closure.TH
78+ CPP-Options: -DTemplateHaskellSupport
7879
7980Test-Suite TestCH
8081 Type: exitcode-stdio-1.0
8182 Main-Is: TestCH.hs
8283 Build-Depends: base >= 4.4 && < 5,
83− binary >= 0.5 && < 0.6,
84− network-transport >= 0.2 && < 0.3,
85− network-transport-tcp >= 0.2 && < 0.3,
86− stm >= 2.3 && < 2.5,
87− transformers >= 0.2 && < 0.4,
88− mtl >= 2.0 && < 2.2,
89− data-accessor >= 0.2 && < 0.3,
90− bytestring >= 0.9 && < 0.11,
91− containers >= 0.4 && < 0.6,
92− old-locale >= 1.0 && < 1.1,
93− time >= 1.2 && < 1.5,
94− template-haskell >= 2.6 && < 2.9,
9584 random >= 1.0 && < 1.1,
96− ghc-prim >= 0.2 && < 0.4,
9785 ansi-terminal >= 0.5 && < 0.6,
98− distributed-static >= 0.2 && < 0.3,
99− rank1dynamic >= 0.1 && < 0.2
100− Extensions: RankNTypes,
86+ distributed-process >= 0.3 && < 0.4,
87+ network-transport >= 0.2 && < 0.3,
88+ network-transport-tcp >= 0.2 && < 0.3,
89+ binary >= 0.5 && < 0.6
90+ Other-modules: TestAuxiliary
91+ Extensions: CPP,
10192 ScopedTypeVariables,
102− FlexibleInstances,
103− UndecidableInstances,
104− ExistentialQuantification,
105− GADTs,
106− GeneralizedNewtypeDeriving,
10793 DeriveDataTypeable,
108− CPP
94+ GeneralizedNewtypeDeriving
10995 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
110− HS-Source-Dirs: tests src
96+ HS-Source-Dirs: tests
11197
11298Test-Suite TestClosure
11399 Type: exitcode-stdio-1.0
114100 Main-Is: TestClosure.hs
115101 Build-Depends: base >= 4.4 && < 5,
116− binary >= 0.5 && < 0.6,
117− network-transport >= 0.2 && < 0.3,
118− network-transport-tcp >= 0.2 && < 0.3,
119− stm >= 2.3 && < 2.5,
120− transformers >= 0.2 && < 0.4,
121− mtl >= 2.0 && < 2.2,
122− data-accessor >= 0.2 && < 0.3,
123− bytestring >= 0.9 && < 0.11,
124− containers >= 0.4 && < 0.6,
125− old-locale >= 1.0 && < 1.1,
126− time >= 1.2 && < 1.5,
127− template-haskell >= 2.6 && < 2.9,
128102 random >= 1.0 && < 1.1,
129− ghc-prim >= 0.2 && < 0.4,
130103 ansi-terminal >= 0.5 && < 0.6,
131104 distributed-static >= 0.2 && < 0.3,
132− rank1dynamic >= 0.1 && < 0.2,
133− syb >= 0.3 && < 0.4
105+ distributed-process >= 0.3 && < 0.4,
106+ network-transport >= 0.2 && < 0.3,
107+ network-transport-tcp >= 0.2 && < 0.3,
108+ bytestring >= 0.9 && < 0.11
134109 Other-modules: TestAuxiliary
135− Extensions: RankNTypes,
136− ScopedTypeVariables,
137− FlexibleInstances,
138− UndecidableInstances,
139− ExistentialQuantification,
140− GADTs,
141− GeneralizedNewtypeDeriving,
142− DeriveDataTypeable,
143− TemplateHaskell,
144− CPP
110+ Extensions: CPP,
111+ ScopedTypeVariables
145112 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
146− HS-Source-Dirs: tests src
113+ HS-Source-Dirs: tests
distributed-process/src/Control/Distributed/Process/Closure.hs+2−2
@@ -176,7 +176,7 @@ module Control.Distributed.Process.Closure
176176 , cpSend
177177 , cpExpect
178178 , cpNewChan
179−#ifdef TH
179+#ifdef TemplateHaskellSupport
180180 -- * Template Haskell support for creating static values and closures
181181 , remotable
182182 , mkStatic
@@ -207,7 +207,7 @@ import Control.Distributed.Process.Internal.Closure.BuiltIn
207207 , cpExpect
208208 , cpNewChan
209209 )
210−#ifdef TH
210+#ifdef TemplateHaskellSupport
211211import Control.Distributed.Process.Internal.Closure.TH
212212 ( remotable
213213 , mkStatic
distributed-process/tests/TestClosure.hs+2−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE TemplateHaskell #-}
12module Main where
23
34import Data.ByteString.Lazy (empty)
@@ -290,7 +291,7 @@ testSpawnInvalid transport rtable = do
290291 node <- newLocalNode transport rtable
291292 done <- newEmptyMVar
292293 forkProcess node $ do
293− (pid, ref) <- spawnMonitor (localNodeId node) (Closure (staticLabel "ThisDoesNotExist") empty)
294+ (pid, ref) <- spawnMonitor (localNodeId node) (closure (staticLabel "ThisDoesNotExist") empty)
294295 ProcessMonitorNotification ref' pid' _reason <- expect
295296 -- Depending on the exact interleaving, reason might be NoProc or the exception thrown by the absence of the static closure
296297 True <- return $ ref' == ref && pid == pid'