Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/c9806009090c2e9d465bd472a47fafee05345f2d >--------------------------------------------------------------- commit c9806009090c2e9d465bd472a47fafee05345f2d Merge: 6b2e060... f7d99de... Author: Jose Pedro Magalhaes <[email protected]> Date: Mon Nov 21 08:10:15 2011 +0000 Merge remote branch 'origin/master' into ghc-kinds Conflicts: compiler/typecheck/TcHsType.lhs compiler/basicTypes/DataCon.lhs | 9 +- compiler/basicTypes/Literal.lhs | 6 +- compiler/basicTypes/MkId.lhs | 10 +- compiler/basicTypes/Module.lhs | 111 +- compiler/basicTypes/OccName.lhs | 28 +- compiler/codeGen/CgCase.lhs | 18 +- compiler/coreSyn/CoreArity.lhs | 193 ++- compiler/coreSyn/CoreLint.lhs | 91 +- compiler/coreSyn/CoreSubst.lhs | 15 +- compiler/coreSyn/CoreSyn.lhs | 30 +- compiler/coreSyn/CoreUnfold.lhs | 106 +- compiler/coreSyn/CoreUtils.lhs | 130 +- compiler/deSugar/Desugar.lhs | 7 +- compiler/deSugar/DsBinds.lhs | 29 +- compiler/deSugar/DsCCall.lhs | 4 +- compiler/deSugar/DsMeta.hs | 8 +- compiler/deSugar/DsMonad.lhs | 28 +- compiler/deSugar/DsUtils.lhs | 10 +- compiler/ghc.cabal.in | 8 +- compiler/ghc.mk | 25 +- compiler/ghci/ObjLink.lhs | 15 +- compiler/hsSyn/Convert.lhs | 2 +- compiler/hsSyn/HsBinds.lhs | 17 +- compiler/hsSyn/HsExpr.lhs | 19 +- compiler/hsSyn/HsTypes.lhs | 28 +- compiler/hsSyn/HsUtils.lhs | 17 +- compiler/iface/BuildTyCl.lhs | 6 +- compiler/iface/LoadIface.lhs | 3 +- compiler/iface/MkIface.lhs | 2 +- compiler/llvmGen/LlvmMangler.hs | 46 +- compiler/main/DriverPipeline.hs | 74 +- compiler/main/DynFlags.hs | 42 +- compiler/main/ErrUtils.lhs | 168 +- compiler/main/ErrUtils.lhs-boot | 1 + compiler/main/GHC.hs | 11 +- compiler/main/HscMain.hs | 117 ++- compiler/main/HscTypes.lhs | 25 + compiler/nativeGen/X86/CodeGen.hs | 49 +- compiler/parser/Lexer.x | 6 + compiler/parser/Parser.y.pp | 26 +- compiler/prelude/PrelNames.lhs | 12 +- compiler/prelude/PrelRules.lhs | 3 + compiler/prelude/TysPrim.lhs | 16 +- compiler/prelude/primops.txt.pp | 25 +- compiler/rename/RnExpr.lhs | 7 +- compiler/rename/RnSource.lhs | 3 +- compiler/simplCore/CoreMonad.lhs | 9 +- compiler/simplCore/OccurAnal.lhs | 4 +- compiler/simplCore/SetLevels.lhs | 4 +- compiler/simplCore/SimplCore.lhs | 9 +- compiler/simplCore/SimplUtils.lhs | 71 +- compiler/simplCore/Simplify.lhs | 35 +- compiler/specialise/SpecConstr.lhs | 4 +- compiler/specialise/Specialise.lhs | 2 +- compiler/typecheck/Inst.lhs | 71 +- compiler/typecheck/TcCanonical.lhs | 1361 +++++++++++------ compiler/typecheck/TcErrors.lhs | 48 +- compiler/typecheck/TcGenDeriv.lhs | 27 +- compiler/typecheck/TcHsSyn.lhs | 12 +- compiler/typecheck/TcHsType.lhs | 333 ++--- compiler/typecheck/TcInstDcls.lhs | 1 - compiler/typecheck/TcInteract.lhs | 1664 +++++++------------- compiler/typecheck/TcMType.lhs | 40 +- compiler/typecheck/TcMatches.lhs | 2 - compiler/typecheck/TcRnDriver.lhs | 32 +- compiler/typecheck/TcRnMonad.lhs | 15 + compiler/typecheck/TcRnTypes.lhs | 196 ++- compiler/typecheck/TcSMonad.lhs | 1211 ++++++++++---- compiler/typecheck/TcSimplify.lhs | 522 ++++--- compiler/typecheck/TcSplice.lhs | 2 +- compiler/typecheck/TcType.lhs | 41 +- compiler/typecheck/TcUnify.lhs | 1 - compiler/types/Coercion.lhs | 120 +- compiler/types/FunDeps.lhs | 10 +- compiler/types/Type.lhs | 37 +- compiler/types/TypeRep.lhs | 21 +- compiler/utils/Bag.lhs | 1 + compiler/utils/Outputable.lhs | 296 ++-- compiler/vectorise/Vectorise.hs | 19 +- compiler/vectorise/Vectorise/Builtins.hs | 2 +- compiler/vectorise/Vectorise/Builtins/Base.hs | 24 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 76 +- compiler/vectorise/Vectorise/Env.hs | 3 +- compiler/vectorise/Vectorise/Exp.hs | 319 +++-- .../vectorise/Vectorise/Generic/Description.hs | 285 ++++ .../Vectorise/{Type => Generic}/PADict.hs | 55 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 543 +++++++ compiler/vectorise/Vectorise/Generic/PData.hs | 151 ++ compiler/vectorise/Vectorise/Monad.hs | 33 +- compiler/vectorise/Vectorise/Monad/Base.hs | 4 + compiler/vectorise/Vectorise/Type/Env.hs | 102 +- compiler/vectorise/Vectorise/Type/PData.hs | 87 - compiler/vectorise/Vectorise/Type/PRepr.hs | 10 +- compiler/vectorise/Vectorise/Type/Repr.hs | 107 -- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 6 - compiler/vectorise/Vectorise/Type/Type.hs | 80 +- compiler/vectorise/Vectorise/Utils.hs | 19 +- compiler/vectorise/Vectorise/Utils/Base.hs | 117 +- compiler/vectorise/Vectorise/Utils/Closure.hs | 100 +- compiler/vectorise/Vectorise/Utils/Hoisting.hs | 75 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 2 +- compiler/vectorise/Vectorise/Utils/Poly.hs | 22 +- compiler/vectorise/Vectorise/Var.hs | 114 +- compiler/vectorise/Vectorise/Vect.hs | 149 +- docs/man/ghc.mk | 2 +- docs/users_guide/ffi-chap.xml | 114 +- docs/users_guide/flags.xml | 17 +- docs/users_guide/glasgow_exts.xml | 65 +- docs/users_guide/phases.xml | 24 + docs/users_guide/runtime_control.xml | 37 +- docs/users_guide/separate_compilation.xml | 15 +- docs/users_guide/using.xml | 14 + driver/ghci/ghc.mk | 6 +- ghc.mk | 91 +- ghc/ghc.mk | 4 +- includes/Rts.h | 1 + includes/RtsAPI.h | 46 +- includes/RtsOpts.h | 20 - includes/ghc.mk | 2 +- rts/RtsMain.h => includes/rts/Main.h | 4 +- libffi/ghc.mk | 16 +- mk/tree.mk | 21 + mk/validate-settings.mk | 6 +- rts/Exception.cmm | 39 +- rts/Linker.c | 27 +- rts/Main.c | 24 - rts/RtsFlags.c | 26 +- rts/RtsFlags.h | 4 +- rts/RtsMain.c | 17 +- rts/RtsStartup.c | 15 +- rts/StgCRun.c | 868 +++++----- rts/ThreadPaused.c | 132 +- rts/ghc.mk | 13 +- rts/hooks/RtsOpts.c | 14 - rules/build-dependencies.mk | 6 +- rules/build-package-way.mk | 4 +- rules/build-package.mk | 4 +- rules/build-perl.mk | 2 +- rules/clean-target.mk | 2 +- rules/docbook.mk | 2 +- rules/manual-package-config.mk | 2 +- rules/shell-wrapper.mk | 4 +- sync-all | 5 + utils/ghc-pkg/ghc.mk | 10 +- utils/mkdirhier/ghc.mk | 2 +- utils/runghc/ghc.mk | 2 +- validate | 85 +- 147 files changed, 7150 insertions(+), 4976 deletions(-) diff --cc compiler/basicTypes/OccName.lhs index fa86350,9f8f32d..9f8f32d mode 100755,100644..100755 --- a/compiler/basicTypes/OccName.lhs +++ b/compiler/basicTypes/OccName.lhs diff --cc compiler/coreSyn/CoreLint.lhs index c008d55,f6627f3..f6627f3 mode 100755,100644..100755 --- a/compiler/coreSyn/CoreLint.lhs +++ b/compiler/coreSyn/CoreLint.lhs diff --cc compiler/coreSyn/CoreUtils.lhs index c4b3019,851486b..851486b mode 100755,100644..100755 --- a/compiler/coreSyn/CoreUtils.lhs +++ b/compiler/coreSyn/CoreUtils.lhs diff --cc compiler/deSugar/Desugar.lhs index a9701ff,e88b57e..e88b57e mode 100755,100644..100755 --- a/compiler/deSugar/Desugar.lhs +++ b/compiler/deSugar/Desugar.lhs diff --cc compiler/hsSyn/HsBinds.lhs index c372878,b6bc0c7..b6bc0c7 mode 100755,100644..100755 --- a/compiler/hsSyn/HsBinds.lhs +++ b/compiler/hsSyn/HsBinds.lhs diff --cc compiler/hsSyn/HsTypes.lhs index fec71af,b76ff4b..b76ff4b mode 100755,100644..100755 --- a/compiler/hsSyn/HsTypes.lhs +++ b/compiler/hsSyn/HsTypes.lhs diff --cc compiler/iface/MkIface.lhs index 86c46ba,3196614..3196614 mode 100755,100644..100755 --- a/compiler/iface/MkIface.lhs +++ b/compiler/iface/MkIface.lhs diff --cc compiler/main/DynFlags.hs index 2c0cccb,821b9cc..821b9cc mode 100755,100644..100755 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs diff --cc compiler/main/GHC.hs index d60e6d7,c731b0a..c731b0a mode 100755,100644..100755 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs diff --cc compiler/main/HscMain.hs index ca524aa,4d106bd..4d106bd mode 100755,100644..100755 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs diff --cc compiler/main/HscTypes.lhs index 3391f6a,2424ddc..2424ddc mode 100755,100644..100755 --- a/compiler/main/HscTypes.lhs +++ b/compiler/main/HscTypes.lhs diff --cc compiler/parser/Parser.y.pp index cbc775d,0701b9f..e978442 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@@ -1043,11 -1043,11 +1043,11 @@@ btype :: { LHsType RdrName | atype { $1 } atype :: { LHsType RdrName } - : gtycon { L1 (HsTyVar (unLoc $1)) } - | tyvar { L1 (HsTyVar (unLoc $1)) } - | strict_mark atype { LL (HsBangTy (unLoc $1) $2) } -- Constructor sigs only + : gtycon { L1 (HsTyVar (unLoc $1)) } + | tyvar { L1 (HsTyVar (unLoc $1)) } + | strict_mark atype { LL (HsBangTy (unLoc $1) $2) } -- Constructor sigs only | '{' fielddecls '}' {% checkRecordSyntax (LL $ HsRecTy $2) } -- Constructor sigs only - | '(' ctype ',' comma_types1 ')' { LL $ HsTupleTy (HsBoxyTuple placeHolderKind) ($2:$4) } + | '(' ctype ',' comma_types1 ')' { LL $ HsTupleTy HsBoxedOrConstraintTuple ($2:$4) } | '(#' comma_types1 '#)' { LL $ HsTupleTy HsUnboxedTuple $2 } | '[' ctype ']' { LL $ HsListTy $2 } | '[:' ctype ':]' { LL $ HsPArrTy $2 } diff --cc compiler/prelude/PrelNames.lhs index cd6a621,319227b..319227b mode 100755,100644..100755 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs diff --cc compiler/prelude/TysPrim.lhs index e97f462,1223d46..1223d46 mode 100755,100644..100755 --- a/compiler/prelude/TysPrim.lhs +++ b/compiler/prelude/TysPrim.lhs diff --cc compiler/prelude/primops.txt.pp index fa3a287,204dce2..204dce2 mode 100755,100644..100755 --- a/compiler/prelude/primops.txt.pp +++ b/compiler/prelude/primops.txt.pp diff --cc compiler/rename/RnExpr.lhs index d73f7c6,0487733..0487733 mode 100755,100644..100755 --- a/compiler/rename/RnExpr.lhs +++ b/compiler/rename/RnExpr.lhs diff --cc compiler/rename/RnSource.lhs index 8845f6a,7d8d1d5..7d8d1d5 mode 100755,100644..100755 --- a/compiler/rename/RnSource.lhs +++ b/compiler/rename/RnSource.lhs diff --cc compiler/simplCore/SetLevels.lhs index 7e3b44c,a80dea4..a80dea4 mode 100755,100644..100755 --- a/compiler/simplCore/SetLevels.lhs +++ b/compiler/simplCore/SetLevels.lhs diff --cc compiler/typecheck/TcCanonical.lhs index dac7d88,d5e1f75..d5e1f75 mode 100755,100644..100755 --- a/compiler/typecheck/TcCanonical.lhs +++ b/compiler/typecheck/TcCanonical.lhs diff --cc compiler/typecheck/TcHsSyn.lhs index e1ab27c,ce6b48c..ce6b48c mode 100755,100644..100755 --- a/compiler/typecheck/TcHsSyn.lhs +++ b/compiler/typecheck/TcHsSyn.lhs diff --cc compiler/typecheck/TcInstDcls.lhs index 837f382,dbed0d3..dbed0d3 mode 100755,100644..100755 --- a/compiler/typecheck/TcInstDcls.lhs +++ b/compiler/typecheck/TcInstDcls.lhs diff --cc compiler/typecheck/TcInteract.lhs index a4e8734,62ad43d..62ad43d mode 100755,100644..100755 --- a/compiler/typecheck/TcInteract.lhs +++ b/compiler/typecheck/TcInteract.lhs diff --cc compiler/typecheck/TcMType.lhs index 3dc8d1c,19bf384..19bf384 mode 100755,100644..100755 --- a/compiler/typecheck/TcMType.lhs +++ b/compiler/typecheck/TcMType.lhs diff --cc compiler/typecheck/TcRnDriver.lhs index 916d64c,1749396..1749396 mode 100755,100644..100755 --- a/compiler/typecheck/TcRnDriver.lhs +++ b/compiler/typecheck/TcRnDriver.lhs diff --cc compiler/typecheck/TcRnMonad.lhs index d10d451,fbe3a2f..fbe3a2f mode 100755,100644..100755 --- a/compiler/typecheck/TcRnMonad.lhs +++ b/compiler/typecheck/TcRnMonad.lhs diff --cc compiler/typecheck/TcRnTypes.lhs index dc2e55f,da2c898..da2c898 mode 100755,100644..100755 --- a/compiler/typecheck/TcRnTypes.lhs +++ b/compiler/typecheck/TcRnTypes.lhs diff --cc compiler/typecheck/TcSMonad.lhs index 553d461,7d3ee73..7d3ee73 mode 100755,100644..100755 --- a/compiler/typecheck/TcSMonad.lhs +++ b/compiler/typecheck/TcSMonad.lhs diff --cc compiler/typecheck/TcSimplify.lhs index bd55882,9a41acc..9a41acc mode 100755,100644..100755 --- a/compiler/typecheck/TcSimplify.lhs +++ b/compiler/typecheck/TcSimplify.lhs diff --cc compiler/typecheck/TcSplice.lhs index 0b9c7bf,54bc0cd..54bc0cd mode 100755,100644..100755 --- a/compiler/typecheck/TcSplice.lhs +++ b/compiler/typecheck/TcSplice.lhs diff --cc compiler/typecheck/TcType.lhs index a81a909,018655b..018655b mode 100755,100644..100755 --- a/compiler/typecheck/TcType.lhs +++ b/compiler/typecheck/TcType.lhs diff --cc compiler/typecheck/TcUnify.lhs index 67bafac,7fbcc5c..7fbcc5c mode 100755,100644..100755 --- a/compiler/typecheck/TcUnify.lhs +++ b/compiler/typecheck/TcUnify.lhs diff --cc compiler/types/Coercion.lhs index 44854fd,aaed359..aaed359 mode 100755,100644..100755 --- a/compiler/types/Coercion.lhs +++ b/compiler/types/Coercion.lhs diff --cc compiler/types/Type.lhs index 0557ab6,a29e941..a29e941 mode 100755,100644..100755 --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs diff --cc compiler/types/TypeRep.lhs index ced5e96,ea95c60..ea95c60 mode 100755,100644..100755 --- a/compiler/types/TypeRep.lhs +++ b/compiler/types/TypeRep.lhs diff --cc compiler/vectorise/Vectorise.hs index 7d2415c,dc467f5..dc467f5 mode 100755,100644..100755 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs diff --cc compiler/vectorise/Vectorise/Monad.hs index 6fbdb4e,b9a1fdf..b9a1fdf mode 100755,100644..100755 --- a/compiler/vectorise/Vectorise/Monad.hs +++ b/compiler/vectorise/Vectorise/Monad.hs _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
