Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-constraint-solver
http://hackage.haskell.org/trac/ghc/changeset/60c6ca79342ac9c19c2fe25e3360cfd92c3f7938 >--------------------------------------------------------------- commit 60c6ca79342ac9c19c2fe25e3360cfd92c3f7938 Merge: 381cf86... 03d4597... Author: Dimitrios Vytiniotis <[email protected]> Date: Tue Oct 25 10:03:47 2011 +0100 Merging TcSMonad imports aclocal.m4 | 293 ++++++++++++--- compiler/HsVersions.h | 8 - compiler/basicTypes/Literal.lhs | 38 ++- compiler/cmm/CLabel.hs | 61 ++-- compiler/cmm/CmmProcPoint.hs | 11 - compiler/cmm/PprC.hs | 29 +- compiler/coreSyn/CoreArity.lhs | 34 ++- compiler/coreSyn/CoreSubst.lhs | 24 +- compiler/coreSyn/CoreUnfold.lhs | 16 +- compiler/coreSyn/PprCore.lhs | 13 +- compiler/ghc.mk | 2 + compiler/hsSyn/HsBinds.lhs | 19 - compiler/main/DriverPipeline.hs | 100 +++--- compiler/main/DynFlags.hs | 9 +- compiler/main/HscMain.lhs | 5 +- compiler/main/InteractiveEval.hs | 8 +- compiler/main/SysTools.lhs | 17 + compiler/nativeGen/AsmCodeGen.lhs | 38 ++- compiler/nativeGen/NCG.h | 20 - compiler/nativeGen/PIC.hs | 14 +- compiler/nativeGen/PPC/CodeGen.hs | 1 + compiler/nativeGen/PPC/Ppr.hs | 370 +++++++++----------- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 24 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 8 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 4 + compiler/nativeGen/SPARC/Ppr.hs | 34 +- compiler/nativeGen/TargetReg.hs | 20 + compiler/nativeGen/X86/CodeGen.hs | 83 +++-- compiler/nativeGen/X86/Instr.hs | 53 ++-- compiler/nativeGen/X86/Ppr.hs | 50 ++-- compiler/nativeGen/X86/RegInfo.hs | 37 +-- compiler/parser/RdrHsSyn.lhs | 9 +- compiler/prelude/PrelNames.lhs | 4 +- compiler/prelude/PrelRules.lhs | 50 ++- compiler/prelude/TysPrim.lhs | 5 +- compiler/prelude/TysWiredIn.lhs | 6 +- compiler/rename/RnBinds.lhs | 97 +++--- compiler/rename/RnEnv.lhs | 115 ++++--- compiler/rename/RnSource.lhs | 5 +- compiler/simplCore/SetLevels.lhs | 14 +- compiler/simplCore/SimplCore.lhs | 13 +- compiler/stgSyn/CoreToStg.lhs | 4 +- compiler/stgSyn/StgSyn.lhs | 4 - compiler/typecheck/TcDeriv.lhs | 5 +- compiler/typecheck/TcExpr.lhs | 8 + compiler/typecheck/TcForeign.lhs | 28 ++- compiler/typecheck/TcHsType.lhs | 36 +- compiler/typecheck/TcMType.lhs | 21 +- compiler/typecheck/TcRnDriver.lhs | 30 ++- compiler/typecheck/TcSMonad.lhs | 29 +- compiler/typecheck/TcTyClsDecls.lhs | 32 +-- compiler/typecheck/TcTyDecls.lhs | 144 +++++++- compiler/typecheck/TcType.lhs | 7 +- compiler/utils/Outputable.lhs | 5 + compiler/utils/Platform.hs | 108 ++----- compiler/utils/Util.lhs | 7 +- configure.ac | 39 +-- distrib/configure.ac.in | 5 + docs/users_guide/flags.xml | 4 +- docs/users_guide/glasgow_exts.xml | 29 ++- ghc.mk | 4 +- ghc/InteractiveUI.hs | 28 +- includes/Stg.h | 2 - includes/stg/ArchSpecific.h | 30 -- libraries/gen_contents_index | 32 ++- mk/config.mk.in | 4 + mk/validate-settings.mk | 4 +- rts/Capability.c | 27 ++- settings.in | 7 +- utils/ghc-cabal/ghc.mk | 10 +- utils/ghc-pkg/ghc.mk | 2 +- 71 files changed, 1441 insertions(+), 1015 deletions(-) diff --cc compiler/typecheck/TcSMonad.lhs index 10e9ad5,4d5039b..c70c9d2 --- a/compiler/typecheck/TcSMonad.lhs +++ b/compiler/typecheck/TcSMonad.lhs @@@ -115,27 -107,18 +115,31 @@@ import MonadUtil import VarSet import Pair import FastString -import StaticFlags + import Util import HsBinds -- for TcEvBinds stuff import Id import TcRnTypes - import Data.IORef +import Unique +import UniqFM +import Maybes ( orElse ) + +#ifdef DEBUG +import StaticFlags( opt_PprStyle_Debug ) +import Control.Monad( when ) +#endif ++ + import Control.Monad + import Data.IORef + import qualified Data.Map as Map \end{code} +\begin{code} +compatKind :: Kind -> Kind -> Bool +compatKind k1 k2 = k1 `isSubKind` k2 || k2 `isSubKind` k1 + +\end{code} %************************************************************************ %* * _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
