[commit: packages/dph] master: Fix breaking changes due to issue #7021 (aeef7aa)

git at git.haskell.org git at git.haskell.org
Mon Feb 10 01:40:10 UTC 2014


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

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

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

commit aeef7aad83aaa24c503fa18e321d2271829f003b
Author: YoEight <yo.eight at gmail.com>
Date:   Sat Jan 11 13:38:18 2014 +0100

    Fix breaking changes due to issue #7021
    
    Signed-off-by: Richard Eisenberg <eir at cis.upenn.edu>


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

aeef7aad83aaa24c503fa18e321d2271829f003b
 dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs |    5 ++---
 1 file changed, 2 insertions(+), 3 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 9229723..fb6b02b 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 [ClassP ''PA [a]]
+      return [InstanceD [ConT ''PA `AppT` 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 [ClassP ''PR [ty] | ty <- tys]
+      return $ InstanceD [ConT ''PR `AppT` ty | ty <- tys]
                          (ConT ''PR `AppT` (TupleT arity `mkAppTs` tys))
                          methods
   where
@@ -485,4 +485,3 @@ tupGen arity = Gen { recursiveCalls = arity
     pvs         = take arity [c : "s" | c <- ['a' ..]]
 
     tyname      = "(" ++ intercalate "," vs ++ ")"
-



More information about the ghc-commits mailing list