[commit: packages/dph] master: dph-lifted-copy: s/join/joinG/ in TH.Repr (3ebad52)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/dph

On branch  : master
Link       : http://git.haskell.org/packages/dph.git/commitdiff/3ebad521cd1e3b5573d97b483305ca465a9cba69

>---------------------------------------------------------------

commit 3ebad521cd1e3b5573d97b483305ca465a9cba69
Author: Austin Seipp <austin at well-typed.com>
Date:   Sun Apr 20 00:59:28 2014 -0500

    dph-lifted-copy: s/join/joinG/ in TH.Repr
    
    This is the final piece for GHC to be AMP compliant. The use of 'join'
    here is totally internal, so rather than hiding the import, it's just as
    easy to rename to 'joinG' (for the Gen type).
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

3ebad521cd1e3b5573d97b483305ca465a9cba69
 dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs b/dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
index fb6b02b..c873e32 100644
--- a/dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
+++ b/dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
@@ -162,7 +162,7 @@ data Gen = Gen {
              recursiveCalls :: Int
            , recursiveName  :: Name -> Name
            , split          :: ArgVal -> (Split, Arg)
-           , join           :: Val -> [ExpQ] -> ExpQ
+           , joinG          :: Val -> [ExpQ] -> ExpQ
            , typeName       :: String
            }
 
@@ -171,7 +171,7 @@ recursiveMethod gen name avs res
   = simpleFunD (mkName $ nameBase name) (map pat splits)
   $ appE (varE 'traceFn `appEs` [stringE (nameBase name), stringE (typeName gen)])
   $ foldr mk_case
-    (join gen res
+    (joinG gen res
      . recurse (recursiveCalls gen)
      . trans
      $ map expand args)
@@ -378,7 +378,7 @@ wrapGen wrap unwrap pwrap
  = Gen  { recursiveCalls = 1
         , recursiveName  = recursiveName'
         , split          = split'
-        , join           = join'
+        , joinG          = join'
         , typeName       = "Wrap a"
         }
   where
@@ -447,7 +447,7 @@ tupGen :: Int -> Gen
 tupGen arity = Gen { recursiveCalls = arity
                    , recursiveName  = id
                    , split          = split'
-                   , join           = join'
+                   , joinG          = join'
                    , typeName       = tyname
                    }
   where