X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=366d2540a90f24cd438ba1d5870239384d7f151c;hb=456e9f7fa85c18a7cb7ef2dc3c1b844ed5103831;hp=f297d89fa7d0ba5e4bd6c933ccf68b0b101d3e08;hpb=351a0212a9b4275f8cec2c5b699b1ab995e2e6e3;p=ghc-hetmet.git

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index f297d89..366d254 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -217,11 +217,14 @@ genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
 
 ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, closureTyConName
+ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prTyConName
+           , uarrTyConName
+           , mkPRName
+           , closureTyConName
            , mkClosureName, applyClosureName
            , mkClosurePName, applyClosurePName
            , lengthPAName, replicatePAName, emptyPAName, packPAName,
-             combinePAName, intEqPAName ]
+             combinePAName ]
 \end{code}
 
 
@@ -274,10 +277,10 @@ rANDOM		= mkBaseModule FSLIT("System.Random")
 gLA_EXTS	= mkBaseModule FSLIT("GHC.Exts")
 
 nDP_PARRAY      = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
-nDP_UTILS       = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Utils")
+nDP_REPR        = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr")
 nDP_CLOSURE     = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
-nDP_INTERFACE_NAME = mkModuleNameFS FSLIT("Data.Array.Parallel.Lifted")
-nDP_BUILTIN     = mkModuleNameFS FSLIT(":NDP")
+nDP_INSTANCES   = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Instances")
+nDP_UARR        = mkNDPModule FSLIT("Data.Array.Parallel.Unlifted.Flat.UArr")
 
 mAIN	        = mkMainModule_ mAIN_NAME
 rOOT_MAIN	= mkMainModule FSLIT(":Main") -- Root module for initialisation 
@@ -694,12 +697,15 @@ checkDotnetResName  = varQual  dOTNET FSLIT("checkResult")     checkDotnetResNam
 -- NDP stuff
 parrayTyConName     = tcQual   nDP_PARRAY FSLIT("PArray") parrayTyConKey
 paTyConName         = tcQual   nDP_PARRAY FSLIT("PA")     paTyConKey
+preprTyConName      = tcQual   nDP_PARRAY FSLIT("PRepr")  preprTyConKey
+prTyConName         = tcQual   nDP_PARRAY FSLIT("PR")     prTyConKey
+uarrTyConName       = tcQual   nDP_UARR   FSLIT("UArr")   uarrTyConKey
+mkPRName            = varQual  nDP_PARRAY FSLIT("mkPR")   mkPRIdKey
 lengthPAName        = varQual  nDP_PARRAY FSLIT("lengthPA")    lengthPAIdKey
 replicatePAName     = varQual  nDP_PARRAY FSLIT("replicatePA") replicatePAIdKey
 emptyPAName         = varQual  nDP_PARRAY FSLIT("emptyPA") emptyPAIdKey
 packPAName          = varQual  nDP_PARRAY FSLIT("packPA")  packPAIdKey
 combinePAName       = varQual  nDP_PARRAY FSLIT("combinePA") combinePAIdKey
-intEqPAName         = varQual  nDP_UTILS  FSLIT("intEqPA") intEqPAIdKey
 closureTyConName    = tcQual   nDP_CLOSURE FSLIT(":->")    closureTyConKey
 mkClosureName       = varQual  nDP_CLOSURE FSLIT("mkClosure")  mkClosureIdKey
 applyClosureName    = varQual  nDP_CLOSURE FSLIT("$:")         applyClosureIdKey
@@ -887,6 +893,9 @@ stringTyConKey				= mkPreludeTyConUnique 134
 parrayTyConKey                          = mkPreludeTyConUnique 135
 closureTyConKey                         = mkPreludeTyConUnique 136
 paTyConKey                              = mkPreludeTyConUnique 137
+preprTyConKey                           = mkPreludeTyConUnique 138
+prTyConKey                              = mkPreludeTyConUnique 139
+uarrTyConKey                            = mkPreludeTyConUnique 140
 
 
 ---------------- Template Haskell -------------------
@@ -1079,7 +1088,7 @@ replicatePAIdKey              = mkPreludeMiscIdUnique 132
 emptyPAIdKey                  = mkPreludeMiscIdUnique 133
 packPAIdKey                   = mkPreludeMiscIdUnique 134
 combinePAIdKey                = mkPreludeMiscIdUnique 135
-intEqPAIdKey                  = mkPreludeMiscIdUnique 136
+mkPRIdKey                     = mkPreludeMiscIdUnique 136
 
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399