From: Ian Lynagh <igloo@earth.li>
Date: Thu, 3 Dec 2009 16:44:24 +0000 (+0000)
Subject: Tweak layout for alternative layout rule
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=8e8068df44747a15cbaf4d1d6b2c4a847dfca653

Tweak layout for alternative layout rule
---

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index 35fc510..f6ba7c1 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -556,12 +556,12 @@ shadowPackages pkgs preferred
    in  listToFM shadowed
  where
  check (shadowed,pkgmap) pkg
-      | Just oldpkg <- lookupUFM pkgmap (packageConfigId pkg),
-        let
+      | Just oldpkg <- lookupUFM pkgmap (packageConfigId pkg)
+      , let
             ipid_new = installedPackageId pkg
-            ipid_old = installedPackageId oldpkg,
+            ipid_old = installedPackageId oldpkg
         --
-        ipid_old /= ipid_new
+      , ipid_old /= ipid_new
       = if ipid_old `elem` preferred
            then ( (ipid_new, ShadowedBy ipid_old) : shadowed, pkgmap )
            else ( (ipid_old, ShadowedBy ipid_new) : shadowed, pkgmap' )
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index d0ea5ce..c78f3b9 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -1290,7 +1290,7 @@ finish_char_tok loc ch	-- We've already seen the closing quote
 				return (L (mkSrcSpan loc end) (ITprimchar ch))
 			_other ->
 				return (L (mkSrcSpan loc end) (ITchar ch))
-	        else do
+	    else do
 		   return (L (mkSrcSpan loc end) (ITchar ch))
 
 lex_char :: Char -> AlexInput -> P Char
diff --git a/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs
index 9af7e2f..fdf97bc 100644
--- a/compiler/parser/RdrHsSyn.lhs
+++ b/compiler/parser/RdrHsSyn.lhs
@@ -985,9 +985,9 @@ mkImport :: CCallConv
 	 -> P (HsDecl RdrName)
 mkImport cconv safety (L loc entity, v, ty)
   | cconv == PrimCallConv                      = do
-  let funcTarget = CFunction (StaticTarget entity)
-      importSpec = CImport PrimCallConv safety nilFS funcTarget
-  return (ForD (ForeignImport v ty importSpec))
+    let funcTarget = CFunction (StaticTarget entity)
+        importSpec = CImport PrimCallConv safety nilFS funcTarget
+    return (ForD (ForeignImport v ty importSpec))
   | otherwise = do
     case parseCImport cconv safety (mkExtName (unLoc v)) (unpackFS entity) of
       Nothing         -> parseError loc "Malformed entity string"
diff --git a/compiler/stranal/DmdAnal.lhs b/compiler/stranal/DmdAnal.lhs
index 2414aea..31648b0 100644
--- a/compiler/stranal/DmdAnal.lhs
+++ b/compiler/stranal/DmdAnal.lhs
@@ -217,9 +217,9 @@ dmdAnal sigs dmd (Lam var body)
     (deferType lam_ty, Lam var' body')
 
 dmdAnal sigs dmd (Case scrut case_bndr ty [alt@(DataAlt dc,bndrs,rhs)])
-  | let tycon = dataConTyCon dc,
-    isProductTyCon tycon,
-    not (isRecursiveTyCon tycon)
+  | let tycon = dataConTyCon dc
+  , isProductTyCon tycon
+  , not (isRecursiveTyCon tycon)
   = let
 	sigs_alt	      = extendSigEnv NotTopLevel sigs case_bndr case_bndr_sig
 	(alt_ty, alt')	      = dmdAnalAlt sigs_alt dmd alt