Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/ffabe3acb2d30be0c8e89e139f5bca7a1eb900f6 >--------------------------------------------------------------- commit ffabe3acb2d30be0c8e89e139f5bca7a1eb900f6 Merge: fed2522... 7028041... Author: Jose Pedro Magalhaes <[email protected]> Date: Wed May 4 21:43:41 2011 +0200 Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics Fixed conflicts: compiler/prelude/PrelNames.lhs compiler/deSugar/Check.lhs | 22 +- compiler/deSugar/Coverage.lhs | 83 +++--- compiler/deSugar/DsArrows.lhs | 15 +- compiler/deSugar/DsExpr.lhs | 215 +++---------- compiler/deSugar/DsGRHSs.lhs | 4 +- compiler/deSugar/DsListComp.lhs | 535 ++++++++++++++++++++++----------- compiler/deSugar/DsMeta.hs | 16 +- compiler/deSugar/Match.lhs | 2 +- compiler/deSugar/MatchLit.lhs | 14 +- compiler/hsSyn/Convert.lhs | 15 +- compiler/hsSyn/HsExpr.lhs | 342 ++++++++++++++-------- compiler/hsSyn/HsLit.lhs | 18 +- compiler/hsSyn/HsPat.lhs | 4 +- compiler/hsSyn/HsUtils.lhs | 68 +++-- compiler/main/DynFlags.hs | 6 +- compiler/main/HscMain.lhs | 2 +- compiler/parser/Lexer.x | 1 + compiler/parser/Parser.y.pp | 20 +- compiler/parser/RdrHsSyn.lhs | 46 +-- compiler/prelude/PrelNames.lhs | 36 ++- compiler/rename/RnBinds.lhs | 6 +- compiler/rename/RnExpr.lhs | 425 +++++++++++++++++--------- compiler/typecheck/TcArrows.lhs | 93 +++++-- compiler/typecheck/TcExpr.lhs | 28 ++- compiler/typecheck/TcGenDeriv.lhs | 15 +- compiler/typecheck/TcHsSyn.lhs | 56 ++-- compiler/typecheck/TcMatches.lhs | 603 +++++++++++++++++++++++++------------ compiler/typecheck/TcPat.lhs | 26 +- compiler/typecheck/TcRnDriver.lhs | 51 ++-- compiler/typecheck/TcRnMonad.lhs | 5 - compiler/typecheck/TcRnTypes.lhs | 2 + compiler/typecheck/TcSMonad.lhs | 2 +- compiler/typecheck/TcUnify.lhs | 2 +- docs/users_guide/flags.xml | 6 + docs/users_guide/glasgow_exts.xml | 228 ++++++++++++++ 35 files changed, 1955 insertions(+), 1057 deletions(-) diff --cc compiler/prelude/PrelNames.lhs index 3c85d04,e1d287a..d3f0602 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@@ -221,11 -222,12 +222,16 @@@ basicKnownKeyName -- dotnet interop , objectTyConName, marshalObjectName, unmarshalObjectName , marshalStringName, unmarshalStringName, checkDotnetResName - + + -- Generics + , rep0ClassName, rep1ClassName + , datatypeClassName, constructorClassName, selectorClassName + + -- Monad comprehensions + , guardMName + , liftMName + , groupMName + , mzipName ] genericTyConNames :: [Name] _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
