X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=187926161a5aa0362a43dc3735ffa152ce57835d;hb=ac808e641e285df89b8f1bcda95b6e859bb4e4ab;hp=b5f1eef050d485182715c67f4f6a7046be85ad31;hpb=2378b2325df64a5ccc5b2e038ac3dbb848dea5f7;p=ghc-hetmet.git

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index b5f1eef..1879261 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -182,7 +182,7 @@ basicKnownKeyNames
         -- Parallel array operations
 	nullPName, lengthPName, replicatePName,	singletonPName, mapPName,
 	filterPName, zipPName, crossMapPName, indexPName,
-	toPName, bpermutePName, bpermuteDftPName, indexOfPName,
+	toPName, emptyPName, appPName,
 
 	-- FFI primitive types that are not wired-in.
 	stablePtrTyConName, ptrTyConName, funPtrTyConName,
@@ -272,7 +272,7 @@ gHC_TOP_HANDLER	= mkBaseModule (fsLit "GHC.TopHandler")
 sYSTEM_IO	= mkBaseModule (fsLit "System.IO")
 dYNAMIC		= mkBaseModule (fsLit "Data.Dynamic")
 tYPEABLE	= mkBaseModule (fsLit "Data.Typeable")
-gENERICS	= mkBaseModule (fsLit "Data.Generics.Basics")
+gENERICS	= mkSybModule (fsLit "Data.Generics.Basics")
 dOTNET		= mkBaseModule (fsLit "GHC.Dotnet")
 rEAD_PREC	= mkBaseModule (fsLit "Text.ParserCombinators.ReadPrec")
 lEX		    = mkBaseModule (fsLit "Text.Read.Lex")
@@ -314,6 +314,9 @@ mkBaseModule m = mkModule basePackageId (mkModuleNameFS m)
 mkBaseModule_ :: ModuleName -> Module
 mkBaseModule_ m = mkModule basePackageId m
 
+mkSybModule :: FastString -> Module
+mkSybModule m = mkModule sybPackageId (mkModuleNameFS m)
+
 mkMainModule :: FastString -> Module
 mkMainModule m = mkModule mainPackageId (mkModuleNameFS m)
 
@@ -702,8 +705,8 @@ readClassName	   = clsQual gHC_READ (fsLit "Read") readClassKey
 -- parallel array types and functions
 enumFromToPName, enumFromThenToPName, nullPName, lengthPName,
     singletonPName, replicatePName, mapPName, filterPName,
-    zipPName, crossMapPName, indexPName, toPName, bpermutePName,
-    bpermuteDftPName, indexOfPName :: Name
+    zipPName, crossMapPName, indexPName, toPName,
+    emptyPName, appPName :: Name
 enumFromToPName	   = varQual gHC_PARR (fsLit "enumFromToP") enumFromToPIdKey
 enumFromThenToPName= varQual gHC_PARR (fsLit "enumFromThenToP") enumFromThenToPIdKey
 nullPName	  = varQual gHC_PARR (fsLit "nullP")      	 nullPIdKey
@@ -716,9 +719,8 @@ zipPName	  = varQual gHC_PARR (fsLit "zipP")       	 zipPIdKey
 crossMapPName	  = varQual gHC_PARR (fsLit "crossMapP")     	 crossMapPIdKey
 indexPName	  = varQual gHC_PARR (fsLit "!:")	       	 indexPIdKey
 toPName	          = varQual gHC_PARR (fsLit "toP")	       	 toPIdKey
-bpermutePName     = varQual gHC_PARR (fsLit "bpermuteP")    bpermutePIdKey
-bpermuteDftPName  = varQual gHC_PARR (fsLit "bpermuteDftP") bpermuteDftPIdKey
-indexOfPName      = varQual gHC_PARR (fsLit "indexOfP")     indexOfPIdKey
+emptyPName        = varQual gHC_PARR (fsLit "emptyP")            emptyPIdKey
+appPName          = varQual gHC_PARR (fsLit "+:+")               appPIdKey
 
 -- IOBase things
 ioTyConName, ioDataConName, thenIOName, bindIOName, returnIOName,
@@ -1174,8 +1176,7 @@ groupWithIdKey        = mkPreludeMiscIdUnique 70
 -- Parallel array functions
 singletonPIdKey, nullPIdKey, lengthPIdKey, replicatePIdKey, mapPIdKey,
     filterPIdKey, zipPIdKey, crossMapPIdKey, indexPIdKey, toPIdKey,
-    enumFromToPIdKey, enumFromThenToPIdKey,
-    bpermutePIdKey, bpermuteDftPIdKey, indexOfPIdKey :: Unique
+    enumFromToPIdKey, enumFromThenToPIdKey, emptyPIdKey, appPIdKey :: Unique
 singletonPIdKey               = mkPreludeMiscIdUnique 79
 nullPIdKey	              = mkPreludeMiscIdUnique 80
 lengthPIdKey		      = mkPreludeMiscIdUnique 81
@@ -1188,9 +1189,8 @@ indexPIdKey		      = mkPreludeMiscIdUnique 87
 toPIdKey		      = mkPreludeMiscIdUnique 88
 enumFromToPIdKey              = mkPreludeMiscIdUnique 89
 enumFromThenToPIdKey          = mkPreludeMiscIdUnique 90
-bpermutePIdKey		      = mkPreludeMiscIdUnique 91
-bpermuteDftPIdKey	      = mkPreludeMiscIdUnique 92
-indexOfPIdKey		      = mkPreludeMiscIdUnique 93
+emptyPIdKey                   = mkPreludeMiscIdUnique 91
+appPIdKey                     = mkPreludeMiscIdUnique 92
 
 -- dotnet interop
 unmarshalObjectIdKey, marshalObjectIdKey, marshalStringIdKey,