From f53c4074ff7554ceedaa6b7a5edb2bca7a2d3886 Mon Sep 17 00:00:00 2001
From: simonpj <unknown>
Date: Wed, 28 Feb 2001 11:44:40 +0000
Subject: [PATCH] [project @ 2001-02-28 11:44:39 by simonpj] Import/formatting
 wibbles

---
 ghc/compiler/main/HscMain.lhs     |    7 ++++---
 ghc/compiler/main/Main.hs         |    3 ++-
 ghc/compiler/rename/RnBinds.lhs   |    4 ++--
 ghc/compiler/rename/RnNames.lhs   |    1 -
 ghc/compiler/stgSyn/CoreToStg.lhs |    5 ++---
 ghc/compiler/typecheck/TcEnv.lhs  |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index b029b41..28a788b 100644
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -16,6 +16,9 @@ module HscMain ( HscResult(..), hscMain,
 import RdrHsSyn		( RdrNameStmt )
 import Rename		( renameStmt )
 import ByteCodeGen	( byteCodeGen )
+import Id		( Id, idName, idFlavour, modifyIdInfo )
+import IdInfo		( setFlavourInfo, makeConstantFlavour )
+import HscTypes		( InteractiveContext(..), TyThing(..) )
 #endif
 
 import HsSyn
@@ -44,8 +47,6 @@ import SimplStg		( stg2stg )
 import CodeGen		( codeGen )
 import CodeOutput	( codeOutput )
 
-import Id		( Id, idName, idFlavour, modifyIdInfo )
-import IdInfo		( setFlavourInfo, makeConstantFlavour )
 import Module		( ModuleName, moduleName, mkHomeModule, 
 			  moduleUserString )
 import CmdLineOpts
@@ -60,7 +61,7 @@ import CmStaticInfo	( GhciMode(..) )
 import HscStats		( ppSourceStats )
 import HscTypes		( ModDetails, ModIface(..), PersistentCompilerState(..),
 			  PersistentRenamerState(..), ModuleLocation(..),
-			  HomeSymbolTable, InteractiveContext(..),
+			  HomeSymbolTable, 
 			  NameSupply(..), PackageRuleBase, HomeIfaceTable, 
 			  typeEnvClasses, typeEnvTyCons, emptyIfaceTable
 			)
diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index a5b094f..bfd2087 100644
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -fno-warn-incomplete-patterns #-}
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.56 2001/02/27 15:25:18 simonmar Exp $
+-- $Id: Main.hs,v 1.57 2001/02/28 11:44:39 simonpj Exp $
 --
 -- GHC Driver program
 --
@@ -18,6 +18,7 @@ module Main (main) where
 
 #ifdef GHCI
 import InteractiveUI
+import Char		( toLower )
 #endif
 
 #ifndef mingw32_TARGET_OS
diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs
index 6ab814b..8a2932f 100644
--- a/ghc/compiler/rename/RnBinds.lhs
+++ b/ghc/compiler/rename/RnBinds.lhs
@@ -263,8 +263,8 @@ This is done {\em either} by pass 3 (for the top-level bindings),
 \begin{code}
 rn_mono_binds :: [RenamedSig]	        -- Signatures attached to this group
 	      -> RdrNameMonoBinds	
-	      -> RnMS (RenamedHsBinds, 	-- 
-		         FreeVars)	-- Free variables
+	      -> RnMS (RenamedHsBinds, 	-- Dependency analysed
+		       FreeVars)	-- Free variables
 
 rn_mono_binds siglist mbinds
   =
diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index 9e2b777..76f7bdc 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -27,7 +27,6 @@ import RnMonad
 import FiniteMap
 import PrelNames	( pRELUDE_Name, mAIN_Name, main_RDR_Unqual, isUnboundName )
 import UniqFM		( lookupUFM )
-import Bag		( bagToList )
 import Module		( ModuleName, moduleName, WhereFrom(..) )
 import NameSet
 import Name		( Name, nameSrcLoc, nameOccName,  nameEnvElts )
diff --git a/ghc/compiler/stgSyn/CoreToStg.lhs b/ghc/compiler/stgSyn/CoreToStg.lhs
index e5d3c41..a5e0e85 100644
--- a/ghc/compiler/stgSyn/CoreToStg.lhs
+++ b/ghc/compiler/stgSyn/CoreToStg.lhs
@@ -876,9 +876,8 @@ minusFVBinders vs fv = foldr minusFVBinder fv vs
 minusFVBinder :: Id -> FreeVarsInfo -> FreeVarsInfo
 minusFVBinder v fv | isId v && opt_KeepStgTypes
 		   = (fv `delVarEnv` v) `unionFVInfo` 
-			 tyvarFVInfo (tyVarsOfType (idType v))
-		   | otherwise
-		   =  fv `delVarEnv` v
+		     tyvarFVInfo (tyVarsOfType (idType v))
+		   | otherwise = fv `delVarEnv` v
 	-- When removing a binder, remember to add its type variables
 	-- c.f. CoreFVs.delBinderFV
 
diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs
index 4d9dbb8..20b0f90 100644
--- a/ghc/compiler/typecheck/TcEnv.lhs
+++ b/ghc/compiler/typecheck/TcEnv.lhs
@@ -58,7 +58,7 @@ import TyCon		( TyCon )
 import Class		( Class, ClassOpItem, ClassContext )
 import Name		( Name, OccName, NamedThing(..), 
 			  nameOccName, getSrcLoc, mkLocalName, isLocalName,
-			  nameIsLocalOrFrom, nameModule_maybe
+			  nameIsLocalOrFrom
 			)
 import Name		( NameEnv, lookupNameEnv, nameEnvElts, 
 			  extendNameEnvList, emptyNameEnv, plusNameEnv )
-- 
1.7.10.4