Repository : ssh://g...@git.haskell.org/ghc
On branch : ghc-lwc2
Link :
http://ghc.haskell.org/trac/ghc/changeset/9b98c6de7da094d2c8e77f0fe6a6fb4e6bd15069/ghc
>---------------------------------------------------------------
commit 9b98c6de7da094d2c8e77f0fe6a6fb4e6bd15069
Merge: eb0c7f8 fa3ffb4
Author: KC Sivaramakrishnan <chand...@cs.purdue.edu>
Date: Fri Sep 27 17:30:39 2013 -0400
Merging master
>---------------------------------------------------------------
9b98c6de7da094d2c8e77f0fe6a6fb4e6bd15069
compiler/basicTypes/MkId.lhs | 19 +++++++++++++++++--
compiler/ghci/RtClosureInspect.hs | 1 +
compiler/prelude/PrelNames.lhs | 8 +++++++-
compiler/prelude/TysPrim.lhs | 15 ++++++++++++++-
docs/users_guide/7.8.1-notes.xml | 11 +++++++++++
docs/users_guide/glasgow_exts.xml | 16 +++++++++-------
libraries/vector | 2 +-
packages | 4 ++--
8 files changed, 62 insertions(+), 14 deletions(-)
diff --cc compiler/prelude/TysPrim.lhs
index cf17a0f,6e653d0..13b04c6
--- a/compiler/prelude/TysPrim.lhs
+++ b/compiler/prelude/TysPrim.lhs
@@@ -48,9 -48,11 +48,11 @@@ module TysPrim
statePrimTyCon, mkStatePrimTy,
realWorldTyCon, realWorldTy, realWorldStatePrimTy,
+ proxyPrimTyCon, mkProxyPrimTy,
+
- arrayPrimTyCon, mkArrayPrimTy,
+ arrayPrimTyCon, mkArrayPrimTy,
byteArrayPrimTyCon, byteArrayPrimTy,
- arrayArrayPrimTyCon, mkArrayArrayPrimTy,
+ arrayArrayPrimTyCon, mkArrayArrayPrimTy,
mutableArrayPrimTyCon, mkMutableArrayPrimTy,
mutableByteArrayPrimTyCon, mkMutableByteArrayPrimTy,
mutableArrayArrayPrimTyCon, mkMutableArrayArrayPrimTy,
@@@ -127,8 -128,8 +129,9 @@@ primTyCon
, stablePtrPrimTyCon
, stableNamePrimTyCon
, statePrimTyCon
+ , proxyPrimTyCon
, threadIdPrimTyCon
+ , sContPrimTyCon
, wordPrimTyCon
, word32PrimTyCon
, word64PrimTyCon
@@@ -153,7 -154,7 +156,7 @@@ mkPrimTc fs unique tyco
(ATyCon tycon) -- Relevant TyCon
UserSyntax -- None are built-in syntax
- charPrimTyConName, intPrimTyConName, int32PrimTyConName, int64PrimTyConName,
wordPrimTyConName, word32PrimTyConName, word64PrimTyConName, addrPrimTyConName,
floatPrimTyConName, doublePrimTyConName, statePrimTyConName,
realWorldTyConName, arrayPrimTyConName, arrayArrayPrimTyConName,
byteArrayPrimTyConName, mutableArrayPrimTyConName,
mutableByteArrayPrimTyConName, mutableArrayArrayPrimTyConName,
mutVarPrimTyConName, mVarPrimTyConName, tVarPrimTyConName,
stablePtrPrimTyConName, stableNamePrimTyConName, bcoPrimTyConName,
weakPrimTyConName, threadIdPrimTyConName, sContPrimTyConName, eqPrimTyConName,
eqReprPrimTyConName :: Name
-charPrimTyConName, intPrimTyConName, int32PrimTyConName, int64PrimTyConName,
wordPrimTyConName, word32PrimTyConName, word64PrimTyConName, addrPrimTyConName,
floatPrimTyConName, doublePrimTyConName, statePrimTyConName,
proxyPrimTyConName, realWorldTyConName, arrayPrimTyConName,
arrayArrayPrimTyConName, byteArrayPrimTyConName, mutableArrayPrimTyConName,
mutableByteArrayPrimTyConName, mutableArrayArrayPrimTyConName,
mutVarPrimTyConName, mVarPrimTyConName, tVarPrimTyConName,
stablePtrPrimTyConName, stableNamePrimTyConName, bcoPrimTyConName,
weakPrimTyConName, threadIdPrimTyConName, eqPrimTyConName, eqReprPrimTyConName
:: Name
++charPrimTyConName, intPrimTyConName, int32PrimTyConName, int64PrimTyConName,
wordPrimTyConName, word32PrimTyConName, word64PrimTyConName, addrPrimTyConName,
floatPrimTyConName, doublePrimTyConName, statePrimTyConName,
proxyPrimTyConName, realWorldTyConName, arrayPrimTyConName,
arrayArrayPrimTyConName, byteArrayPrimTyConName, mutableArrayPrimTyConName,
mutableByteArrayPrimTyConName, mutableArrayArrayPrimTyConName,
mutVarPrimTyConName, mVarPrimTyConName, tVarPrimTyConName,
stablePtrPrimTyConName, stableNamePrimTyConName, bcoPrimTyConName,
weakPrimTyConName, threadIdPrimTyConName, sContPrimTyConName, eqPrimTyConName,
eqReprPrimTyConName :: Name
charPrimTyConName = mkPrimTc (fsLit "Char#") charPrimTyConKey
charPrimTyCon
intPrimTyConName = mkPrimTc (fsLit "Int#") intPrimTyConKey
intPrimTyCon
int32PrimTyConName = mkPrimTc (fsLit "Int32#") int32PrimTyConKey
int32PrimTyCon
diff --cc libraries/vector
index 092c051,9baab44..36e221d
--- a/libraries/vector
+++ b/libraries/vector
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 092c051e2918fa8fcd71d2971402fbe3710afb07
-Subproject commit 9baab444a57c4a225ee247fea27187d1892d90bf
++Subproject commit 36e221d646ae1270a6bde6b9f798c2e94c8bbde8
diff --cc packages
index 893c291,3ba13b9..3a9d4a6
--- a/packages
+++ b/packages
@@@ -82,7 -81,7 +82,7 @@@ nofib nofi
libraries/parallel extra packages/parallel.git -
libraries/stm extra packages/stm.git -
libraries/random dph - -
- libraries/primitive dph -
http://git.haskell.org/darcs-mirrors/primitive.git
- libraries/vector dph -
http://git.haskell.org/darcs-mirrors/vector.git
+ libraries/primitive dph -
https://github.com/haskell/primitive.git
+ libraries/vector dph -
https://github.com/haskell/vector.git
libraries/dph dph packages/dph.git -
-. - ghc.git -
+. - ghc.git -
_______________________________________________
ghc-commits mailing list
ghc-commits@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-commits
