X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=3b9d71a2fee56150f8c728fff5c3796a45fd8749;hp=80db9ebeb023c18f60d96a08005a082631997010;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hpb=f48c36d1f3f64570b44fae1737ad34f6ce98bd7d diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 80db9eb..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,12 +221,6 @@ basicKnownKeyNames genericTyConNames :: [Name] genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName] - -ndpNames :: [Name] -ndpNames = [ parrayTyConName, paClassName, closureTyConName - , mkClosureName, applyClosureName - , mkClosurePName, applyClosurePName - , lengthPAName, replicatePAName ] \end{code} @@ -272,8 +272,6 @@ aRROW = mkBaseModule FSLIT("Control.Arrow") rANDOM = mkBaseModule FSLIT("System.Random") gLA_EXTS = mkBaseModule FSLIT("GHC.Exts") -nDP_LIFTED = mkNDPModule FSLIT("Data.Array.Parallel.Lifted") - mAIN = mkMainModule_ mAIN_NAME rOOT_MAIN = mkMainModule FSLIT(":Main") -- Root module for initialisation @@ -293,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) @@ -685,17 +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_LIFTED FSLIT("PArray") parrayTyConKey -paClassName = clsQual nDP_LIFTED FSLIT("PA") paClassKey -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 -lengthPAName = methName nDP_LIFTED FSLIT("lengthPA") lengthPAClassOpKey -replicatePAName = methName nDP_LIFTED FSLIT("replicatePA") replicatePAClassOpKey \end{code} %************************************************************************ @@ -765,8 +746,6 @@ randomClassKey = mkPreludeClassUnique 31 randomGenClassKey = mkPreludeClassUnique 32 isStringClassKey = mkPreludeClassUnique 33 - -paClassKey = mkPreludeClassUnique 34 \end{code} %************************************************************************ @@ -877,10 +856,6 @@ opaqueTyConKey = mkPreludeTyConUnique 133 stringTyConKey = mkPreludeTyConUnique 134 -parrayTyConKey = mkPreludeTyConUnique 135 -closureTyConKey = mkPreludeTyConUnique 136 - - ---------------- Template Haskell ------------------- -- USES TyConUniques 100-129 ----------------------------------------------------- @@ -1060,15 +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 -lengthPAClassOpKey = mkPreludeMiscIdUnique 131 -replicatePAClassOpKey = mkPreludeMiscIdUnique 132 - ---------------- Template Haskell ------------------- -- USES IdUniques 200-399 -----------------------------------------------------