X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcGenDeriv.lhs;h=2192531d3debec3ed80542fa637ddc49670812b5;hp=7cee738da628ebfeb366b10f3bba9b875c49d7ef;hb=58521c72cec262496dabf5fffb057d25ab17a0f7;hpb=b272715a0c248f219e188745c57bf42705f9c391

diff --git a/compiler/typecheck/TcGenDeriv.lhs b/compiler/typecheck/TcGenDeriv.lhs
index 7cee738..2192531 100644
--- a/compiler/typecheck/TcGenDeriv.lhs
+++ b/compiler/typecheck/TcGenDeriv.lhs
@@ -42,7 +42,6 @@ import Name
 import HscTypes
 import PrelInfo
 import PrelNames
-import MkId
 import PrimOp
 import SrcLoc
 import TyCon
@@ -58,9 +57,7 @@ import Util
 import MonadUtils
 import Outputable
 import FastString
-import OccName
 import Bag
-
 import Data.List	( partition, intersperse )
 \end{code}
 
@@ -721,7 +718,7 @@ gen_Ix_binds loc tycon
 
 	mk_qual a b c = noLoc $ mkBindStmt (nlVarPat c)
 				 (nlHsApp (nlHsVar range_RDR) 
-					(nlTuple [nlHsVar a, nlHsVar b] Boxed))
+					  (mkLHsVarTuple [a,b]))
 
     ----------------
     single_con_index
@@ -743,11 +740,11 @@ gen_Ix_binds loc tycon
 	    ) plus_RDR (
 		genOpApp (
 		    (nlHsApp (nlHsVar unsafeRangeSize_RDR) 
-			   (nlTuple [nlHsVar l, nlHsVar u] Boxed))
+			     (mkLHsVarTuple [l,u]))
 		) times_RDR (mk_index rest)
 	   )
 	mk_one l u i
-	  = nlHsApps unsafeIndex_RDR [nlTuple [nlHsVar l, nlHsVar u] Boxed, nlHsVar i]
+	  = nlHsApps unsafeIndex_RDR [mkLHsVarTuple [l,u], nlHsVar i]
 
     ------------------
     single_con_inRange
@@ -756,8 +753,7 @@ gen_Ix_binds loc tycon
 		 con_pat cs_needed] $
 	  foldl1 and_Expr (zipWith3Equal "single_con_inRange" in_range as_needed bs_needed cs_needed)
       where
-    	in_range a b c = nlHsApps inRange_RDR [nlTuple [nlHsVar a, nlHsVar b] Boxed,
-					       nlHsVar c]
+    	in_range a b c = nlHsApps inRange_RDR [mkLHsVarTuple [a,b], nlHsVar c]
 \end{code}
 
 %************************************************************************
@@ -835,9 +831,8 @@ gen_Read_binds get_fixity loc tycon
             _     -> [nlHsApp (nlHsVar choose_RDR) 
     		   	      (nlList (map mk_pair nullary_cons))]
     
-    mk_pair con = nlTuple [nlHsLit (mkHsString (data_con_str con)), 
-			   result_expr con []]
-			  Boxed
+    mk_pair con = mkLHsTupleExpr [nlHsLit (mkHsString (data_con_str con)), 
+			          result_expr con []]
     
     read_non_nullary_con data_con
       | is_infix  = mk_parser infix_prec  infix_stmts  body
@@ -1478,7 +1473,7 @@ gen_Foldable_binds loc tycon
   where
     data_cons = tyConDataCons tycon
 
-    foldr_bind = L loc $ mkFunBind (L loc foldr_RDR) (map foldr_eqn data_cons)
+    foldr_bind = L loc $ mkFunBind (L loc foldable_foldr_RDR) (map foldr_eqn data_cons)
     foldr_eqn con = evalState (match_for_con z_Expr [f_Pat,z_Pat] con parts) bs_RDRs
       where 
         parts = foldDataConArgs ft_foldr con