floating-point fix for x86_64

[ghc-hetmet.git] / ghc / compiler / typecheck / TcMatches.lhs

diff --git a/ghc/compiler/typecheck/TcMatches.lhs b/ghc/compiler/typecheck/TcMatches.lhs
index d6e66ef..07a1094 100644 (file)
--- a/ghc/compiler/typecheck/TcMatches.lhs
+++ b/ghc/compiler/typecheck/TcMatches.lhs
@@ -17,7 +17,7 @@ import {-# SOURCE #-} TcExpr( tcSyntaxOp, tcInferRho, tcMonoExpr, tcPolyExpr )
 import HsSyn           ( HsExpr(..), LHsExpr, MatchGroup(..),
                          Match(..), LMatch, GRHSs(..), GRHS(..), 
                          Stmt(..), LStmt, HsMatchContext(..), HsStmtContext(..),
-                         pprMatch, isIrrefutableHsPat,
+                         pprMatch, isIrrefutableHsPat, mkHsCoerce,
                          pprMatchContext, pprStmtContext, 
                          noSyntaxExpr, matchGroupArity, pprMatches,
                          ExprCoFn )
@@ -42,12 +42,9 @@ import TysWiredIn    ( stringTy, boolTy, parrTyCon, listTyCon, mkListTy, mkPArrTy )
 import PrelNames       ( bindMName, returnMName, mfixName, thenMName, failMName )
 import Id              ( idType, mkLocalId )
 import TyCon           ( TyCon )
-import Util            ( isSingleton )
 import Outputable
 import SrcLoc          ( Located(..), getLoc )
 import ErrUtils                ( Message )
-
-import List            ( nub )
 \end{code}
 
 %************************************************************************
@@ -115,7 +112,7 @@ tcMatchLambda match res_ty
     doc = sep [ ptext SLIT("The lambda expression")
                 <+> quotes (pprSetDepth 1 $ pprMatches LambdaExpr match),
                        -- The pprSetDepth makes the abstraction print briefly
-               ptext SLIT("has") <+> speakNOf n_pats (ptext SLIT("arguments"))]
+               ptext SLIT("has") <+> speakNOf n_pats (ptext SLIT("argument"))]
     match_ctxt = MC { mc_what = LambdaExpr,
                      mc_body = tcPolyExpr }
 \end{code}
@@ -471,7 +468,7 @@ tcMDoStmt tc_rhs ctxt (RecStmt stmts laterNames recNames _ _) res_ty thing_insid
                -- poly_id may have a polymorphic type
                -- but mono_ty is just a monomorphic type variable
             ; co_fn <- tcSubExp (idType poly_id) mono_ty
-            ; return (HsCoerce co_fn (HsVar poly_id)) }
+            ; return (mkHsCoerce co_fn (HsVar poly_id)) }
 
 tcMDoStmt tc_rhs ctxt stmt res_ty thing_inside
   = pprPanic "tcMDoStmt: unexpected Stmt" (ppr stmt)