[commit: ghc] master: Comments only (2b3feaa)

git at git.haskell.org git at git.haskell.org
Mon Mar 17 13:51:16 UTC 2014


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

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

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

commit 2b3feaa5e6da5f071ffe0325a81a32fd395739b6
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Mar 14 13:50:14 2014 +0000

    Comments only


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

2b3feaa5e6da5f071ffe0325a81a32fd395739b6
 compiler/types/Type.lhs |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index b8edc3e..88054ce 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -1365,7 +1365,7 @@ emptyTvSubst :: TvSubst
 emptyTvSubst = TvSubst emptyInScopeSet emptyTvSubstEnv
 
 isEmptyTvSubst :: TvSubst -> Bool
-         -- See Note [Extending the TvSubstEnv]
+         -- See Note [Extending the TvSubstEnv] in TypeRep
 isEmptyTvSubst (TvSubst _ tenv) = isEmptyVarEnv tenv
 
 mkTvSubst :: InScopeSet -> TvSubstEnv -> TvSubst
@@ -1559,7 +1559,7 @@ subst_ty subst ty
 substTyVar :: TvSubst -> TyVar  -> Type
 substTyVar (TvSubst _ tenv) tv
   | Just ty  <- lookupVarEnv tenv tv      = ty  -- See Note [Apply Once]
-  | otherwise = ASSERT( isTyVar tv ) TyVarTy tv
+  | otherwise = ASSERT( isTyVar tv ) TyVarTy tv --     in TypeRep
   -- We do not require that the tyvar is in scope
   -- Reason: we do quite a bit of (substTyWith [tv] [ty] tau)
   -- and it's a nuisance to bring all the free vars of tau into
@@ -1570,7 +1570,7 @@ substTyVars :: TvSubst -> [TyVar] -> [Type]
 substTyVars subst tvs = map (substTyVar subst) tvs
 
 lookupTyVar :: TvSubst -> TyVar  -> Maybe Type
-        -- See Note [Extending the TvSubst]
+        -- See Note [Extending the TvSubst] in TypeRep
 lookupTyVar (TvSubst _ tenv) tv = lookupVarEnv tenv tv
 
 substTyVarBndr :: TvSubst -> TyVar -> (TvSubst, TyVar)
@@ -1589,7 +1589,7 @@ substTyVarBndr subst@(TvSubst in_scope tenv) old_var
     no_change = no_kind_change && (new_var == old_var)
         -- no_change means that the new_var is identical in
         -- all respects to the old_var (same unique, same kind)
-        -- See Note [Extending the TvSubst]
+        -- See Note [Extending the TvSubst] in TypeRep
         --
         -- In that case we don't need to extend the substitution
         -- to map old to new.  But instead we must zap any



More information about the ghc-commits mailing list