import Id
import CoreSyn
+import MkCore
import TyCon
import DataCon
import TcHsSyn ( shortCutLit )
\begin{code}
dsLit :: HsLit -> DsM CoreExpr
-dsLit (HsStringPrim s) = return (mkLit (MachStr s))
-dsLit (HsCharPrim c) = return (mkLit (MachChar c))
-dsLit (HsIntPrim i) = return (mkLit (MachInt i))
-dsLit (HsWordPrim w) = return (mkLit (MachWord w))
-dsLit (HsFloatPrim f) = return (mkLit (MachFloat f))
-dsLit (HsDoublePrim d) = return (mkLit (MachDouble d))
+dsLit (HsStringPrim s) = return (Lit (MachStr s))
+dsLit (HsCharPrim c) = return (Lit (MachChar c))
+dsLit (HsIntPrim i) = return (Lit (MachInt i))
+dsLit (HsWordPrim w) = return (Lit (MachWord w))
+dsLit (HsFloatPrim f) = return (Lit (MachFloat f))
+dsLit (HsDoublePrim d) = return (Lit (MachDouble d))
dsLit (HsChar c) = return (mkCharExpr c)
dsLit (HsString str) = mkStringExprFS str
----------------
tidyNPat :: HsOverLit Id -> Maybe (SyntaxExpr Id) -> SyntaxExpr Id -> Pat Id
-tidyNPat over_lit@(OverLit val False _ ty) mb_neg eq
+tidyNPat (OverLit val False _ ty) mb_neg _
-- Take short cuts only if the literal is not using rebindable syntax
| isIntTy ty = mk_con_pat intDataCon (HsIntPrim int_val)
| isWordTy ty = mk_con_pat wordDataCon (HsWordPrim int_val)