[commit: ghc] master: Untabify and whitespace (28e2606)
git at git.haskell.org
git at git.haskell.org
Wed Nov 6 09:42:45 UTC 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/28e2606c1ab72796bd4e67b28727964ec0d8850f/ghc
>---------------------------------------------------------------
commit 28e2606c1ab72796bd4e67b28727964ec0d8850f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Tue Nov 5 12:41:25 2013 +0000
Untabify and whitespace
>---------------------------------------------------------------
28e2606c1ab72796bd4e67b28727964ec0d8850f
compiler/typecheck/TcCanonical.lhs | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/compiler/typecheck/TcCanonical.lhs b/compiler/typecheck/TcCanonical.lhs
index 9135894..ad3b13b 100644
--- a/compiler/typecheck/TcCanonical.lhs
+++ b/compiler/typecheck/TcCanonical.lhs
@@ -1,11 +1,4 @@
\begin{code}
-{-# OPTIONS -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
--- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
-
module TcCanonical(
canonicalize, emitWorkNC,
StopOrContinue (..)
@@ -518,13 +511,13 @@ flatten loc f ctxt (TyConApp tc tys)
-- flatten it away as well, and generate a new given equality constraint
-- between the application and a newly generated flattening skolem variable.
| otherwise
- = ASSERT( tyConArity tc <= length tys ) -- Type functions are saturated
+ = ASSERT( tyConArity tc <= length tys ) -- Type functions are saturated
do { (xis, cos) <- flattenMany loc f ctxt tys
; let (xi_args, xi_rest) = splitAt (tyConArity tc) xis
(cos_args, cos_rest) = splitAt (tyConArity tc) cos
- -- The type function might be *over* saturated
- -- in which case the remaining arguments should
- -- be dealt with by AppTys
+ -- The type function might be *over* saturated
+ -- in which case the remaining arguments should
+ -- be dealt with by AppTys
fam_ty = mkTyConApp tc xi_args
; (ret_co, rhs_xi) <-
@@ -604,7 +597,7 @@ flattenTyVar, flattenFinalTyVar
-- for the unification variables that have been unified already with the inert
-- equalities, see Note [Spontaneously solved in TyBinds] in TcInteract.
flattenTyVar loc f ctxt tv
- | not (isTcTyVar tv) -- Happens when flatten under a (forall a. ty)
+ | not (isTcTyVar tv) -- Happens when flatten under a (forall a. ty)
= flattenFinalTyVar loc f ctxt tv -- So ty contains referneces to the non-TcTyVar a
| otherwise
= do { mb_ty <- isFilledMetaTyVar_maybe tv
@@ -712,8 +705,8 @@ emitWorkNC loc evs
canEqNC :: CtLoc -> CtEvidence -> Type -> Type -> TcS StopOrContinue
canEqNC _loc ev ty1 ty2
- | eqType ty1 ty2 -- Dealing with equality here avoids
- -- later spurious occurs checks for a~a
+ | eqType ty1 ty2 -- Dealing with equality here avoids
+ -- later spurious occurs checks for a~a
= if isWanted ev then
setEvBind (ctev_evar ev) (EvCoercion (mkTcReflCo ty1)) >> return Stop
else
@@ -782,11 +775,11 @@ canEqNC loc ev ty1 ty2
| Just (s1,t1) <- tcSplitAppTy_maybe ty1
, Just (s2,t2) <- tcSplitAppTy_maybe ty2
= do { let xevcomp [x,y] = EvCoercion (mkTcAppCo (evTermCoercion x) (evTermCoercion y))
- xevcomp _ = error "canEqAppTy: can't happen" -- Can't happen
- xevdecomp x = let xco = evTermCoercion x
- in [EvCoercion (mkTcLRCo CLeft xco), EvCoercion (mkTcLRCo CRight xco)]
- ; ctevs <- xCtFlavor ev [mkTcEqPred s1 s2, mkTcEqPred t1 t2] (XEvTerm xevcomp xevdecomp)
- ; canEvVarsCreated loc ctevs }
+ xevcomp _ = error "canEqAppTy: can't happen" -- Can't happen
+ xevdecomp x = let xco = evTermCoercion x
+ in [EvCoercion (mkTcLRCo CLeft xco), EvCoercion (mkTcLRCo CRight xco)]
+ ; ctevs <- xCtFlavor ev [mkTcEqPred s1 s2, mkTcEqPred t1 t2] (XEvTerm xevcomp xevdecomp)
+ ; canEvVarsCreated loc ctevs }
| otherwise
= do { emitInsoluble (CNonCanonical { cc_ev = ev, cc_loc = loc })
@@ -993,7 +986,7 @@ classify (TyConApp tc tys) | isSynFamilyTyCon tc
, tyConArity tc == length tys
= FunCls tc tys
classify ty | Just ty' <- tcView ty
- = case classify ty' of
+ = case classify ty' of
OtherCls {} -> OtherCls ty
var_or_fn -> var_or_fn
| otherwise
More information about the ghc-commits
mailing list