X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=2740d26840969c58e21a037aa59ab3e92014d425;hb=f2eb50cc42d4ce9e27c2328016b1ddbc2abab04c;hp=282765b8ddf5e2e45a3cbd42e18295e2e741b35e;hpb=6f0160d00606f1b2e5904b37148472bd5ee11b00;p=ghc-hetmet.git

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 282765b..2740d26 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -217,10 +217,15 @@ genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
 
 ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paClassName, closureTyConName
+ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prTyConName
+           , parrayIntPrimTyConName
+           , mkPRName
+           , closureTyConName
            , mkClosureName, applyClosureName
            , mkClosurePName, applyClosurePName
-           , lengthPAName, replicatePAName, emptyPAName ]
+           , replicatePAIntPrimName, upToPAIntPrimName
+           , lengthPAName, replicatePAName, emptyPAName, packPAName,
+             combinePAName ]
 \end{code}
 
 
@@ -273,7 +278,10 @@ 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_CLOSURE     = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
+nDP_PRIM        = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Prim")
+nDP_INSTANCES   = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Instances")
 
 mAIN	        = mkMainModule_ mAIN_NAME
 rOOT_MAIN	= mkMainModule FSLIT(":Main") -- Root module for initialisation 
@@ -689,10 +697,20 @@ checkDotnetResName  = varQual  dOTNET FSLIT("checkResult")     checkDotnetResNam
 
 -- NDP stuff
 parrayTyConName     = tcQual   nDP_PARRAY FSLIT("PArray") parrayTyConKey
-paClassName         = clsQual  nDP_PARRAY FSLIT("PA")     paClassKey
-lengthPAName        = methName nDP_PARRAY FSLIT("lengthPA")    lengthPAClassOpKey
-replicatePAName     = methName nDP_PARRAY FSLIT("replicatePA") replicatePAClassOpKey
-emptyPAName         = varQual  nDP_PARRAY FSLIT("emptyPA") emptyPAClassOpKey
+paTyConName         = tcQual   nDP_PARRAY FSLIT("PA")     paTyConKey
+preprTyConName      = tcQual   nDP_PARRAY FSLIT("PRepr")  preprTyConKey
+prTyConName         = tcQual   nDP_PARRAY FSLIT("PR")     prTyConKey
+parrayIntPrimTyConName = tcQual nDP_PRIM  FSLIT("PArray_Int#")
+                                                          parrayIntPrimTyConKey
+mkPRName            = varQual  nDP_PARRAY FSLIT("mkPR")   mkPRIdKey
+replicatePAIntPrimName = varQual nDP_PRIM FSLIT("replicatePA_Int#")
+                                                        replicatePAIntPrimIdKey
+upToPAIntPrimName   = varQual  nDP_PRIM   FSLIT("upToPA_Int#") upToPAIntPrimIdKey
+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
 closureTyConName    = tcQual   nDP_CLOSURE FSLIT(":->")    closureTyConKey
 mkClosureName       = varQual  nDP_CLOSURE FSLIT("mkClosure")  mkClosureIdKey
 applyClosureName    = varQual  nDP_CLOSURE FSLIT("$:")         applyClosureIdKey
@@ -767,8 +785,6 @@ randomClassKey		= mkPreludeClassUnique 31
 randomGenClassKey	= mkPreludeClassUnique 32
 
 isStringClassKey	= mkPreludeClassUnique 33
-
-paClassKey              = mkPreludeClassUnique 34
 \end{code}
 
 %************************************************************************
@@ -881,6 +897,10 @@ stringTyConKey				= mkPreludeTyConUnique 134
 
 parrayTyConKey                          = mkPreludeTyConUnique 135
 closureTyConKey                         = mkPreludeTyConUnique 136
+paTyConKey                              = mkPreludeTyConUnique 137
+preprTyConKey                           = mkPreludeTyConUnique 138
+prTyConKey                              = mkPreludeTyConUnique 139
+parrayIntPrimTyConKey                   = mkPreludeTyConUnique 140
 
 
 ---------------- Template Haskell -------------------
@@ -1068,9 +1088,14 @@ applyClosureIdKey             = mkPreludeMiscIdUnique 127
 mkClosurePIdKey               = mkPreludeMiscIdUnique 128
 applyClosurePIdKey            = mkPreludeMiscIdUnique 129
 closurePAIdKey                = mkPreludeMiscIdUnique 130
-lengthPAClassOpKey            = mkPreludeMiscIdUnique 131
-replicatePAClassOpKey         = mkPreludeMiscIdUnique 132
-emptyPAClassOpKey             = mkPreludeMiscIdUnique 133
+lengthPAIdKey                 = mkPreludeMiscIdUnique 131
+replicatePAIdKey              = mkPreludeMiscIdUnique 132
+emptyPAIdKey                  = mkPreludeMiscIdUnique 133
+packPAIdKey                   = mkPreludeMiscIdUnique 134
+combinePAIdKey                = mkPreludeMiscIdUnique 135
+mkPRIdKey                     = mkPreludeMiscIdUnique 136
+replicatePAIntPrimIdKey       = mkPreludeMiscIdUnique 137
+upToPAIntPrimIdKey            = mkPreludeMiscIdUnique 138
 
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399