Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b11585feecb1a131c6b1632fc5867b49e98c4333 >--------------------------------------------------------------- commit b11585feecb1a131c6b1632fc5867b49e98c4333 Author: Manuel M T Chakravarty <[email protected]> Date: Fri Jun 17 17:22:10 2011 +1000 Track changes in the DPH package and GHC.PArr. >--------------------------------------------------------------- compiler/prelude/TysWiredIn.lhs | 34 +++++++++++----------- compiler/vectorise/Vectorise/Builtins/Modules.hs | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/prelude/TysWiredIn.lhs b/compiler/prelude/TysWiredIn.lhs index 5a80067..8759157 100644 --- a/compiler/prelude/TysWiredIn.lhs +++ b/compiler/prelude/TysWiredIn.lhs @@ -521,9 +521,9 @@ unitTy = mkTupleTy Boxed [] \end{code} %************************************************************************ -%* * +%* * \subsection[TysWiredIn-PArr]{The @[::]@ type} -%* * +%* * %************************************************************************ Special syntax for parallel arrays needs some wired in definitions. @@ -546,13 +546,13 @@ parrTyCon = pcNonRecDataTyCon parrTyConName alpha_tyvar [parrDataCon] parrDataCon :: DataCon parrDataCon = pcDataCon - parrDataConName - alpha_tyvar -- forall'ed type variables - [intPrimTy, -- 1st argument: Int# - mkTyConApp -- 2nd argument: Array# a - arrayPrimTyCon - alpha_ty] - parrTyCon + parrDataConName + alpha_tyvar -- forall'ed type variables + [intTy, -- 1st argument: Int + mkTyConApp -- 2nd argument: Array# a + arrayPrimTyCon + alpha_ty] + parrTyCon -- | Check whether a type constructor is the constructor for parallel arrays isPArrTyCon :: TyCon -> Bool @@ -566,27 +566,27 @@ isPArrTyCon tc = tyConName tc == parrTyConName -- yet another constructor pattern -- parrFakeCon :: Arity -> DataCon -parrFakeCon i | i > mAX_TUPLE_SIZE = mkPArrFakeCon i -- build one specially +parrFakeCon i | i > mAX_TUPLE_SIZE = mkPArrFakeCon i -- build one specially parrFakeCon i = parrFakeConArr!i -- pre-defined set of constructors -- parrFakeConArr :: Array Int DataCon parrFakeConArr = array (0, mAX_TUPLE_SIZE) [(i, mkPArrFakeCon i) - | i <- [0..mAX_TUPLE_SIZE]] + | i <- [0..mAX_TUPLE_SIZE]] -- build a fake parallel array constructor for the given arity -- mkPArrFakeCon :: Int -> DataCon mkPArrFakeCon arity = data_con where - data_con = pcDataCon name [tyvar] tyvarTys parrTyCon - tyvar = head alphaTyVars - tyvarTys = replicate arity $ mkTyVarTy tyvar + data_con = pcDataCon name [tyvar] tyvarTys parrTyCon + tyvar = head alphaTyVars + tyvarTys = replicate arity $ mkTyVarTy tyvar nameStr = mkFastString ("MkPArr" ++ show arity) - name = mkWiredInName gHC_PARR' (mkDataOccFS nameStr) unique - (ADataCon data_con) UserSyntax - unique = mkPArrDataConUnique arity + name = mkWiredInName gHC_PARR' (mkDataOccFS nameStr) unique + (ADataCon data_con) UserSyntax + unique = mkPArrDataConUnique arity -- | Checks whether a data constructor is a fake constructor for parallel arrays isPArrFakeCon :: DataCon -> Bool diff --git a/compiler/vectorise/Vectorise/Builtins/Modules.hs b/compiler/vectorise/Vectorise/Builtins/Modules.hs index c750571..af74f80 100644 --- a/compiler/vectorise/Vectorise/Builtins/Modules.hs +++ b/compiler/vectorise/Vectorise/Builtins/Modules.hs @@ -45,7 +45,7 @@ dph_Modules pkg , dph_Unboxed = mk (fsLit "Data.Array.Parallel.Lifted.Unboxed") , dph_Scalar = mk (fsLit "Data.Array.Parallel.Lifted.Scalar") - , dph_Prelude_Tuple = mk (fsLit "Data.Array.Parallel.Prelude.Base.Tuple") + , dph_Prelude_Tuple = mk (fsLit "Data.Array.Parallel.Prelude.Tuple") } where mk = mkModule pkg . mkModuleNameFS _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
