From: Roman Leshchinskiy <rl@cse.unsw.edu.au>
Date: Mon, 19 Nov 2007 02:03:02 +0000 (+0000)
Subject: Bind NDP stuff to [:.:] arrays
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=5e9f04ebeaf49c3afe836b64d72508762ad19c1a

Bind NDP stuff to [:.:] arrays
---

diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index 5741ddc..f5c27ef 100644
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -33,7 +33,9 @@ import Type            ( Type )
 import TysPrim
 import TysWiredIn      ( unitTyCon, tupleTyCon,
                          intTyCon, intTyConName,
-                         boolTyCon, boolTyConName, trueDataCon, falseDataCon )
+                         boolTyCon, boolTyConName, trueDataCon, falseDataCon,
+                         parrTyCon, parrTyConName )
+import PrelNames       ( gHC_PARR )
 import Module
 import BasicTypes      ( Boxity(..) )
 
@@ -63,7 +65,7 @@ nDP_PRIM        = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Prim")
 nDP_INSTANCES   = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Instances")
 nDP_COMBINATORS = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Combinators")
 
-nDP_PRELUDE_PARR = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.PArr")
+nDP_PRELUDE_PARR = gHC_PARR -- mkNDPModule FSLIT("Data.Array.Parallel.Prelude.PArr")
 nDP_PRELUDE_INT  = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.Int")
 
 data Builtins = Builtins {
@@ -219,9 +221,9 @@ preludeVars
 initBuiltinTyCons :: Builtins -> DsM [(Name, TyCon)]
 initBuiltinTyCons bi
   = do
-      parr <- externalTyCon nDP_PRELUDE_PARR FSLIT("PArr")
+      -- parr <- externalTyCon nDP_PRELUDE_PARR FSLIT("PArr")
       return $ (tyConName funTyCon, closureTyCon bi)
-             : (tyConName parr,     parrayTyCon bi)
+             : (parrTyConName,      parrayTyCon bi)
              : [(tyConName tc, tc) | tc <- defaultTyCons]
 
 defaultTyCons :: [TyCon]