X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=16ec9a910e31c8e959e06ac50c053a7d53c98f23;hp=1f2d901b284bdc5243419eb6a72e248a3e2a872c;hb=1a7d1b77334529ca96ed4cbc03fcb5f55dc2de4a;hpb=c7852c6f0e7d22c5dc9b7171d4e6f36a12616990

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 1f2d901..16ec9a9 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/Commentary/CodingStyle#Warnings
+-- for details
+
 module PrelNames (
 	Unique, Uniquable(..), hasKey, 	-- Re-exported for convenience
 
@@ -49,8 +56,7 @@ module PrelNames (
 
 #include "HsVersions.h"
 
-import PackageConfig
-import Module	  ( Module, ModuleName, mkModule, mkModuleNameFS )
+import Module
 import OccName	  ( dataName, tcName, clsName, varName, mkOccNameFS,
 		    mkVarOccFS )
 import RdrName	  ( RdrName, nameRdrName, mkOrig, rdrNameOcc, mkUnqual )
@@ -104,7 +110,6 @@ basicKnownKeyNames :: [Name]
 basicKnownKeyNames
  = genericTyConNames
  ++ typeableClassNames
- ++ ndpNames
  ++ [	-- Type constructors (synonyms especially)
 	ioTyConName, ioDataConName,
 	runMainIOName,
@@ -215,12 +220,6 @@ basicKnownKeyNames
 
 genericTyConNames :: [Name]
 genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName]
-
-ndpNames :: [Name]
-ndpNames = [ parrayTyConName, paTyConName, closureTyConName
-           , mkClosureName, applyClosureName
-           , mkClosurePName, applyClosurePName
-           , lengthPAName, replicatePAName, emptyPAName ]
 \end{code}
 
 
@@ -272,11 +271,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_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 
 
@@ -296,12 +290,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)
 
@@ -688,18 +676,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
-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}
 
 %************************************************************************
@@ -879,11 +855,6 @@ opaqueTyConKey                          = mkPreludeTyConUnique 133
 
 stringTyConKey				= mkPreludeTyConUnique 134
 
-parrayTyConKey                          = mkPreludeTyConUnique 135
-closureTyConKey                         = mkPreludeTyConUnique 136
-paTyConKey                              = mkPreludeTyConUnique 137
-
-
 ---------------- Template Haskell -------------------
 --	USES TyConUniques 100-129
 -----------------------------------------------------
@@ -1063,16 +1034,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
-
 ---------------- Template Haskell -------------------
 --	USES IdUniques 200-399
 -----------------------------------------------------