From fa6b1e4523a9d8a1fe85a95e5c69e767746cbe7d Mon Sep 17 00:00:00 2001
From: simonpj <unknown>
Date: Wed, 25 Jun 2003 16:24:58 +0000
Subject: [PATCH] [project @ 2003-06-25 16:24:56 by simonpj] Wibbles; esp
 fixing the stage2 build

---
 ghc/compiler/Makefile                 |    1 -
 ghc/compiler/deSugar/DsExpr.lhs       |    2 +-
 ghc/compiler/typecheck/TcRnDriver.lhs |    4 ++--
 ghc/compiler/types/TyCon.lhs          |    8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index a8afae0..4e0f5b7 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -368,7 +368,6 @@ ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
 endif
 
-utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS		= -fglasgow-exts 
 
 ifeq "$(bootstrapped)" "YES"
diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/ghc/compiler/deSugar/DsExpr.lhs
index f9d0a6c..2865f94 100644
--- a/ghc/compiler/deSugar/DsExpr.lhs
+++ b/ghc/compiler/deSugar/DsExpr.lhs
@@ -629,7 +629,7 @@ dsDo do_or_lc stmts ids result_ty
 	    returnDs (mkIfThenElse expr2 rest 
 				   (App (App fail_id (Type b_ty)) core_msg))
     
-	go (LetStmt binds : stmts )
+	go (LetStmt binds : stmts)
 	  = go stmts 		`thenDs` \ rest   ->
 	    dsLet binds	rest
 	    
diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs
index bd65fc4..1914c96 100644
--- a/ghc/compiler/typecheck/TcRnDriver.lhs
+++ b/ghc/compiler/typecheck/TcRnDriver.lhs
@@ -408,8 +408,8 @@ tc_stmts stmts
 	-- OK, we're ready to typecheck the stmts
 	traceTc (text "tcs 2") ;
 	((ids, tc_stmts), lie) <- 
-		getLIE 					$ 
-		tcStmtsAndThen combine stmt_ctxt stmts	$ 
+		getLIE 						$ 
+		tcStmtsAndThen combine stmt_ctxt all_stmts	$ 
 		do {
 		    -- Look up the names right in the middle,
 		    -- where they will all be in scope
diff --git a/ghc/compiler/types/TyCon.lhs b/ghc/compiler/types/TyCon.lhs
index ca41d14..6f1ac54 100644
--- a/ghc/compiler/types/TyCon.lhs
+++ b/ghc/compiler/types/TyCon.lhs
@@ -261,7 +261,7 @@ tyConGenIds tycon = case tyConGenInfo tycon of
 -- This is the making of a TyCon. Just the same as the old mkAlgTyCon,
 -- but now you also have to pass in the generic information about the type
 -- constructor - you can get hold of it easily (see Generics module)
-mkAlgTyCon name kind tyvars theta argvrcs cons sels flavour rec 
+mkAlgTyCon name kind tyvars theta argvrcs cons sels flavour is_rec 
 	      gen_info
   = AlgTyCon {	
 	tyConName 		= name,
@@ -275,11 +275,11 @@ mkAlgTyCon name kind tyvars theta argvrcs cons sels flavour rec
 	selIds			= sels,
 	algTyConClass		= Nothing,
 	algTyConFlavour 	= flavour,
-	algTyConRec		= rec,
+	algTyConRec		= is_rec,
 	genInfo   	        = gen_info
     }
 
-mkClassTyCon name kind tyvars argvrcs con clas flavour rec
+mkClassTyCon name kind tyvars argvrcs con clas flavour is_rec
   = AlgTyCon {	
 	tyConName 		= name,
 	tyConUnique		= nameUnique name,
@@ -292,7 +292,7 @@ mkClassTyCon name kind tyvars argvrcs con clas flavour rec
 	selIds			= [],
 	algTyConClass		= Just clas,
 	algTyConFlavour		= flavour,
-	algTyConRec		= rec,
+	algTyConRec		= is_rec,
 	genInfo   	        = Nothing
     }
 
-- 
1.7.10.4