[commit: ghc] type-holes-branch: Fix the merge, remove unnecessary code: (6ee55fc)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch http://hackage.haskell.org/trac/ghc/changeset/6ee55fccf0ba316efdce27246320e0c82b6d48ee >--------------------------------------------------------------- commit 6ee55fccf0ba316efdce27246320e0c82b6d48ee Author: Thijs Alkemade <[email protected]> Date: Tue Jul 17 19:12:17 2012 +0200 Fix the merge, remove unnecessary code: - Holes do not contain their name anymore again. - Holes are turned into Vars before desugaring. This should not matter while running, as they are turned into runtime errors anyway, but this means holes do not need to exist in Core. - Removed named holes from the parser & lexer. - Cleaned up the deferring of holes, location info is now also better. compiler/deSugar/Coverage.lhs | 2 +- compiler/deSugar/DsExpr.lhs | 3 +- compiler/hsSyn/HsExpr.lhs | 6 ++-- compiler/iface/IfaceEnv.lhs | 17 ---------------- compiler/parser/Lexer.x | 5 ---- compiler/parser/Parser.y.pp | 6 ----- compiler/rename/RnExpr.lhs | 13 ++--------- compiler/rename/RnTypes.lhs | 5 ---- compiler/typecheck/TcCanonical.lhs | 19 ++++++++--------- compiler/typecheck/TcErrors.lhs | 37 ++++++++++++----------------------- compiler/typecheck/TcExpr.lhs | 11 +++++---- compiler/typecheck/TcHsSyn.lhs | 7 +---- compiler/typecheck/TcInteract.lhs | 32 +------------------------------ compiler/typecheck/TcMType.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 35 +-------------------------------- compiler/typecheck/TcRnTypes.lhs | 13 +++-------- compiler/typecheck/TcSMonad.lhs | 24 ++++++++++------------ compiler/typecheck/TcSimplify.lhs | 9 +------ compiler/types/Type.lhs | 1 - 19 files changed, 59 insertions(+), 188 deletions(-) Diff suppressed because of size. To see it, use: git show 6ee55fccf0ba316efdce27246320e0c82b6d48ee