X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=3b9d71a2fee56150f8c728fff5c3796a45fd8749;hp=5602a6c53629337ff62f746da2ec7eecfe4916e5;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hpb=835609b97d5f392ece196cf2c4b069ffcc4b789f

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 5602a6c..3b9d71a 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -36,6 +36,13 @@ Nota Bene: all Names defined in here should come from the base package
 
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
+-- for details
+
 module PrelNames (
 	Unique, Uniquable(..), hasKey, 	-- Re-exported for convenience
 
@@ -104,7 +111,6 @@ basicKnownKeyNames :: [Name]
 basicKnownKeyNames
  = genericTyConNames
  ++ typeableClassNames
- ++ ndpNames
  ++ [	-- Type constructors (synonyms especially)
 	ioTyConName, ioDataConName,
 	runMainIOName,
@@ -215,13 +221,6 @@ basicKnownKeyNames
 
 genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
-
-ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, closureTyConName
-           , mkClosureName, applyClosureName
-           , mkClosurePName, applyClosurePName
-           , lengthPAName, replicatePAName, emptyPAName, packPAName,
-             combinePAName, intEqPAName ]
 \end{code}
 
 
@@ -273,11 +272,6 @@ 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_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 
 
@@ -297,12 +291,6 @@ 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)
 
@@ -689,21 +677,6 @@ 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
-paTyConName         = tcQual   nDP_PARRAY FSLIT("PA")     paTyConKey
-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}
 
 %************************************************************************
@@ -883,11 +856,6 @@ opaqueTyConKey                          = mkPreludeTyConUnique 133
 
 stringTyConKey				= mkPreludeTyConUnique 134
 
-parrayTyConKey                          = mkPreludeTyConUnique 135
-closureTyConKey                         = mkPreludeTyConUnique 136
-paTyConKey                              = mkPreludeTyConUnique 137
-
-
 ---------------- Template Haskell -------------------
 --	USES TyConUniques 100-129
 -----------------------------------------------------
@@ -1067,19 +1035,6 @@ 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
-lengthPAIdKey                 = mkPreludeMiscIdUnique 131
-replicatePAIdKey              = mkPreludeMiscIdUnique 132
-emptyPAIdKey                  = mkPreludeMiscIdUnique 133
-packPAIdKey                   = mkPreludeMiscIdUnique 134
-combinePAIdKey                = mkPreludeMiscIdUnique 135
-intEqPAIdKey                  = mkPreludeMiscIdUnique 136
-
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399
 -----------------------------------------------------