summaryrefslogtreecommitdiff
path: root/compiler/deSugar
diff options
context:
space:
mode:
authorMax Bolingbroke <batterseapower@hotmail.com>2008-07-31 01:23:40 +0000
committerMax Bolingbroke <batterseapower@hotmail.com>2008-07-31 01:23:40 +0000
commit620531f5074b189bd04d10c88196493b1e2fa692 (patch)
tree9ff22f99a5619680e5494d74defe16d2a0226ff3 /compiler/deSugar
parent146d36e87447f34fd9d0f6a1135173f899aa7f52 (diff)
downloadhaskell-620531f5074b189bd04d10c88196493b1e2fa692.tar.gz
Handle introduction of MkCore in DsForeign
Diffstat (limited to 'compiler/deSugar')
-rw-r--r--compiler/deSugar/DsForeign.lhs8
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/deSugar/DsForeign.lhs b/compiler/deSugar/DsForeign.lhs
index b4c938c1e9..b0c82f8591 100644
--- a/compiler/deSugar/DsForeign.lhs
+++ b/compiler/deSugar/DsForeign.lhs
@@ -145,7 +145,7 @@ dsCImport id (CLabel cid) cconv _ = do
(resTy, foRhs) <- resultWrapper ty
ASSERT(fromJust resTy `coreEqType` addrPrimTy) -- typechecker ensures this
let
- rhs = foRhs (mkLit (MachLabel cid stdcall_info))
+ rhs = foRhs (Lit (MachLabel cid stdcall_info))
stdcall_info = fun_type_arg_stdcall_info cconv ty
in
return ([(id, rhs)], empty, empty)
@@ -250,7 +250,7 @@ The function that does most of the work for `@foreign export@' declarations.
For each `@foreign export foo@' in a module M we generate:
\begin{itemize}
\item a C function `@foo@', which calls
-\item a Haskell stub `@M.$ffoo@', which calls
+\item a Haskell stub `@M.\$ffoo@', which calls
\end{itemize}
the user-written Haskell function `@M.foo@'.
@@ -356,8 +356,8 @@ dsFExportDynamic id cconv = do
-}
adj_args = [ mkIntLitInt (ccallConvToInt cconv)
, Var stbl_value
- , mkLit (MachLabel fe_nm mb_sz_args)
- , mkLit (mkStringLit typestring)
+ , Lit (MachLabel fe_nm mb_sz_args)
+ , Lit (mkMachString typestring)
]
-- name of external entry point providing these services.
-- (probably in the RTS.)