X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=bffd07c7d4ebd1c7dd373992e4744a3f13d454ce;hb=235edf36cc202bb21c00d0e5e05ebf076fb0542e;hp=f297d89fa7d0ba5e4bd6c933ccf68b0b101d3e08;hpb=351a0212a9b4275f8cec2c5b699b1ab995e2e6e3;p=ghc-hetmet.git diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index f297d89..bffd07c 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, @@ -170,16 +175,19 @@ basicKnownKeyNames -- Stable pointers newStablePtrName, + -- GHC Extensions + groupWithName, + -- Strings and lists unpackCStringName, unpackCStringAppendName, unpackCStringFoldrName, unpackCStringUtf8Name, -- List operations - concatName, filterName, + concatName, filterName, mapName, zipName, foldrName, buildName, augmentName, appendName, -- Parallel array operations - nullPName, lengthPName, replicatePName, mapPName, + nullPName, lengthPName, replicatePName, singletonPName, mapPName, filterPName, zipPName, crossMapPName, indexPName, toPName, bpermutePName, bpermuteDftPName, indexOfPName, @@ -215,13 +223,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} @@ -264,20 +265,15 @@ tYPEABLE = mkBaseModule FSLIT("Data.Typeable") gENERICS = mkBaseModule FSLIT("Data.Generics.Basics") dOTNET = mkBaseModule FSLIT("GHC.Dotnet") rEAD_PREC = mkBaseModule FSLIT("Text.ParserCombinators.ReadPrec") -lEX = mkBaseModule FSLIT("Text.Read.Lex") +lEX = mkBaseModule FSLIT("Text.Read.Lex") gHC_INT = mkBaseModule FSLIT("GHC.Int") gHC_WORD = mkBaseModule FSLIT("GHC.Word") mONAD = mkBaseModule FSLIT("Control.Monad") mONAD_FIX = mkBaseModule FSLIT("Control.Monad.Fix") aRROW = mkBaseModule FSLIT("Control.Arrow") +gHC_DESUGAR = mkBaseModule FSLIT("GHC.Desugar") 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_INTERFACE_NAME = mkModuleNameFS FSLIT("Data.Array.Parallel.Lifted") -nDP_BUILTIN = mkModuleNameFS FSLIT(":NDP") +gHC_EXTS = mkBaseModule FSLIT("GHC.Exts") mAIN = mkMainModule_ mAIN_NAME rOOT_MAIN = mkMainModule FSLIT(":Main") -- Root module for initialisation @@ -298,12 +294,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) @@ -509,12 +499,16 @@ bindMName = methName gHC_BASE FSLIT(">>=") bindMClassOpKey returnMName = methName gHC_BASE FSLIT("return") returnMClassOpKey failMName = methName gHC_BASE FSLIT("fail") failMClassOpKey +-- Functions for GHC extensions +groupWithName = varQual gHC_EXTS FSLIT("groupWith") groupWithIdKey + -- Random PrelBase functions fromStringName = methName dATA_STRING FSLIT("fromString") fromStringClassOpKey otherwiseIdName = varQual gHC_BASE FSLIT("otherwise") otherwiseIdKey foldrName = varQual gHC_BASE FSLIT("foldr") foldrIdKey buildName = varQual gHC_BASE FSLIT("build") buildIdKey augmentName = varQual gHC_BASE FSLIT("augment") augmentIdKey +mapName = varQual gHC_BASE FSLIT("map") mapIdKey appendName = varQual gHC_BASE FSLIT("++") appendIdKey andName = varQual gHC_BASE FSLIT("&&") andIdKey orName = varQual gHC_BASE FSLIT("||") orIdKey @@ -616,6 +610,7 @@ enumFromToPName = varQual gHC_PARR FSLIT("enumFromToP") enumFromToPIdKey enumFromThenToPName= varQual gHC_PARR FSLIT("enumFromThenToP") enumFromThenToPIdKey nullPName = varQual gHC_PARR FSLIT("nullP") nullPIdKey lengthPName = varQual gHC_PARR FSLIT("lengthP") lengthPIdKey +singletonPName = varQual gHC_PARR FSLIT("singletonP") singletonPIdKey replicatePName = varQual gHC_PARR FSLIT("replicateP") replicatePIdKey mapPName = varQual gHC_PARR FSLIT("mapP") mapPIdKey filterPName = varQual gHC_PARR FSLIT("filterP") filterPIdKey @@ -669,7 +664,7 @@ mfixName = methName mONAD_FIX FSLIT("mfix") mfixIdKey -- Arrow notation arrAName = varQual aRROW FSLIT("arr") arrAIdKey -composeAName = varQual aRROW FSLIT(">>>") composeAIdKey +composeAName = varQual gHC_DESUGAR FSLIT(">>>") composeAIdKey firstAName = varQual aRROW FSLIT("first") firstAIdKey appAName = varQual aRROW FSLIT("app") appAIdKey choiceAName = varQual aRROW FSLIT("|||") choiceAIdKey @@ -690,21 +685,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} %************************************************************************ @@ -884,11 +864,6 @@ opaqueTyConKey = mkPreludeTyConUnique 133 stringTyConKey = mkPreludeTyConUnique 134 -parrayTyConKey = mkPreludeTyConUnique 135 -closureTyConKey = mkPreludeTyConUnique 136 -paTyConKey = mkPreludeTyConUnique 137 - - ---------------- Template Haskell ------------------- -- USES TyConUniques 100-129 ----------------------------------------------------- @@ -1007,7 +982,11 @@ breakpointAutoJumpIdKey = mkPreludeMiscIdUnique 67 inlineIdKey = mkPreludeMiscIdUnique 68 +mapIdKey = mkPreludeMiscIdUnique 69 +groupWithIdKey = mkPreludeMiscIdUnique 70 + -- Parallel array functions +singletonPIdKey = mkPreludeMiscIdUnique 79 nullPIdKey = mkPreludeMiscIdUnique 80 lengthPIdKey = mkPreludeMiscIdUnique 81 replicatePIdKey = mkPreludeMiscIdUnique 82 @@ -1068,19 +1047,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 -----------------------------------------------------