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

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 0ed9c1f..c09d73d 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -217,11 +217,10 @@ genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
 
 ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, closureTyConName
+ndpNames = [ parrayTyConName, paClassName, closureTyConName
            , mkClosureName, applyClosureName
            , mkClosurePName, applyClosurePName
-           , closurePAName
-           , lengthPAName, replicatePAName ]
+           , lengthPAName, replicatePAName, emptyPAName ]
 \end{code}
 
 
@@ -273,7 +272,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_CLOSURE     = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
+nDP_INTERFACE_NAME = mkModuleNameFS FSLIT("Data.Array.Parallel.Lifted")
+nDP_BUILTIN     = mkModuleNameFS FSLIT(":NDP")
 
 mAIN	        = mkMainModule_ mAIN_NAME
 rOOT_MAIN	= mkMainModule FSLIT(":Main") -- Root module for initialisation 
@@ -688,16 +690,16 @@ 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
+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
+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 +769,8 @@ randomClassKey		= mkPreludeClassUnique 31
 randomGenClassKey	= mkPreludeClassUnique 32
 
 isStringClassKey	= mkPreludeClassUnique 33
+
+paClassKey              = mkPreludeClassUnique 34
 \end{code}
 
 %************************************************************************
@@ -878,8 +882,7 @@ opaqueTyConKey                          = mkPreludeTyConUnique 133
 stringTyConKey				= mkPreludeTyConUnique 134
 
 parrayTyConKey                          = mkPreludeTyConUnique 135
-paTyConKey                              = mkPreludeTyConUnique 136
-closureTyConKey                         = mkPreludeTyConUnique 137
+closureTyConKey                         = mkPreludeTyConUnique 136
 
 
 ---------------- Template Haskell -------------------
@@ -1067,8 +1070,9 @@ applyClosureIdKey             = mkPreludeMiscIdUnique 127
 mkClosurePIdKey               = mkPreludeMiscIdUnique 128
 applyClosurePIdKey            = mkPreludeMiscIdUnique 129
 closurePAIdKey                = mkPreludeMiscIdUnique 130
-lengthPAIdKey                 = mkPreludeMiscIdUnique 131
-replicatePAIdKey              = mkPreludeMiscIdUnique 132
+lengthPAClassOpKey            = mkPreludeMiscIdUnique 131
+replicatePAClassOpKey         = mkPreludeMiscIdUnique 132
+emptyPAClassOpKey             = mkPreludeMiscIdUnique 133
 
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399