[project @ 1997-03-14 07:52:06 by simonpj]

Major update to more-or-less 2.02

3 files changed, 9 insertions, 13 deletions

diff --git a/ghc/compiler/codeGen/CgClosure.lhs b/ghc/compiler/codeGen/CgClosure.lhs
index dff94d2185..872827fba6 100644
--- a/ghc/compiler/codeGen/CgClosure.lhs
+++ b/ghc/compiler/codeGen/CgClosure.lhs
@@ -65,11 +65,10 @@ import PprType		( GenType{-instance Outputable-}, TyCon{-ditto-} )
 import Pretty		( prettyToUn, ppBesides, ppChar, ppPStr, ppCat, ppStr )
 import PrimRep		( isFollowableRep, PrimRep(..) )
 import TyCon		( isPrimTyCon, tyConDataCons )
+import Type             ( showTypeCategory )
 import Unpretty		( uppShow )
 import Util		( isIn, panic, pprPanic, assertPanic, pprTrace{-ToDo:rm-} )
 
-myWrapperMaybe = panic "CgClosure.myWrapperMaybe (ToDo)"
-showTypeCategory = panic "CgClosure.showTypeCategory (ToDo)"
 getWrapperArgTypeCategories = panic "CgClosure.getWrapperArgTypeCategories (ToDo)"
 \end{code}
 
@@ -563,7 +562,7 @@ closureCodeBody binder_info closure_info cc all_args body
     wrapper_maybe = get_ultimate_wrapper Nothing id
       where
     	get_ultimate_wrapper deflt x -- walk all the way up a "wrapper chain"
-	  = case (myWrapperMaybe x) of
+	  = case myWrapperMaybe x of
 	      Nothing -> deflt
 	      Just xx -> get_ultimate_wrapper (Just xx) xx
 
diff --git a/ghc/compiler/codeGen/CgMonad.lhs b/ghc/compiler/codeGen/CgMonad.lhs
index 2b23b93290..18902fc84b 100644
--- a/ghc/compiler/codeGen/CgMonad.lhs
+++ b/ghc/compiler/codeGen/CgMonad.lhs
@@ -67,7 +67,7 @@ import Id		( idType,
 import Maybes		( maybeToBool )
 import PprStyle		( PprStyle(..) )
 import PprType		( GenType{-instance Outputable-} )
-import Pretty		( ppAboves, ppCat, ppStr )
+import Pretty		( ppAboves, ppCat, ppPStr )
 import PrimRep		( getPrimRepSize, PrimRep(..) )
 import StgSyn		( SYN_IE(StgLiveVars) )
 import Type		( typePrimRep )
@@ -689,11 +689,11 @@ lookupBindC name info_down@(MkCgInfoDown _ static_binds _)
 		   Nothing
 		     -> pprPanic "lookupBindC:no info!\n"
 			(ppAboves [
-			    ppCat [ppStr "for:", ppr PprShowAll name],
-			    ppStr "(probably: data dependencies broken by an optimisation pass)",
-			    ppStr "static binds for:",
+			    ppCat [ppPStr SLIT("for:"), ppr PprShowAll name],
+			    ppPStr SLIT("(probably: data dependencies broken by an optimisation pass)"),
+			    ppPStr SLIT("static binds for:"),
 			    ppAboves [ ppr PprDebug i | (MkCgIdInfo i _ _ _) <- rngIdEnv static_binds ],
-			    ppStr "local binds for:",
+			    ppPStr SLIT("local binds for:"),
 			    ppAboves [ ppr PprDebug i | (MkCgIdInfo i _ _ _) <- rngIdEnv local_binds ]
 			 ])
 \end{code}
diff --git a/ghc/compiler/codeGen/CodeGen.lhs b/ghc/compiler/codeGen/CodeGen.lhs
index a786145a4a..4f2e58556c 100644
--- a/ghc/compiler/codeGen/CodeGen.lhs
+++ b/ghc/compiler/codeGen/CodeGen.lhs
@@ -57,11 +57,8 @@ codeGen mod_name (local_CCs, extern_CCs) import_names gen_tycons tycon_specs stg
   = let
 	doing_profiling   = opt_SccProfilingOn
 	compiling_prelude = opt_CompilingGhcInternals
-	maybe_split       = if opt_EnsureSplittableC
-			    then CSplitMarker
-			    else AbsCNop
-
-	cinfo = MkCompInfo mod_name
+	maybe_split       = if opt_EnsureSplittableC then CSplitMarker else AbsCNop
+	cinfo             = MkCompInfo mod_name
     in
     if not doing_profiling then
 	mkAbstractCs [