X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FCheck.lhs;h=85b8f9ddd9959da94b65f6cbf457b47164bb0754;hb=0a4c03a87095fa6440fa89369daa8f3ea727cf7f;hp=517dc79398dc999cb8ac974308f47747e3703035;hpb=5dc9a4504ea4d3df462081a7dbfde0431eac133e;p=ghc-hetmet.git

diff --git a/compiler/deSugar/Check.lhs b/compiler/deSugar/Check.lhs
index 517dc79..85b8f9d 100644
--- a/compiler/deSugar/Check.lhs
+++ b/compiler/deSugar/Check.lhs
@@ -438,12 +438,12 @@ mb_neg (Just _) v = -v
 get_unused_cons :: [Pat Id] -> [DataCon]
 get_unused_cons used_cons = unused_cons
      where
-       (ConPatOut { pat_ty = ty }) = head used_cons
-       ty_con 		      = tcTyConAppTyCon ty		-- Newtype observable
-       all_cons        	      = tyConDataCons ty_con
-       used_cons_as_id 	      = map (\ (ConPatOut{ pat_con = L _ d}) -> d) used_cons
-       unused_cons     	      = uniqSetToList
-		 (mkUniqSet all_cons `minusUniqSet` mkUniqSet used_cons_as_id) 
+       (ConPatOut { pat_con = l_con, pat_ty = ty }) = head used_cons
+       ty_con 	       = dataConTyCon (unLoc l_con)	-- Newtype observable
+       all_cons        = tyConDataCons ty_con
+       used_cons_as_id = map (\ (ConPatOut{ pat_con = L _ d}) -> d) used_cons
+       unused_cons     = uniqSetToList
+			 (mkUniqSet all_cons `minusUniqSet` mkUniqSet used_cons_as_id) 
 
 all_vars :: [Pat Id] -> Bool
 all_vars []             = True
@@ -623,7 +623,7 @@ simplify_pat pat@(WildPat gt) = pat
 simplify_pat (VarPat id)      = WildPat (idType id) 
 simplify_pat (VarPatOut id _) = WildPat (idType id) 	-- Ignore the bindings
 simplify_pat (ParPat p)       = unLoc (simplify_lpat p)
-simplify_pat (LazyPat p)      = WildPat (hsPatType p)	-- For overlap and exhaustiveness checking
+simplify_pat (LazyPat p)      = WildPat (hsLPatType p)	-- For overlap and exhaustiveness checking
 							-- purposes, a ~pat is like a wildcard
 simplify_pat (BangPat p)      = unLoc (simplify_lpat p)
 simplify_pat (AsPat id p)     = unLoc (simplify_lpat p)