projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Outputable.cparen
[ghc-hetmet.git]
/
compiler
/
prelude
/
PrelNames.lhs
diff --git
a/compiler/prelude/PrelNames.lhs
b/compiler/prelude/PrelNames.lhs
index
35c828f
..
8d571b6
100644
(file)
--- a/
compiler/prelude/PrelNames.lhs
+++ b/
compiler/prelude/PrelNames.lhs
@@
-179,7
+179,7
@@
basicKnownKeyNames
-- Parallel array operations
nullPName, lengthPName, replicatePName, mapPName,
-- 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.
toPName, bpermutePName, bpermuteDftPName, indexOfPName,
-- FFI primitive types that are not wired-in.
@@
-238,6
+238,7
@@
gHC_LIST = mkBaseModule FSLIT("GHC.List")
gHC_PARR = mkBaseModule FSLIT("GHC.PArr")
dATA_TUP = mkBaseModule FSLIT("Data.Tuple")
dATA_EITHER = mkBaseModule FSLIT("Data.Either")
gHC_PARR = mkBaseModule FSLIT("GHC.PArr")
dATA_TUP = mkBaseModule FSLIT("Data.Tuple")
dATA_EITHER = mkBaseModule FSLIT("Data.Either")
+dATA_STRING = mkBaseModule FSLIT("Data.String")
gHC_PACK = mkBaseModule FSLIT("GHC.Pack")
gHC_CONC = mkBaseModule FSLIT("GHC.Conc")
gHC_IO_BASE = mkBaseModule FSLIT("GHC.IOBase")
gHC_PACK = mkBaseModule FSLIT("GHC.Pack")
gHC_CONC = mkBaseModule FSLIT("GHC.Conc")
gHC_IO_BASE = mkBaseModule FSLIT("GHC.IOBase")
@@
-490,7
+491,7
@@
returnMName = methName gHC_BASE FSLIT("return") returnMClassOpKey
failMName = methName gHC_BASE FSLIT("fail") failMClassOpKey
-- Random PrelBase functions
failMName = methName gHC_BASE FSLIT("fail") failMClassOpKey
-- Random PrelBase functions
-fromStringName = methName gHC_BASE FSLIT("fromString") fromStringClassOpKey
+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
otherwiseIdName = varQual gHC_BASE FSLIT("otherwise") otherwiseIdKey
foldrName = varQual gHC_BASE FSLIT("foldr") foldrIdKey
buildName = varQual gHC_BASE FSLIT("build") buildIdKey
@@
-604,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
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
indexPName = varQual gHC_PARR FSLIT("!:") indexPIdKey
toPName = varQual gHC_PARR FSLIT("toP") toPIdKey
bpermutePName = varQual gHC_PARR FSLIT("bpermuteP") bpermutePIdKey
@@
-663,7
+664,7
@@
loopAName = varQual aRROW FSLIT("loop") loopAIdKey
monadPlusClassName = clsQual mONAD FSLIT("MonadPlus") monadPlusClassKey
randomClassName = clsQual rANDOM FSLIT("Random") randomClassKey
randomGenClassName = clsQual rANDOM FSLIT("RandomGen") randomGenClassKey
monadPlusClassName = clsQual mONAD FSLIT("MonadPlus") monadPlusClassKey
randomClassName = clsQual rANDOM FSLIT("Random") randomClassKey
randomGenClassName = clsQual rANDOM FSLIT("RandomGen") randomGenClassKey
-isStringClassName = clsQual gHC_BASE FSLIT("IsString") isStringClassKey
+isStringClassName = clsQual dATA_STRING FSLIT("IsString") isStringClassKey
-- dotnet interop
objectTyConName = tcQual dOTNET FSLIT("Object") objectTyConKey
-- dotnet interop
objectTyConName = tcQual dOTNET FSLIT("Object") objectTyConKey
@@
-979,7
+980,7
@@
replicatePIdKey = mkPreludeMiscIdUnique 82
mapPIdKey = mkPreludeMiscIdUnique 83
filterPIdKey = mkPreludeMiscIdUnique 84
zipPIdKey = mkPreludeMiscIdUnique 85
mapPIdKey = mkPreludeMiscIdUnique 83
filterPIdKey = mkPreludeMiscIdUnique 84
zipPIdKey = mkPreludeMiscIdUnique 85
-crossPIdKey = mkPreludeMiscIdUnique 86
+crossMapPIdKey = mkPreludeMiscIdUnique 86
indexPIdKey = mkPreludeMiscIdUnique 87
toPIdKey = mkPreludeMiscIdUnique 88
enumFromToPIdKey = mkPreludeMiscIdUnique 89
indexPIdKey = mkPreludeMiscIdUnique 87
toPIdKey = mkPreludeMiscIdUnique 88
enumFromToPIdKey = mkPreludeMiscIdUnique 89