Adapt PArray instance generation to new scheme

[ghc-hetmet.git] / compiler / prelude / PrelNames.lhs

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 2d2edb0..b630233 100644 (file)
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -217,7 +217,9 @@ genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
 
 ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, reprTyConName, embedTyConName
+ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prTyConName
+           , uarrTyConName
+           , mkPRName
            , closureTyConName
            , mkClosureName, applyClosureName
            , mkClosurePName, applyClosurePName
@@ -275,9 +277,11 @@ rANDOM             = mkBaseModule FSLIT("System.Random")
 gLA_EXTS       = mkBaseModule FSLIT("GHC.Exts")
 
 nDP_PARRAY      = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
+nDP_REPR        = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr")
 nDP_UTILS       = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Utils")
 nDP_CLOSURE     = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
 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,8 +698,10 @@ checkDotnetResName  = varQual  dOTNET FSLIT("checkResult")     checkDotnetResNam
 -- NDP stuff
 parrayTyConName     = tcQual   nDP_PARRAY FSLIT("PArray") parrayTyConKey
 paTyConName         = tcQual   nDP_PARRAY FSLIT("PA")     paTyConKey
-reprTyConName       = tcQual   nDP_PARRAY FSLIT("Repr")   reprTyConKey
-embedTyConName      = tcQual   nDP_PARRAY FSLIT("Embed")  embedTyConKey
+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
@@ -889,8 +895,9 @@ stringTyConKey                              = mkPreludeTyConUnique 134
 parrayTyConKey                          = mkPreludeTyConUnique 135
 closureTyConKey                         = mkPreludeTyConUnique 136
 paTyConKey                              = mkPreludeTyConUnique 137
-reprTyConKey                            = mkPreludeTyConUnique 138
-embedTyConKey                           = mkPreludeTyConUnique 139
+preprTyConKey                           = mkPreludeTyConUnique 138
+prTyConKey                              = mkPreludeTyConUnique 139
+uarrTyConKey                            = mkPreludeTyConUnique 140
 
 
 ---------------- Template Haskell -------------------
@@ -1084,6 +1091,7 @@ emptyPAIdKey                  = mkPreludeMiscIdUnique 133
 packPAIdKey                   = mkPreludeMiscIdUnique 134
 combinePAIdKey                = mkPreludeMiscIdUnique 135
 intEqPAIdKey                  = mkPreludeMiscIdUnique 136
+mkPRIdKey                     = mkPreludeMiscIdUnique 137
 
 ---------------- Template Haskell -------------------
 --     USES IdUniques 200-399