[commit: ghc] master: Comments only (dc8b06e)

git at git.haskell.org git at git.haskell.org
Tue Sep 10 18:57:17 CEST 2013


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dc8b06e8c8d5112bc6b4b7bda610e7b5a6adbcd3/ghc

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

commit dc8b06e8c8d5112bc6b4b7bda610e7b5a6adbcd3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Sep 10 11:39:05 2013 +0100

    Comments only


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

dc8b06e8c8d5112bc6b4b7bda610e7b5a6adbcd3
 compiler/typecheck/TcMType.lhs |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs
index 6049d5b..aa8aa64 100644
--- a/compiler/typecheck/TcMType.lhs
+++ b/compiler/typecheck/TcMType.lhs
@@ -805,7 +805,7 @@ zonkFlats binds_var untch cts
         isTouchableMetaTyVar untch tv
       , not (isSigTyVar tv) || isTyVarTy ty_lhs     -- Never unify a SigTyVar with a non-tyvar
       , typeKind ty_lhs `tcIsSubKind` tyVarKind tv  -- c.f. TcInteract.trySpontaneousEqOneWay
-      , not (tv `elemVarSet` tyVarsOfType ty_lhs)
+      , not (tv `elemVarSet` tyVarsOfType ty_lhs)   -- Do not construct an infinite type
       = ASSERT2( isWantedCt orig_ct, ppr orig_ct )
         ASSERT2( case tcSplitTyConApp_maybe ty_lhs of { Just (tc,_) -> isSynFamilyTyCon tc; _ -> False }, ppr orig_ct )
         do { writeMetaTyVar tv ty_lhs
@@ -836,7 +836,7 @@ constraint solving, cannot produce any more interactions in the
 constraint solver so it is safe to do it as the very very last step.
 
 We choose therefore to do it during zonking, in the function
-zonkFlats. This is in analgoy to the zonking of given flatten skolems
+zonkFlats. This is in analogy to the zonking of given "flatten skolems"
 which are eliminated in favor of the underlying type that they are
 equal to.
 




More information about the ghc-commits mailing list