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

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 0ed9c1f..b3194a1 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -217,11 +217,13 @@ genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
 
 ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, closureTyConName
+ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prClassName
+           , ndpCrossTyConName, ndpPlusTyConName, embedTyConName
+           , closureTyConName
            , mkClosureName, applyClosureName
            , mkClosurePName, applyClosurePName
-           , closurePAName
-           , lengthPAName, replicatePAName ]
+           , lengthPAName, replicatePAName, emptyPAName, packPAName,
+             combinePAName, intEqPAName ]
 \end{code}
 
 
@@ -273,7 +275,10 @@ aRROW		= mkBaseModule FSLIT("Control.Arrow")
 rANDOM		= mkBaseModule FSLIT("System.Random")
 gLA_EXTS	= mkBaseModule FSLIT("GHC.Exts")
 
-nDP_LIFTED      = mkNDPModule FSLIT("Data.Array.Parallel.Lifted")
+nDP_PARRAY      = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
+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")
 
 mAIN	        = mkMainModule_ mAIN_NAME
 rOOT_MAIN	= mkMainModule FSLIT(":Main") -- Root module for initialisation 
@@ -688,16 +693,24 @@ unmarshalStringName = varQual  dOTNET FSLIT("unmarshalString") unmarshalStringId
 checkDotnetResName  = varQual  dOTNET FSLIT("checkResult")     checkDotnetResNameIdKey
 
 -- NDP stuff
-parrayTyConName     = tcQual   nDP_LIFTED FSLIT("PArray") parrayTyConKey
-paTyConName         = tcQual   nDP_LIFTED FSLIT("PA")     paTyConKey
-closureTyConName    = tcQual   nDP_LIFTED FSLIT(":->")    closureTyConKey
-mkClosureName       = varQual  nDP_LIFTED FSLIT("mkClosure")  mkClosureIdKey
-applyClosureName    = varQual  nDP_LIFTED FSLIT("$:")         applyClosureIdKey
-mkClosurePName      = varQual  nDP_LIFTED FSLIT("mkClosureP") mkClosurePIdKey
-applyClosurePName   = varQual  nDP_LIFTED FSLIT("$:^")        applyClosurePIdKey
-closurePAName       = varQual  nDP_LIFTED FSLIT("closurePA")  closurePAIdKey
-lengthPAName        = varQual  nDP_LIFTED FSLIT("lengthP")    lengthPAIdKey
-replicatePAName     = varQual  nDP_LIFTED FSLIT("replicateP") replicatePAIdKey
+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
+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
+mkClosurePName      = varQual  nDP_CLOSURE FSLIT("mkClosureP") mkClosurePIdKey
+applyClosurePName   = varQual  nDP_CLOSURE FSLIT("$:^")        applyClosurePIdKey
 \end{code}
 
 %************************************************************************
@@ -767,6 +780,8 @@ randomClassKey		= mkPreludeClassUnique 31
 randomGenClassKey	= mkPreludeClassUnique 32
 
 isStringClassKey	= mkPreludeClassUnique 33
+
+prClassKey              = mkPreludeClassUnique 34
 \end{code}
 
 %************************************************************************
@@ -878,8 +893,12 @@ opaqueTyConKey                          = mkPreludeTyConUnique 133
 stringTyConKey				= mkPreludeTyConUnique 134
 
 parrayTyConKey                          = mkPreludeTyConUnique 135
-paTyConKey                              = mkPreludeTyConUnique 136
-closureTyConKey                         = mkPreludeTyConUnique 137
+closureTyConKey                         = mkPreludeTyConUnique 136
+paTyConKey                              = mkPreludeTyConUnique 137
+preprTyConKey                           = mkPreludeTyConUnique 138
+embedTyConKey                           = mkPreludeTyConUnique 139
+ndpCrossTyConKey                        = mkPreludeTyConUnique 140
+ndpPlusTyConKey                         = mkPreludeTyConUnique 141
 
 
 ---------------- Template Haskell -------------------
@@ -1069,6 +1088,10 @@ applyClosurePIdKey            = mkPreludeMiscIdUnique 129
 closurePAIdKey                = mkPreludeMiscIdUnique 130
 lengthPAIdKey                 = mkPreludeMiscIdUnique 131
 replicatePAIdKey              = mkPreludeMiscIdUnique 132
+emptyPAIdKey                  = mkPreludeMiscIdUnique 133
+packPAIdKey                   = mkPreludeMiscIdUnique 134
+combinePAIdKey                = mkPreludeMiscIdUnique 135
+intEqPAIdKey                  = mkPreludeMiscIdUnique 136
 
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399