Commit 5e9f04eb authored by rl@cse.unsw.edu.au's avatar rl@cse.unsw.edu.au
Browse files

Bind NDP stuff to [:.:] arrays

parent b360b20a
......@@ -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]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment