[commit: packages/dph] ghc-7.8: Revert "Fix breaking changes due to issue #7021" (556e09c)

git at git.haskell.org git at git.haskell.org
Sat Mar 22 19:42:24 UTC 2014


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

On branch  : ghc-7.8
Link       : http://git.haskell.org/packages/dph.git/commitdiff/556e09cdc9f8e1cc22dd10b703c97d0e228b483d

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

commit 556e09cdc9f8e1cc22dd10b703c97d0e228b483d
Author: Austin Seipp <aseipp at pobox.com>
Date:   Sat Mar 22 13:54:56 2014 -0500

    Revert "Fix breaking changes due to issue #7021"
    
    This reverts commit aeef7aad83aaa24c503fa18e321d2271829f003b.


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

556e09cdc9f8e1cc22dd10b703c97d0e228b483d
 dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs |    5 +++--
 1 file changed, 3 insertions(+), 2 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..9229723 100644
--- a/dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
+++ b/dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
@@ -367,7 +367,7 @@ wrapPRInstance :: Name -> Name -> Name -> Name -> Q [Dec]
 wrapPRInstance ty wrap unwrap pwrap
   = do
       methods <- genPR_methods (recursiveMethod (wrapGen wrap unwrap pwrap))
-      return [InstanceD [ConT ''PA `AppT` a]
+      return [InstanceD [ClassP ''PA [a]]
                         (ConT ''PR `AppT` (ConT ty `AppT` a))
                         methods]
   where
@@ -437,7 +437,7 @@ instance_PR_tup :: Int -> DecQ
 instance_PR_tup arity
   = do
       methods <- genPR_methods (recursiveMethod (tupGen arity))
-      return $ InstanceD [ConT ''PR `AppT` ty | ty <- tys]
+      return $ InstanceD [ClassP ''PR [ty] | ty <- tys]
                          (ConT ''PR `AppT` (TupleT arity `mkAppTs` tys))
                          methods
   where
@@ -485,3 +485,4 @@ tupGen arity = Gen { recursiveCalls = arity
     pvs         = take arity [c : "s" | c <- ['a' ..]]
 
     tyname      = "(" ++ intercalate "," vs ++ ")"
+



More information about the ghc-commits mailing list