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

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 9078982..282765b 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -104,6 +104,7 @@ basicKnownKeyNames :: [Name]
 basicKnownKeyNames
  = genericTyConNames
  ++ typeableClassNames
+ ++ ndpNames
  ++ [	-- Type constructors (synonyms especially)
 	ioTyConName, ioDataConName,
 	runMainIOName,
@@ -214,6 +215,12 @@ basicKnownKeyNames
 
 genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
+
+ndpNames :: [Name]
+ndpNames = [ parrayTyConName, paClassName, closureTyConName
+           , mkClosureName, applyClosureName
+           , mkClosurePName, applyClosurePName
+           , lengthPAName, replicatePAName, emptyPAName ]
 \end{code}
 
 
@@ -265,6 +272,9 @@ aRROW		= mkBaseModule FSLIT("Control.Arrow")
 rANDOM		= mkBaseModule FSLIT("System.Random")
 gLA_EXTS	= mkBaseModule FSLIT("GHC.Exts")
 
+nDP_PARRAY      = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
+nDP_CLOSURE     = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
+
 mAIN	        = mkMainModule_ mAIN_NAME
 rOOT_MAIN	= mkMainModule FSLIT(":Main") -- Root module for initialisation 
 
@@ -284,6 +294,12 @@ mkBaseModule m = mkModule basePackageId (mkModuleNameFS m)
 mkBaseModule_ :: ModuleName -> Module
 mkBaseModule_ m = mkModule basePackageId m
 
+mkNDPModule :: FastString -> Module
+mkNDPModule m = mkModule ndpPackageId (mkModuleNameFS m)
+
+mkNDPModule_ :: ModuleName -> Module
+mkNDPModule_ m = mkModule ndpPackageId m
+
 mkMainModule :: FastString -> Module
 mkMainModule m = mkModule mainPackageId (mkModuleNameFS m)
 
@@ -670,6 +686,18 @@ marshalObjectName   = varQual  dOTNET FSLIT("marshalObject") marshalObjectIdKey
 marshalStringName   = varQual  dOTNET FSLIT("marshalString") marshalStringIdKey
 unmarshalStringName = varQual  dOTNET FSLIT("unmarshalString") unmarshalStringIdKey
 checkDotnetResName  = varQual  dOTNET FSLIT("checkResult")     checkDotnetResNameIdKey
+
+-- 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
+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}
 
 %************************************************************************
@@ -739,6 +767,8 @@ randomClassKey		= mkPreludeClassUnique 31
 randomGenClassKey	= mkPreludeClassUnique 32
 
 isStringClassKey	= mkPreludeClassUnique 33
+
+paClassKey              = mkPreludeClassUnique 34
 \end{code}
 
 %************************************************************************
@@ -849,6 +879,9 @@ opaqueTyConKey                          = mkPreludeTyConUnique 133
 
 stringTyConKey				= mkPreludeTyConUnique 134
 
+parrayTyConKey                          = mkPreludeTyConUnique 135
+closureTyConKey                         = mkPreludeTyConUnique 136
+
 
 ---------------- Template Haskell -------------------
 --	USES TyConUniques 100-129
@@ -1029,6 +1062,16 @@ loopAIdKey	= mkPreludeMiscIdUnique 124
 
 fromStringClassOpKey	      = mkPreludeMiscIdUnique 125
 
+-- Flattened parallel array functions
+mkClosureIdKey                = mkPreludeMiscIdUnique 126
+applyClosureIdKey             = mkPreludeMiscIdUnique 127
+mkClosurePIdKey               = mkPreludeMiscIdUnique 128
+applyClosurePIdKey            = mkPreludeMiscIdUnique 129
+closurePAIdKey                = mkPreludeMiscIdUnique 130
+lengthPAClassOpKey            = mkPreludeMiscIdUnique 131
+replicatePAClassOpKey         = mkPreludeMiscIdUnique 132
+emptyPAClassOpKey             = mkPreludeMiscIdUnique 133
+
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399
 -----------------------------------------------------