FIX BUILD with ghc-6.4.x

[ghc-hetmet.git] / compiler / prelude / PrelNames.lhs

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 33912e9..bffd07c 100644 (file)
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -56,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 )
@@ -176,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,
 
@@ -263,14 +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")
+gHC_EXTS       = mkBaseModule FSLIT("GHC.Exts")
 
 mAIN           = mkMainModule_ mAIN_NAME
 rOOT_MAIN      = mkMainModule FSLIT(":Main") -- Root module for initialisation 
@@ -496,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
@@ -603,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
@@ -656,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
@@ -974,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