Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co
http://hackage.haskell.org/trac/ghc/changeset/5096055e9aa46a7cc8b5a1292f7094fe588ec4d1 >--------------------------------------------------------------- commit 5096055e9aa46a7cc8b5a1292f7094fe588ec4d1 Merge: db4f42a... b855273... Author: Simon Peyton Jones <[email protected]> Date: Wed May 4 13:26:30 2011 +0100 Merge commit .gitignore | 2 +- MAKEHELP | 6 - aclocal.m4 | 104 +++--- boot | 202 +++++++++--- boot-pkgs | 114 ------- compiler/Makefile.local | 75 ----- compiler/basicTypes/Module.lhs | 11 +- compiler/basicTypes/Name.lhs | 3 +- compiler/basicTypes/NameSet.lhs | 12 +- compiler/basicTypes/OccName.lhs | 3 +- compiler/basicTypes/SrcLoc.lhs | 8 +- compiler/basicTypes/Var.lhs | 3 +- compiler/cmm/CmmCPS.hs | 5 +- compiler/cmm/CmmLint.hs | 1 + compiler/cmm/CmmParse.y | 28 ++- compiler/cmm/CmmProcPoint.hs | 2 + compiler/cmm/CmmStackLayout.hs | 152 +++++++-- compiler/cmm/cmm-notes | 29 +- compiler/deSugar/DsBinds.lhs | 10 +- compiler/ghc.mk | 6 - compiler/ghci/ByteCodeGen.lhs | 1 + compiler/ghci/RtClosureInspect.hs | 8 +- compiler/hsSyn/HsDecls.lhs | 30 +-- compiler/hsSyn/HsImpExp.lhs | 11 +- compiler/iface/MkIface.lhs | 34 +- compiler/main/DriverMkDepend.hs | 2 - compiler/main/DriverPipeline.hs | 45 +-- compiler/main/DynFlags.hs | 342 +++++++++++--------- compiler/main/GHC.hs | 4 +- compiler/main/GhcMake.hs | 9 +- compiler/main/HscMain.lhs | 11 +- compiler/main/HscTypes.lhs | 2 +- compiler/main/Packages.lhs | 2 +- compiler/main/StaticFlags.hs | 18 +- compiler/main/SysTools.lhs | 115 ++++--- compiler/nativeGen/AsmCodeGen.lhs | 19 +- compiler/nativeGen/PPC/CodeGen.hs | 37 +-- compiler/nativeGen/PPC/Instr.hs | 10 +- compiler/nativeGen/PPC/Ppr.hs | 2 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +- compiler/nativeGen/SPARC/CodeGen.hs | 16 +- compiler/nativeGen/SPARC/Instr.hs | 10 +- compiler/nativeGen/SPARC/Ppr.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 40 ++-- compiler/nativeGen/X86/Instr.hs | 15 +- compiler/nativeGen/X86/Ppr.hs | 12 +- compiler/parser/Lexer.x | 42 ++-- compiler/prelude/PrelRules.lhs | 2 +- compiler/prelude/primops.txt.pp | 14 +- compiler/rename/RnBinds.lhs | 5 +- compiler/rename/RnSource.lhs | 2 +- compiler/simplCore/CoreMonad.lhs | 14 +- compiler/simplCore/Simplify.lhs | 8 +- compiler/typecheck/TcErrors.lhs | 90 +++--- compiler/typecheck/TcForeign.lhs | 137 ++++---- compiler/typecheck/TcInteract.lhs | 9 +- compiler/typecheck/TcMType.lhs | 47 ++-- compiler/typecheck/TcRnTypes.lhs | 6 +- compiler/typecheck/TcSMonad.lhs | 3 +- compiler/typecheck/TcType.lhs | 24 +- compiler/typecheck/TcUnify.lhs | 4 +- compiler/types/OptCoercion.lhs | 16 +- compiler/types/TypeRep.lhs | 7 +- compiler/utils/Bag.lhs | 3 +- compiler/utils/Outputable.lhs | 5 +- compiler/utils/Util.lhs | 14 + configure.ac | 25 +- distrib/Makefile | 2 +- distrib/configure.ac.in | 4 +- docs/users_guide/debugging.xml | 132 +++++++-- docs/users_guide/flags.xml | 52 +++- docs/users_guide/shared_libs.xml | 2 +- extra-gcc-opts.in | 1 - ghc.mk | 12 +- ghc/Main.hs | 42 ++- ghc/ghc-bin.cabal.in | 2 +- ghc/ghc.mk | 10 +- ghc/ghc.wrapper | 2 +- libffi/ghc.mk | 11 +- libraries/Makefile.common | 118 ------- libraries/Makefile.inc | 8 - libraries/Makefile.local | 38 --- libraries/tarballs/time-1.2.0.3.tar.gz | Bin 85069 -> 0 bytes libraries/tarballs/time-1.2.0.4.tar.gz | Bin 0 -> 85693 bytes mk/config.mk.in | 42 ++- rts/Linker.c | 8 +- rts/ghc.mk | 6 +- rules/build-package-data.mk | 7 +- rules/build-package-way.mk | 6 +- rules/build-prog.mk | 2 +- rules/c-suffix-rules.mk | 10 +- rules/distdir-way-opts.mk | 8 +- rules/hs-suffix-rules-srcdir.mk | 4 +- rules/package-config.mk | 6 + rules/shell-wrapper.mk | 1 - settings.in | 8 + sync-all | 34 ++- utils/ghctags/Main.hs | 3 +- 98 files changed, 1377 insertions(+), 1256 deletions(-) diff --cc compiler/types/OptCoercion.lhs index 559ea65,6d0f2b1..a93df03 --- a/compiler/types/OptCoercion.lhs +++ b/compiler/types/OptCoercion.lhs @@@ -100,13 -92,11 +92,13 @@@ opt_co env sym c opt_co' env _ (Refl ty) = Refl (substTy env ty) opt_co' env sym (SymCo co) = opt_co env (not sym) co - opt_co' env sym (TyConAppCo tc cos) = mkTyConAppCo tc (map (opt_co env sym) cos) + opt_co' env sym (PredCo cos) = mkPredCo (fmap (opt_co env sym) cos) opt_co' env sym (AppCo co1 co2) = mkAppCo (opt_co env sym co1) (opt_co env sym co2) opt_co' env sym (ForAllCo tv co) = case substTyVarBndr env tv of - (env', tv') -> ForAllCo tv' (opt_co env' sym co) + (env', tv') -> mkForAllCo tv' (opt_co env' sym co) + -- Use the "mk" functions to check for nested Refls + opt_co' env sym (CoVarCo cv) | Just co <- lookupCoVar env cv = opt_co (zapCvSubstEnv env) sym co _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
