projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trim imports
[ghc-hetmet.git]
/
compiler
/
typecheck
/
TcForeign.lhs
diff --git
a/compiler/typecheck/TcForeign.lhs
b/compiler/typecheck/TcForeign.lhs
index
1493b3a
..
49ecffc
100644
(file)
--- a/
compiler/typecheck/TcForeign.lhs
+++ b/
compiler/typecheck/TcForeign.lhs
@@
-214,8
+214,7
@@
tcFExport fo@(ForeignExport (L loc nm) hs_ty spec) =
newUnique `thenM` \ uniq ->
getModule `thenM` \ mod ->
let
newUnique `thenM` \ uniq ->
getModule `thenM` \ mod ->
let
- gnm = mkExternalName uniq mod (mkForeignExportOcc (getOccName nm))
- (srcSpanStart loc)
+ gnm = mkExternalName uniq mod (mkForeignExportOcc (getOccName nm)) loc
id = mkExportedLocalId gnm sig_ty
bind = L loc (VarBind id rhs)
in
id = mkExportedLocalId gnm sig_ty
bind = L loc (VarBind id rhs)
in
@@
-264,7
+263,7
@@
mustBeIO = False
checkForeignRes non_io_result_ok pred_res_ty ty
-- (IO t) is ok, and so is any newtype wrapping thereof
checkForeignRes non_io_result_ok pred_res_ty ty
-- (IO t) is ok, and so is any newtype wrapping thereof
- | Just (io, res_ty) <- tcSplitIOType_maybe ty,
+ | Just (io, res_ty, _) <- tcSplitIOType_maybe ty,
pred_res_ty res_ty
= returnM ()
pred_res_ty res_ty
= returnM ()