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

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index b3194a1..2740d26 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -217,13 +217,15 @@ genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
 
 ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prClassName
-           , ndpCrossTyConName, ndpPlusTyConName, embedTyConName
+ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prTyConName
+           , parrayIntPrimTyConName
+           , mkPRName
            , closureTyConName
            , mkClosureName, applyClosureName
            , mkClosurePName, applyClosurePName
+           , replicatePAIntPrimName, upToPAIntPrimName
            , lengthPAName, replicatePAName, emptyPAName, packPAName,
-             combinePAName, intEqPAName ]
+             combinePAName ]
 \end{code}
 
 
@@ -276,8 +278,9 @@ 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_PRIM        = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Prim")
 nDP_INSTANCES   = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Instances")
 
 mAIN	        = mkMainModule_ mAIN_NAME
@@ -696,16 +699,18 @@ checkDotnetResName  = varQual  dOTNET FSLIT("checkResult")     checkDotnetResNam
 parrayTyConName     = tcQual   nDP_PARRAY FSLIT("PArray") parrayTyConKey
 paTyConName         = tcQual   nDP_PARRAY FSLIT("PA")     paTyConKey
 preprTyConName      = tcQual   nDP_PARRAY FSLIT("PRepr")  preprTyConKey
-prClassName         = clsQual  nDP_PARRAY FSLIT("PR")     prClassKey
-ndpCrossTyConName   = tcQual   nDP_PARRAY FSLIT(":*:")    ndpCrossTyConKey
-ndpPlusTyConName    = tcQual   nDP_PARRAY FSLIT(":+:")    ndpPlusTyConKey
-embedTyConName      = tcQual   nDP_PARRAY FSLIT("Embed")  embedTyConKey
+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
-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
@@ -780,8 +785,6 @@ randomClassKey		= mkPreludeClassUnique 31
 randomGenClassKey	= mkPreludeClassUnique 32
 
 isStringClassKey	= mkPreludeClassUnique 33
-
-prClassKey              = mkPreludeClassUnique 34
 \end{code}
 
 %************************************************************************
@@ -896,9 +899,8 @@ parrayTyConKey                          = mkPreludeTyConUnique 135
 closureTyConKey                         = mkPreludeTyConUnique 136
 paTyConKey                              = mkPreludeTyConUnique 137
 preprTyConKey                           = mkPreludeTyConUnique 138
-embedTyConKey                           = mkPreludeTyConUnique 139
-ndpCrossTyConKey                        = mkPreludeTyConUnique 140
-ndpPlusTyConKey                         = mkPreludeTyConUnique 141
+prTyConKey                              = mkPreludeTyConUnique 139
+parrayIntPrimTyConKey                   = mkPreludeTyConUnique 140
 
 
 ---------------- Template Haskell -------------------
@@ -1091,7 +1093,9 @@ replicatePAIdKey              = mkPreludeMiscIdUnique 132
 emptyPAIdKey                  = mkPreludeMiscIdUnique 133
 packPAIdKey                   = mkPreludeMiscIdUnique 134
 combinePAIdKey                = mkPreludeMiscIdUnique 135
-intEqPAIdKey                  = mkPreludeMiscIdUnique 136
+mkPRIdKey                     = mkPreludeMiscIdUnique 136
+replicatePAIntPrimIdKey       = mkPreludeMiscIdUnique 137
+upToPAIntPrimIdKey            = mkPreludeMiscIdUnique 138
 
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399