[commit: ghc] wip/type-app: Comments only (ad57520)

git at git.haskell.org git at git.haskell.org
Fri Aug 7 12:07:25 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/type-app
Link       : http://ghc.haskell.org/trac/ghc/changeset/ad575207905a37c7501c3aa54bec33fb5c9741b0/ghc

>---------------------------------------------------------------

commit ad575207905a37c7501c3aa54bec33fb5c9741b0
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Aug 5 13:10:52 2015 -0400

    Comments only


>---------------------------------------------------------------

ad575207905a37c7501c3aa54bec33fb5c9741b0
 compiler/typecheck/TcMatches.hs | 5 +++--
 compiler/typecheck/TcUnify.hs   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcMatches.hs b/compiler/typecheck/TcMatches.hs
index fdebca0..eb641f7 100644
--- a/compiler/typecheck/TcMatches.hs
+++ b/compiler/typecheck/TcMatches.hs
@@ -116,7 +116,8 @@ tcMatchesCase ctxt scrut_ty matches res_ty
   | otherwise
   = tcMatches ctxt [scrut_ty] res_ty matches
 
-tcMatchLambda :: MatchGroup Name (LHsExpr Name) -> TcRhoType
+tcMatchLambda :: MatchGroup Name (LHsExpr Name)
+              -> TcRhoType   -- deeply skolemised
               -> TcM (HsWrapper, MatchGroup TcId (LHsExpr TcId), CtOrigin)
 tcMatchLambda match res_ty
   = matchFunTys herald n_pats res_ty  $ \ pat_tys rhs_ty ->
@@ -144,7 +145,7 @@ tcGRHSsPat grhss res_ty = tcGRHSs match_ctxt grhss res_ty
 matchFunTys
   :: SDoc       -- See Note [Herald for matchExpecteFunTys] in TcUnify
   -> Arity
-  -> TcRhoType
+  -> TcRhoType  -- deeply skolemised
   -> ([TcSigmaType] -> TcRhoType -> TcM (HsWrapper, a, b))
      -- "a" is always a MatchGroup. wrapper :: a's res_ty "->" TcRhoType
   -> TcM (HsWrapper, a, b)
diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index 507eb40..1e541f3 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -67,7 +67,7 @@ import Control.Monad
 *                                                                      *
 ************************************************************************
 
-The matchExpected functions operate in one of two modes: "Expected" mode,
+matchExpectedFunTys functions operate in one of two modes: "Expected" mode,
 where the provided type is skolemised before matching, and "Actual" mode,
 where the provided type is instantiated before matching. The produced
 HsWrappers are oriented accordingly.



More information about the ghc-commits mailing list