X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsUtils.lhs;h=df4885fb6b533b5ae4951a2042dd12264fc8a3ec;hp=0ff936d248304f9ab243d76ec0c6d145371484a5;hb=04feba252e40d16101b92948cd1e13c7bc1f3062;hpb=fe108ff1b0d4b52679ba6deddadf5d2fb3fa8f22

diff --git a/ghc/compiler/hsSyn/HsUtils.lhs b/ghc/compiler/hsSyn/HsUtils.lhs
index 0ff936d..df4885f 100644
--- a/ghc/compiler/hsSyn/HsUtils.lhs
+++ b/ghc/compiler/hsSyn/HsUtils.lhs
@@ -200,7 +200,7 @@ nlWildConPat :: DataCon -> LPat RdrName
 nlWildConPat con = noLoc (ConPatIn (noLoc (getRdrName con))
 				   (PrefixCon (nOfThem (dataConSourceArity con) nlWildPat)))
 
-nlTuplePat pats box = noLoc (TuplePat pats box)
+nlTuplePat pats box = noLoc (TuplePat pats box placeHolderType)
 nlWildPat  = noLoc (WildPat placeHolderType)	-- Pre-typechecking
 
 nlHsDo :: HsStmtContext Name -> [LStmt id] -> LHsExpr id -> LHsExpr id
@@ -381,7 +381,7 @@ collectl (L l pat) bndrs
 				  
     go (ListPat pats _)    	  = foldr collectl bndrs pats
     go (PArrPat pats _)    	  = foldr collectl bndrs pats
-    go (TuplePat pats _)  	  = foldr collectl bndrs pats
+    go (TuplePat pats _ _)  	  = foldr collectl bndrs pats
 				  
     go (ConPatIn c ps)   	  = foldr collectl bndrs (hsConArgs ps)
     go (ConPatOut c _ ds bs ps _) = map noLoc ds
@@ -407,15 +407,15 @@ collectSigTysFromPat pat = collect_lpat pat []
 
 collect_lpat pat acc = collect_pat (unLoc pat) acc
 
-collect_pat (SigPatIn pat ty)  acc = collect_lpat pat (ty:acc)
-collect_pat (TypePat ty)       acc = ty:acc
-
-collect_pat (LazyPat pat)      acc = collect_lpat pat acc
-collect_pat (AsPat a pat)      acc = collect_lpat pat acc
-collect_pat (ParPat  pat)      acc = collect_lpat pat acc
-collect_pat (ListPat pats _)   acc = foldr collect_lpat acc pats
-collect_pat (PArrPat pats _)   acc = foldr collect_lpat acc pats
-collect_pat (TuplePat pats _)  acc = foldr collect_lpat acc pats
-collect_pat (ConPatIn c ps)    acc = foldr collect_lpat acc (hsConArgs ps)
-collect_pat other	       acc = acc 	-- Literals, vars, wildcard
+collect_pat (SigPatIn pat ty)  	acc = collect_lpat pat (ty:acc)
+collect_pat (TypePat ty)       	acc = ty:acc
+
+collect_pat (LazyPat pat)      	acc = collect_lpat pat acc
+collect_pat (AsPat a pat)      	acc = collect_lpat pat acc
+collect_pat (ParPat  pat)      	acc = collect_lpat pat acc
+collect_pat (ListPat pats _)   	acc = foldr collect_lpat acc pats
+collect_pat (PArrPat pats _)   	acc = foldr collect_lpat acc pats
+collect_pat (TuplePat pats _ _) acc = foldr collect_lpat acc pats
+collect_pat (ConPatIn c ps)    	acc = foldr collect_lpat acc (hsConArgs ps)
+collect_pat other	       	acc = acc 	-- Literals, vars, wildcard
 \end{code}