[commit: ghc] type-holes-branch: Merge branch 'master' of https://github.com/ghc/ghc (7b55caf)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch http://hackage.haskell.org/trac/ghc/changeset/7b55caf896bb96c0c2929dee8e1384f12a9f1da7 >--------------------------------------------------------------- commit 7b55caf896bb96c0c2929dee8e1384f12a9f1da7 Merge: 7816d51... 88f476b... Author: Thijs Alkemade <[email protected]> Date: Fri Apr 20 19:18:10 2012 +0200 Merge branch 'master' of https://github.com/ghc/ghc compiler/basicTypes/NameEnv.lhs | 32 +- compiler/basicTypes/SrcLoc.lhs | 7 +- compiler/deSugar/DsMeta.hs | 8 +- compiler/ghci/ByteCodeAsm.lhs | 598 +++++++++----------- compiler/ghci/ByteCodeGen.lhs | 110 +++-- compiler/ghci/ByteCodeItbls.lhs | 21 +- compiler/ghci/ByteCodeLink.lhs | 13 +- compiler/hsSyn/Convert.lhs | 13 +- compiler/hsSyn/HsDecls.lhs | 28 +- compiler/hsSyn/HsTypes.lhs | 189 ++++--- compiler/hsSyn/HsUtils.lhs | 36 +-- compiler/main/DynFlags.hs | 9 +- compiler/main/HeaderInfo.hs | 26 +- compiler/main/HscStats.hs | 7 +- compiler/main/InteractiveEval.hs | 9 +- compiler/main/StaticFlags.hs | 11 +- compiler/parser/Parser.y.pp | 20 +- compiler/parser/ParserCore.y | 2 +- compiler/parser/RdrHsSyn.lhs | 77 +--- compiler/prelude/PrelNames.lhs | 16 +- compiler/rename/RnBinds.lhs | 17 +- compiler/rename/RnNames.lhs | 2 +- compiler/rename/RnSource.lhs | 50 +- compiler/rename/RnTypes.lhs | 133 ++++- compiler/stranal/DmdAnal.lhs | 13 +- compiler/stranal/WwLib.lhs | 25 +- compiler/typecheck/TcCanonical.lhs | 171 ++++--- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcEvidence.lhs | 32 +- compiler/typecheck/TcHsType.lhs | 109 +++-- compiler/typecheck/TcInstDcls.lhs | 98 +++- compiler/typecheck/TcInteract.lhs | 84 +-- compiler/typecheck/TcMType.lhs | 37 +- compiler/typecheck/TcRnTypes.lhs | 13 +- compiler/typecheck/TcRules.lhs | 195 +++++-- compiler/typecheck/TcSMonad.lhs | 108 +++- compiler/typecheck/TcSimplify.lhs | 209 +++----- compiler/typecheck/TcTyClsDecls.lhs | 55 ++- compiler/typecheck/TcTyDecls.lhs | 6 +- compiler/typecheck/TcType.lhs | 11 +- compiler/types/Type.lhs | 9 +- compiler/utils/Panic.lhs | 53 ++- .../vectorise/Vectorise/Generic/Description.hs | 3 +- compiler/vectorise/Vectorise/Generic/PData.hs | 3 +- docs/users_guide/flags.xml | 30 +- docs/users_guide/ghci.xml | 16 +- docs/users_guide/using.xml | 224 ++++++-- ghc/InteractiveUI.hs | 16 +- includes/rts/storage/TSO.h | 2 +- rts/Interpreter.c | 44 +- rts/PrimOps.cmm | 6 +- rts/RtsProbes.d | 3 +- rts/Threads.c | 16 +- rts/Trace.c | 41 +- rts/Trace.h | 20 +- rts/posix/Clock.h | 35 ++ rts/posix/GetTime.c | 32 +- rts/posix/Itimer.c | 11 +- rts/posix/Select.c | 79 ++- rts/posix/Select.h | 2 +- 60 files changed, 1835 insertions(+), 1412 deletions(-) diff --cc compiler/typecheck/TcInteract.lhs index 8818fd5,4496eef..fffd0dc --- a/compiler/typecheck/TcInteract.lhs +++ b/compiler/typecheck/TcInteract.lhs @@@ -685,18 -679,13 +691,13 @@@ interactWithInertsStage :: WorkItem -> -- Precondition: if the workitem is a CTyEqCan then it will not be able to -- react with anything at this stage. interactWithInertsStage wi - = do { ctxt <- getTcSContext - ; if simplEqsOnly ctxt && not (isCFunEqCan wi) then - -- Why not just "simplEqsOnly"? See Note [SimplEqsOnly and InteractWithInerts] - return (ContinueWith wi) - else - do { traceTcS "interactWithInerts" $ text "workitem = " <+> ppr wi - ; rels <- extractRelevantInerts wi - ; traceTcS "relevant inerts are:" $ ppr rels - ; foldlBagM interact_next (ContinueWith wi) rels } } + = do { traceTcS "interactWithInerts" $ text "workitem = " <+> ppr wi + ; rels <- extractRelevantInerts wi + ; traceTcS "relevant inerts are:" $ ppr rels + ; foldlBagM interact_next (ContinueWith wi) rels } where interact_next Stop atomic_inert - = updInertSetTcS atomic_inert >> return Stop + = trace "interact_next Stop" $ updInertSetTcS atomic_inert >> return Stop interact_next (ContinueWith wi) atomic_inert = do { ir <- doInteractWithInert atomic_inert wi ; let mk_msg rule keep_doc diff --cc compiler/types/Type.lhs index c0220ff,1470160..b924d9f --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs @@@ -51,12 -51,11 +51,12 @@@ module Type -- Pred types mkFamilyTyConApp, isDictLikeTy, - mkNakedEqPred, mkEqPred, mkPrimEqPred, + mkEqPred, mkPrimEqPred, mkClassPred, - mkIPPred, + mkIPPred, mkHolePred, noParenPred, isClassPred, isEqPred, isIPPred, - + isHolePred, + -- Deconstructing predicate types PredTree(..), predTreePredType, classifyPredType, getClassPredTys, getClassPredTys_maybe,