Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/9dde17e0ab2d759038ad4aff1fe89a1bf207331f >--------------------------------------------------------------- commit 9dde17e0ab2d759038ad4aff1fe89a1bf207331f Author: Simon Peyton Jones <[email protected]> Date: Fri Mar 2 16:33:25 2012 +0000 White space only >--------------------------------------------------------------- compiler/cmm/Cmm.hs | 2 +- compiler/cmm/MkGraph.hs | 2 +- compiler/types/Unify.lhs | 3 --- compiler/utils/ListSetOps.lhs | 8 ++++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs index 93a1dc1..63c3a90 100644 --- a/compiler/cmm/Cmm.hs +++ b/compiler/cmm/Cmm.hs @@ -137,7 +137,7 @@ data ProfilingInfo -- we add a label for the table, and expect only the 'offset/length' form data C_SRT = NoC_SRT - | C_SRT !CLabel !WordOff !StgHalfWord {-bitmap or escape-} + | C_SRT !CLabel !WordOff !StgHalfWord {-bitmap or escape-} deriving (Eq) needsSRT :: C_SRT -> Bool diff --git a/compiler/cmm/MkGraph.hs b/compiler/cmm/MkGraph.hs index 3badef7..b63cae5 100644 --- a/compiler/cmm/MkGraph.hs +++ b/compiler/cmm/MkGraph.hs @@ -350,7 +350,7 @@ copyOutOflow conv transfer area@(CallArea a) actuals updfr_off (setRA, init_offset) = case a of Young id -> id `seq` -- Generate a store instruction for - -- the return address if making a call + -- the return address if making a call if transfer == Call then ([(CmmLit (CmmBlock id), StackParam init_offset)], widthInBytes wordWidth) diff --git a/compiler/types/Unify.lhs b/compiler/types/Unify.lhs index 7d648ae..68a61fd 100644 --- a/compiler/types/Unify.lhs +++ b/compiler/types/Unify.lhs @@ -156,9 +156,6 @@ match :: MatchEnv -- For the most part this is pushed downwards -- in-scope set of the RnEnv2 -> Type -> Type -- Template and target respectively -> Maybe TvSubstEnv --- This matcher works on core types; that is, it ignores PredTypes --- Watch out if newtypes become transparent agin! --- this matcher must respect newtypes match menv subst ty1 ty2 | Just ty1' <- coreView ty1 = match menv subst ty1' ty2 | Just ty2' <- coreView ty2 = match menv subst ty1 ty2' diff --git a/compiler/utils/ListSetOps.lhs b/compiler/utils/ListSetOps.lhs index 2c6c6b0..110ba77 100644 --- a/compiler/utils/ListSetOps.lhs +++ b/compiler/utils/ListSetOps.lhs @@ -24,9 +24,9 @@ module ListSetOps ( hasNoDups, runs, removeDups, findDupsEq, equivClasses, equivClassesByUniq, - -- Remove redudant elts - removeRedundant -- Used in the ghc/InteractiveUI, - -- although not in the compiler itself + -- Remove redudant elts + removeRedundant -- Used in the ghc/InteractiveUI, + -- although not in the compiler itself ) where #include "HsVersions.h" @@ -220,7 +220,7 @@ findDupsEq eq (x:xs) | null eq_xs = findDupsEq eq xs where (eq_xs, neq_xs) = partition (eq x) xs removeRedundant :: (a -> a -> Bool) -- True <=> discard the *second* argument - -> [a] -> [a] + -> [a] -> [a] -- Remove any element y for which -- another element x is in the list -- and (x `subsumes` y) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
