Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a6b0ab269e74ca06445230a243065a0e35bc1916 >--------------------------------------------------------------- commit a6b0ab269e74ca06445230a243065a0e35bc1916 Merge: 1b3f274... 65e6470... Author: Ian Lynagh <i...@well-typed.com> Date: Wed Oct 3 16:10:16 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/basicTypes/BasicTypes.lhs | 26 + compiler/basicTypes/DataCon.lhs | 6 +- compiler/basicTypes/DataCon.lhs-boot | 2 + compiler/basicTypes/IdInfo.lhs | 2 +- compiler/basicTypes/MkId.lhs | 9 +- compiler/basicTypes/Name.lhs | 7 +- compiler/basicTypes/VarEnv.lhs | 3 + compiler/coreSyn/CoreLint.lhs | 13 + compiler/coreSyn/ExternalCore.lhs | 3 + compiler/coreSyn/MkExternalCore.lhs | 5 + compiler/coreSyn/PprExternalCore.lhs | 4 + compiler/coreSyn/TrieMap.lhs | 22 +- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/Coverage.lhs | 79 ++- compiler/deSugar/DsArrows.lhs | 120 ++-- compiler/deSugar/DsBinds.lhs | 10 +- compiler/deSugar/DsExpr.lhs | 18 +- compiler/deSugar/DsGRHSs.lhs | 22 +- compiler/deSugar/DsListComp.lhs | 40 +- compiler/deSugar/DsMeta.hs | 44 +- compiler/deSugar/DsUtils.lhs | 35 - compiler/deSugar/Match.lhs | 6 +- compiler/deSugar/Match.lhs-boot | 4 +- compiler/hsSyn/Convert.lhs | 18 +- compiler/hsSyn/HsBinds.lhs | 4 +- compiler/hsSyn/HsExpr.lhs | 434 ++++++++----- compiler/hsSyn/HsExpr.lhs-boot | 28 +- compiler/hsSyn/HsUtils.lhs | 76 ++- compiler/iface/BinIface.hs | 26 +- compiler/iface/BuildTyCl.lhs | 2 +- compiler/iface/IfaceSyn.lhs | 15 +- compiler/iface/IfaceType.lhs | 5 +- compiler/iface/MkIface.lhs | 18 +- compiler/iface/TcIface.lhs | 7 +- compiler/main/DynFlags.hs | 4 +- compiler/main/GHC.hs | 2 +- compiler/main/HscMain.hs | 6 +- compiler/main/PprTyThing.hs | 14 +- compiler/main/StaticFlagParser.hs | 4 +- compiler/main/StaticFlags.hs | 4 + compiler/parser/Parser.y.pp | 58 +- compiler/parser/RdrHsSyn.lhs | 99 +++- compiler/prelude/TysPrim.lhs | 19 +- compiler/rename/RnBinds.lhs | 69 ++- compiler/rename/RnEnv.lhs | 40 +- compiler/rename/RnExpr.lhs | 410 ++++++------ compiler/rename/RnExpr.lhs-boot | 16 +- compiler/rename/RnPat.lhs | 4 +- compiler/rename/RnTypes.lhs | 10 +- compiler/stgSyn/CoreToStg.lhs | 2 +- compiler/typecheck/FamInst.lhs | 5 +- compiler/typecheck/Inst.lhs | 174 ++---- compiler/typecheck/TcArrows.lhs | 105 ++-- compiler/typecheck/TcBinds.lhs | 101 ++-- compiler/typecheck/TcCanonical.lhs | 869 +++++++++++------------ compiler/typecheck/TcClassDcl.lhs | 27 +- compiler/typecheck/TcEnv.lhs | 21 +- compiler/typecheck/TcErrors.lhs | 915 +++++++++++++------------ compiler/typecheck/TcEvidence.lhs | 47 +- compiler/typecheck/TcExpr.lhs | 42 +- compiler/typecheck/TcGenDeriv.lhs | 12 +- compiler/typecheck/TcHsSyn.lhs | 257 ++++--- compiler/typecheck/TcHsType.lhs | 138 ++-- compiler/typecheck/TcInstDcls.lhs | 74 ++- compiler/typecheck/TcInteract.lhs | 829 ++++++++++------------ compiler/typecheck/TcMType.lhs | 226 +++++-- compiler/typecheck/TcMatches.lhs | 141 ++-- compiler/typecheck/TcMatches.lhs-boot | 11 +- compiler/typecheck/TcRnDriver.lhs | 100 ++-- compiler/typecheck/TcRnMonad.lhs | 83 ++- compiler/typecheck/TcRnTypes.lhs | 392 ++++++----- compiler/typecheck/TcRules.lhs | 42 +- compiler/typecheck/TcSMonad.lhs | 1237 +++++++++++++++++---------------- compiler/typecheck/TcSimplify.lhs | 1058 ++++++++++------------------ compiler/typecheck/TcSplice.lhs | 27 +- compiler/typecheck/TcTyClsDecls.lhs | 16 +- compiler/typecheck/TcTyDecls.lhs | 16 +- compiler/typecheck/TcType.lhs | 194 ++++-- compiler/typecheck/TcUnify.lhs | 336 ++++------ compiler/typecheck/TcUnify.lhs-boot | 3 +- compiler/types/Coercion.lhs | 46 +- compiler/types/InstEnv.lhs | 5 + compiler/types/OptCoercion.lhs | 79 ++- compiler/types/TyCon.lhs | 94 ++-- compiler/types/Type.lhs | 36 +- compiler/types/TypeRep.lhs | 15 +- compiler/utils/UniqFM.lhs | 5 +- docs/users_guide/ffi-chap.xml | 2 +- docs/users_guide/glasgow_exts.xml | 2 +- 89 files changed, 5001 insertions(+), 4657 deletions(-) diff --cc compiler/main/DynFlags.hs index 6e51dcf,7ae4653..bbf7b75 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@@ -2437,12 -2452,14 +2438,13 @@@ xFlags = ( "OverlappingInstances", Opt_OverlappingInstances, nop ), ( "UndecidableInstances", Opt_UndecidableInstances, nop ), ( "IncoherentInstances", Opt_IncoherentInstances, nop ), - ( "PackageImports", Opt_PackageImports, nop ) + ( "PackageImports", Opt_PackageImports, nop ), + ( "TypeHoles", Opt_TypeHoles, nop ) ] -defaultFlags :: Platform -> [DynFlag] -defaultFlags platform +defaultFlags :: Settings -> [DynFlag] +defaultFlags settings = [ Opt_AutoLinkPackages, - Opt_Static, Opt_SharedImplib, _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
