More cleanup

edsko · edsko · commit 4e9442b1044a · 2012-08-10T15:50:10.000+01:00
diff --git a/distributed-process/distributed-process.cabal b/distributed-process/distributed-process.cabal
@@ -53,7 +53,6 @@ Library
                      Control.Distributed.Process.Internal.Primitives,
                      Control.Distributed.Process.Internal.CQueue,
                      Control.Distributed.Process.Internal.Types,
-                     Control.Distributed.Process.Internal.Closure.MkClosure,
                      Control.Distributed.Process.Internal.Closure.TH,
                      Control.Distributed.Process.Internal.Closure.BuiltIn,
                      Control.Distributed.Process.Internal.Node
@@ -65,7 +64,6 @@ Library
                      GADTs,
                      GeneralizedNewtypeDeriving,
                      DeriveDataTypeable,
-                     TemplateHaskell,
                      CPP
   ghc-options:       -Wall
   HS-Source-Dirs:    src
@@ -99,7 +97,6 @@ Test-Suite TestCH
                      GADTs,
                      GeneralizedNewtypeDeriving,
                      DeriveDataTypeable,
-                     TemplateHaskell,
                      CPP
   ghc-options:       -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind 
   HS-Source-Dirs:    tests src
diff --git a/distributed-process/src/Control/Distributed/Process.hs b/distributed-process/src/Control/Distributed/Process.hs
@@ -209,7 +209,6 @@ import Control.Distributed.Process.Internal.Primitives
   )
 import Control.Distributed.Process.Serializable (Serializable)
 import Control.Distributed.Process.Node (forkProcess)
-import Data.Rank1Typeable (ANY, ANY1)
 
 -- INTERNAL NOTES
 -- 
diff --git a/distributed-process/src/Control/Distributed/Process/Closure.hs b/distributed-process/src/Control/Distributed/Process/Closure.hs
@@ -189,8 +189,8 @@ import Control.Distributed.Process.Internal.Closure.TH
   , mkStatic
   , functionSDict
   , functionTDict
+  , mkClosure
   )
-import Control.Distributed.Process.Internal.Closure.MkClosure (mkClosure)
 import Control.Distributed.Process.Internal.Closure.BuiltIn
   ( -- Static dictionaries and associated operations
     staticDecode
diff --git a/distributed-process/src/Control/Distributed/Process/Internal/Closure/MkClosure.hs b/distributed-process/src/Control/Distributed/Process/Internal/Closure/MkClosure.hs
diff --git a/distributed-process/src/Control/Distributed/Process/Internal/Closure/TH.hs b/distributed-process/src/Control/Distributed/Process/Internal/Closure/TH.hs
@@ -1,12 +1,12 @@
 -- | Template Haskell support
---
--- (In a separate file for convenience)
+{-# LANGUAGE TemplateHaskell #-}
 module Control.Distributed.Process.Internal.Closure.TH 
   ( -- * User-level API
     remotable
   , mkStatic
   , functionSDict
   , functionTDict
+  , mkClosure
   ) where
 
 import Prelude hiding (lookup)
@@ -40,17 +40,21 @@ import Language.Haskell.TH
   , sigD
   )
 
-import Control.Distributed.Process.Internal.Types (Process)
-import Control.Distributed.Process.Serializable 
-  ( SerializableDict(SerializableDict)
-  )
+import Data.Binary (encode)
+import Data.Rank1Dynamic (toDynamic)
 import Control.Distributed.Static 
   ( RemoteTable
   , registerStatic
   , Static
   , staticLabel
+  , Closure(Closure)
+  , staticCompose
   )
-import Data.Rank1Dynamic (toDynamic)
+import Control.Distributed.Process.Internal.Types (Process)
+import Control.Distributed.Process.Serializable 
+  ( SerializableDict(SerializableDict)
+  )
+import Control.Distributed.Process.Internal.Closure.BuiltIn (staticDecode)
 
 --------------------------------------------------------------------------------
 -- User-level API                                                             --
@@ -86,6 +90,12 @@ functionSDict = varE . sdictName
 functionTDict :: Name -> Q Exp
 functionTDict = varE . tdictName
 
+mkClosure :: Name -> Q Exp
+mkClosure n = 
+  [|   Closure ($(mkStatic n) `staticCompose` staticDecode $(functionSDict n)) 
+     . encode
+  |]
+
 --------------------------------------------------------------------------------
 -- Internal (Template Haskell)                                                --
 --------------------------------------------------------------------------------
diff --git a/distributed-process/src/Control/Distributed/Process/Node.hs b/distributed-process/src/Control/Distributed/Process/Node.hs
@@ -9,7 +9,6 @@ module Control.Distributed.Process.Node
   , localNodeId
   ) where
 
-
 #if ! MIN_VERSION_base(4,6,0)
 import Prelude hiding (catch)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,6 @@ import Control.Distributed.Process.Internal.Primitives`
`209`	`209`	`)`
`210`	`210`	`import Control.Distributed.Process.Serializable (Serializable)`
`211`	`211`	`import Control.Distributed.Process.Node (forkProcess)`
`212`		`-import Data.Rank1Typeable (ANY, ANY1)`
`213`	`212`
`214`	`213`	`-- INTERNAL NOTES`
`215`	`214`	`--`