Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-constraint-solver
http://hackage.haskell.org/trac/ghc/changeset/a3d4f5691b9626f4f2aa801ceaad5577b3a8e2da >--------------------------------------------------------------- commit a3d4f5691b9626f4f2aa801ceaad5577b3a8e2da Merge: 5c89a7f... 4921136... Author: Dimitrios Vytiniotis <[email protected]> Date: Wed Nov 2 15:10:07 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-constraint-solver Conflicts: compiler/coreSyn/CoreLint.lhs compiler/basicTypes/BasicTypes.lhs | 2 +- compiler/coreSyn/CoreSubst.lhs | 6 +- compiler/coreSyn/CoreSyn.lhs | 8 +- compiler/coreSyn/PprCore.lhs | 3 + compiler/deSugar/Desugar.lhs | 10 + compiler/hsSyn/HsBinds.lhs | 348 +++--- compiler/hsSyn/HsDecls.lhs | 506 ++++---- compiler/llvmGen/LlvmMangler.hs | 6 +- compiler/main/BreakArray.hs | 107 +- compiler/main/CmdLineParser.hs | 182 ++-- compiler/main/DynFlags.hs | 94 +- compiler/main/HscMain.hs | 1599 ++++++++++++++++++++++ compiler/main/HscMain.lhs | 1612 ---------------------- compiler/main/HscTypes.lhs | 38 +- compiler/nativeGen/X86/CodeGen.hs | 21 +- compiler/parser/Parser.y.pp | 1827 +++++++++++++------------ compiler/rename/RnBinds.lhs | 2 +- compiler/rename/RnEnv.lhs | 20 +- compiler/rename/RnPat.lhs | 48 +- compiler/rename/RnSource.lhs | 12 + compiler/simplCore/SimplMonad.lhs | 27 +- compiler/typecheck/TcBinds.lhs | 131 +- compiler/typecheck/TcEnv.lhs | 427 +++--- compiler/typecheck/TcForeign.lhs | 19 +- compiler/typecheck/TcHsSyn.lhs | 6 + compiler/typecheck/TcHsType.lhs | 16 +- compiler/typecheck/TcInstDcls.lhs | 6 +- compiler/typecheck/TcRnDriver.lhs | 1 + compiler/typecheck/TcRnMonad.lhs | 103 +- compiler/typecheck/TcRnTypes.lhs | 47 +- compiler/typecheck/TcType.lhs | 2 +- compiler/types/InstEnv.lhs | 233 ++-- compiler/vectorise/Vectorise.hs | 16 +- compiler/vectorise/Vectorise/Env.hs | 8 - compiler/vectorise/Vectorise/Monad/Global.hs | 2 - compiler/vectorise/Vectorise/Monad/InstEnv.hs | 29 +- compiler/vectorise/Vectorise/Type/Env.hs | 13 +- compiler/vectorise/Vectorise/Utils/Base.hs | 10 +- rts/RtsFlags.c | 4 +- rts/StgCRun.c | 42 +- 40 files changed, 3917 insertions(+), 3676 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
