X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnExpr.lhs;h=ff6e4123bb78d5e298602b7008546fffd94bc6ec;hb=418175d3c36ca51495d9dfb085fb01711e4c38f9;hp=e78e942bf20b7e9da8417a65cde530f6142a5f71;hpb=8401cdef44ef0877197f4cd978adae8798d0a8e7;p=ghc-hetmet.git

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index e78e942..ff6e412 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -20,14 +20,13 @@ import RnSource  ( rnSrcDecls, rnSplice, checkTH )
 import RnBinds	 ( rnLocalBindsAndThen, rnValBinds,
 		   rnMatchGroup, trimWith ) 
 import HsSyn
-import RnHsSyn
 import TcRnMonad
 import RnEnv
 import HscTypes         ( availNames )
 import RnNames		( getLocalDeclBinders, extendRdrEnvRn )
 import RnTypes		( rnHsTypeFVs, rnLPat, rnOverLit, rnPatsAndThen, rnLit,
 			  mkOpFormRn, mkOpAppRn, mkNegAppRn, checkSectionPrec, 
-			  dupFieldErr, checkTupSize )
+			  rnHsRecFields, checkTupSize )
 import DynFlags		( DynFlag(..) )
 import BasicTypes	( FixityDirection(..) )
 import SrcLoc           ( SrcSpan )
@@ -209,31 +208,29 @@ rnExpr e@(HsDo do_or_lc stmts body _)
 
 rnExpr (ExplicitList _ exps)
   = rnExprs exps		 	`thenM` \ (exps', fvs) ->
-    returnM  (ExplicitList placeHolderType exps', fvs `addOneFV` listTyCon_name)
+    returnM  (ExplicitList placeHolderType exps', fvs)
 
 rnExpr (ExplicitPArr _ exps)
   = rnExprs exps		 	`thenM` \ (exps', fvs) ->
     returnM  (ExplicitPArr placeHolderType exps', fvs)
 
 rnExpr e@(ExplicitTuple exps boxity)
-  = checkTupSize tup_size			`thenM_`
+  = checkTupSize (length exps)			`thenM_`
     rnExprs exps	 			`thenM` \ (exps', fvs) ->
-    returnM (ExplicitTuple exps' boxity, fvs `addOneFV` tycon_name)
-  where
-    tup_size   = length exps
-    tycon_name = tupleTyCon_name boxity tup_size
+    returnM (ExplicitTuple exps' boxity, fvs)
 
-rnExpr (RecordCon con_id _ (HsRecordBinds rbinds))
-  = lookupLocatedOccRn con_id		`thenM` \ conname ->
-    rnRbinds "construction" rbinds	`thenM` \ (rbinds', fvRbinds) ->
-    returnM (RecordCon conname noPostTcExpr (HsRecordBinds rbinds'), 
-	     fvRbinds `addOneFV` unLoc conname)
+rnExpr (RecordCon con_id _ rbinds)
+  = do	{ conname <- lookupLocatedOccRn con_id
+	; (rbinds', fvRbinds) <- rnHsRecFields "construction" (Just conname) 
+						rnLExpr HsVar rbinds
+	; return (RecordCon conname noPostTcExpr rbinds', 
+		  fvRbinds `addOneFV` unLoc conname) }
 
-rnExpr (RecordUpd expr (HsRecordBinds rbinds) _ _)
-  = rnLExpr expr		`thenM` \ (expr', fvExpr) ->
-    rnRbinds "update" rbinds	`thenM` \ (rbinds', fvRbinds) ->
-    returnM (RecordUpd expr' (HsRecordBinds rbinds') placeHolderType placeHolderType, 
-	     fvExpr `plusFV` fvRbinds)
+rnExpr (RecordUpd expr rbinds _ _ _)
+  = do	{ (expr', fvExpr) <- rnLExpr expr
+	; (rbinds', fvRbinds) <- rnHsRecFields "update" Nothing rnLExpr HsVar rbinds
+	; return (RecordUpd expr' rbinds' [] [] [], 
+		  fvExpr `plusFV` fvRbinds) }
 
 rnExpr (ExprWithTySig expr pty)
   = do	{ (pty', fvTy) <- rnHsTypeFVs doc pty
@@ -505,29 +502,6 @@ rnArithSeq (FromThenTo expr1 expr2 expr3)
 	    plusFVs [fvExpr1, fvExpr2, fvExpr3])
 \end{code}
 
-
-%************************************************************************
-%*									*
-\subsubsection{@Rbinds@s and @Rpats@s: in record expressions}
-%*									*
-%************************************************************************
-
-\begin{code}
-rnRbinds str rbinds 
-  = mappM_ field_dup_err dup_fields	`thenM_`
-    mapFvRn rn_rbind rbinds		`thenM` \ (rbinds', fvRbind) ->
-    returnM (rbinds', fvRbind)
-  where
-    (_, dup_fields) = removeDups cmpLocated [ f | (f,_) <- rbinds ]
-
-    field_dup_err dups = mappM_ (\f -> addLocErr f (dupFieldErr str)) dups
-
-    rn_rbind (field, expr)
-      = lookupLocatedGlobalOccRn field	`thenM` \ fieldname ->
-	rnLExpr expr			`thenM` \ (expr', fvExpr) ->
-	returnM ((fieldname, expr'), fvExpr `addOneFV` unLoc fieldname)
-\end{code}
-
 %************************************************************************
 %*									*
 	Template Haskell brackets