X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=de6e5beed3faceb4bdbf9168f9342f91093449b3;hb=1ca40c2037a0e973dd73d98cd20313ecdbfeb6fc;hp=9e18d7af02abf7bcf1185de895e6beb94b122ac9;hpb=f50b78749c03124f918014cd113c68b439b032bf;p=ghc-hetmet.git

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 9e18d7a..de6e5be 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -179,7 +179,7 @@ basicKnownKeyNames
 
         -- Parallel array operations
 	nullPName, lengthPName, replicatePName,	mapPName,
-	filterPName, zipPName, crossPName, indexPName,
+	filterPName, zipPName, crossMapPName, indexPName,
 	toPName, bpermutePName, bpermuteDftPName, indexOfPName,
 
 	-- FFI primitive types that are not wired-in.
@@ -188,7 +188,7 @@ basicKnownKeyNames
 	wordTyConName, word8TyConName, word16TyConName, word32TyConName, word64TyConName,
 
 	-- Others
-	otherwiseIdName, 
+	otherwiseIdName, inlineIdName,
 	plusIntegerName, timesIntegerName,
 	eqStringName, assertName, breakpointName, breakpointCondName,
         breakpointAutoName,  opaqueTyConName, unknownTyConName, 
@@ -605,7 +605,7 @@ replicatePName	  = varQual gHC_PARR FSLIT("replicateP") 	 replicatePIdKey
 mapPName	  = varQual gHC_PARR FSLIT("mapP")       	 mapPIdKey
 filterPName	  = varQual gHC_PARR FSLIT("filterP")    	 filterPIdKey
 zipPName	  = varQual gHC_PARR FSLIT("zipP")       	 zipPIdKey
-crossPName	  = varQual gHC_PARR FSLIT("crossP")     	 crossPIdKey
+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
@@ -980,7 +980,7 @@ replicatePIdKey		      = mkPreludeMiscIdUnique 82
 mapPIdKey		      = mkPreludeMiscIdUnique 83
 filterPIdKey		      = mkPreludeMiscIdUnique 84
 zipPIdKey		      = mkPreludeMiscIdUnique 85
-crossPIdKey		      = mkPreludeMiscIdUnique 86
+crossMapPIdKey		      = mkPreludeMiscIdUnique 86
 indexPIdKey		      = mkPreludeMiscIdUnique 87
 toPIdKey		      = mkPreludeMiscIdUnique 88
 enumFromToPIdKey              = mkPreludeMiscIdUnique 89