From: simonpj <unknown>
Date: Thu, 6 Sep 2001 15:43:35 +0000 (+0000)
Subject: [project @ 2001-09-06 15:43:35 by simonpj]
X-Git-Tag: Approximately_9120_patches~1018
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=51f8f0f50c1a709ed898d149f458f781279fa4c6;p=ghc-hetmet.git

[project @ 2001-09-06 15:43:35 by simonpj]
Import wibbles
---

diff --git a/ghc/compiler/basicTypes/DataCon.lhs b/ghc/compiler/basicTypes/DataCon.lhs
index a925c1b..b5a093e 100644
--- a/ghc/compiler/basicTypes/DataCon.lhs
+++ b/ghc/compiler/basicTypes/DataCon.lhs
@@ -25,7 +25,6 @@ module DataCon (
 import {-# SOURCE #-} Subst( substTyWith )
 import {-# SOURCE #-} PprType( pprType )
 
-import CmdLineOpts	( opt_DictsStrict )
 import Type		( Type, TauType, ThetaType, 
 			  mkForAllTys, mkFunTys, mkTyConApp,
 			  mkTyVarTys, splitTyConApp_maybe, repType, 
diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 435e50a..333b230 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -#include "hschooks.h" #-}
 
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.68 2001/09/04 18:29:20 ken Exp $
+-- $Id: DriverFlags.hs,v 1.69 2001/09/06 15:43:35 simonpj Exp $
 --
 -- Driver flags
 --
@@ -76,8 +76,8 @@ processArgs _spec [] spare = return (reverse spare)
 
 processArgs spec args@(('-':arg):args') spare = do
   case findArg spec arg of
-    Just (rest,action) ->  do args' <- processOneArg action rest args
-			      processArgs spec args' spare
+    Just (rest,action) -> do args' <- processOneArg action rest args
+			     processArgs spec args' spare
     Nothing	       -> processArgs spec args' (('-':arg):spare)
 
 processArgs spec (arg:args) spare = 
diff --git a/ghc/compiler/prelude/TysWiredIn.lhs b/ghc/compiler/prelude/TysWiredIn.lhs
index 0950413..daa9d19 100644
--- a/ghc/compiler/prelude/TysWiredIn.lhs
+++ b/ghc/compiler/prelude/TysWiredIn.lhs
@@ -91,18 +91,16 @@ import RdrName		( rdrNameOcc )
 import DataCon		( DataCon, mkDataCon, dataConId )
 import Var		( TyVar, tyVarKind )
 import TyCon		( TyCon, AlgTyConFlavour(..), tyConDataCons,
-			  mkTupleTyCon, isUnLiftedTyCon, mkAlgTyCon
+			  mkTupleTyCon, mkAlgTyCon
 			)
 
 import BasicTypes	( Arity, RecFlag(..), Boxity(..), isBoxed, StrictnessMark(..) )
 
 import Type		( Type, mkTyConTy, mkTyConApp, mkTyVarTys, 
 			  mkArrowKinds, liftedTypeKind, unliftedTypeKind,
-			  splitTyConApp_maybe,
 			  TauType, ThetaType )
 import Unique		( incrUnique, mkTupleTyConUnique, mkTupleDataConUnique )
 import PrelNames
-import CmdLineOpts
 import Array
 
 alpha_tyvar	  = [alphaTyVar]
diff --git a/ghc/compiler/typecheck/TcType.lhs b/ghc/compiler/typecheck/TcType.lhs
index eee1f20..4d6d761 100644
--- a/ghc/compiler/typecheck/TcType.lhs
+++ b/ghc/compiler/typecheck/TcType.lhs
@@ -118,8 +118,8 @@ import Type		(	-- Re-exports
 			  tidyTyVar, tidyTyVars, eqKind, eqUsage,
 			  hasMoreBoxityInfo, liftedBoxity, superBoxity, typeKind, superKind
 			)
-import TyCon		( TyCon, isPrimTyCon, tyConArity, isNewTyCon, isUnLiftedTyCon )
-import Class		( classTyCon, classHasFDs, Class )
+import TyCon		( TyCon, isUnLiftedTyCon )
+import Class		( classHasFDs, Class )
 import Var		( TyVar, tyVarKind )
 import ForeignCall	( Safety, playSafe )
 import VarEnv