X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcForeign.lhs;h=4c00838abc8ff683e5da5c8d8ba56664b8297d18;hb=3f0c8ab6fb074f0d93e64cde0ab474dfc340c66e;hp=cf850f148496ae2fda4c6992c92dec234adae231;hpb=3160f854580e6d8df412c8cd34d93bae27175d67;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcForeign.lhs b/ghc/compiler/typecheck/TcForeign.lhs
index cf850f1..4c00838 100644
--- a/ghc/compiler/typecheck/TcForeign.lhs
+++ b/ghc/compiler/typecheck/TcForeign.lhs
@@ -20,41 +20,34 @@ module TcForeign
 #include "HsVersions.h"
 
 import HsSyn		( HsDecl(..), ForeignDecl(..), HsExpr(..),
-			  ExtName(..), isDynamic, MonoBinds(..),
+			  ExtName(Dynamic), isDynamicExtName, MonoBinds(..),
 			  OutPat(..), ForKind(..)
 			)
 import RnHsSyn		( RenamedHsDecl, RenamedForeignDecl )
 
 import TcMonad
 import TcEnv		( newLocalId )
-import TcType		( tcInstTcType, typeToTcType, tcSplitRhoTy, zonkTcTypeToType )
-import TcMonoType	( tcHsType )
+import TcType		( tcSplitRhoTy, zonkTcTypeToType )
+import TcMonoType	( tcHsBoxedSigType )
 import TcHsSyn		( TcMonoBinds, TypecheckedForeignDecl,
 			  TcForeignExportDecl )
 import TcExpr		( tcId, tcPolyExpr )			
 import Inst		( emptyLIE, LIE, plusLIE )
-import CoreSyn
 
 import ErrUtils		( Message )
-import Id		( Id, idName, mkUserId )
+import Id		( Id, idName, mkVanillaId )
 import Name		( nameOccName )
 import Type		( splitFunTys
 			, splitTyConApp_maybe
 			, splitForAllTys
-			, splitRhoTy
-			, isForAllTy
-			, mkForAllTys
 			)
-
 import TysWiredIn	( isFFIArgumentTy, isFFIResultTy, 
-			  isFFIExternalTy, isAddrTy
+			  isFFIExternalTy, isFFIDynArgumentTy, isFFIDynResultTy,
+			  isFFILabelTy
 			)
 import Type             ( Type )
 import Unique
 import Outputable
-import Util
-import CmdLineOpts	( opt_GlasgowExts )
-import Maybes		( maybeToBool )
 
 \end{code}
 
@@ -82,7 +75,7 @@ isForeignImport (ForeignDecl _ k _ dyn _ _) =
 
 -- exports a binding
 isForeignExport :: ForeignDecl name -> Bool
-isForeignExport (ForeignDecl _ FoExport _ ext_nm _ _) = not (isDynamic ext_nm)
+isForeignExport (ForeignDecl _ FoExport _ ext_nm _ _) = not (isDynamicExtName ext_nm)
 isForeignExport _				      = False
 
 \end{code}
@@ -92,7 +85,7 @@ tcFImport :: RenamedForeignDecl -> TcM s (Id, TypecheckedForeignDecl)
 tcFImport fo@(ForeignDecl nm FoExport hs_ty Dynamic cconv src_loc) =
    tcAddSrcLoc src_loc		     $
    tcAddErrCtxt (foreignDeclCtxt fo) $
-   tcHsType hs_ty		    `thenTc`	\ sig_ty ->
+   tcHsBoxedSigType hs_ty	     `thenTc`	\ sig_ty ->
    let
       -- drop the foralls before inspecting the structure
       -- of the foreign type.
@@ -101,27 +94,28 @@ tcFImport fo@(ForeignDecl nm FoExport hs_ty Dynamic cconv src_loc) =
    case splitFunTys t_ty of
      (arg_tys, res_ty) -> 
 	checkForeignExport True t_ty arg_tys res_ty `thenTc_`
-	let i = (mkUserId nm sig_ty) in
+	let i = (mkVanillaId nm sig_ty) in
 	returnTc (i, (ForeignDecl i FoExport undefined Dynamic cconv src_loc))
 
 tcFImport fo@(ForeignDecl nm FoLabel hs_ty ext_nm cconv src_loc) =
    tcAddSrcLoc src_loc		     $
    tcAddErrCtxt (foreignDeclCtxt fo) $
-   tcHsType hs_ty		    `thenTc`	\ sig_ty ->
+   tcHsBoxedSigType hs_ty	    `thenTc`	\ sig_ty ->
    let
       -- drop the foralls before inspecting the structure
       -- of the foreign type.
     (_, t_ty) = splitForAllTys sig_ty
    in
-   check (isAddrTy t_ty) (illegalForeignTyErr False{-result-} sig_ty) `thenTc_`
-   let i = (mkUserId nm sig_ty) in
+   check (isFFILabelTy t_ty) 
+	(illegalForeignTyErr False{-result-} sig_ty) 	`thenTc_`
+   let i = (mkVanillaId nm sig_ty) in
    returnTc (i, (ForeignDecl i FoLabel undefined ext_nm cconv src_loc))
 
-tcFImport fo@(ForeignDecl nm imp_exp hs_ty ext_nm cconv src_loc) =
+tcFImport fo@(ForeignDecl nm imp_exp@(FoImport isUnsafe) hs_ty ext_nm cconv src_loc) =
    tcAddSrcLoc src_loc		     $
    tcAddErrCtxt (foreignDeclCtxt fo) $
 
-   tcHsType hs_ty		     `thenTc` \ ty ->
+   tcHsBoxedSigType hs_ty		     `thenTc` \ ty ->
     -- Check that the type has the right shape
     -- and that the argument and result types are acceptable.
    let
@@ -131,8 +125,8 @@ tcFImport fo@(ForeignDecl nm imp_exp hs_ty ext_nm cconv src_loc) =
    in
    case splitFunTys t_ty of
      (arg_tys, res_ty) ->
-        checkForeignImport (isDynamic ext_nm) ty arg_tys res_ty `thenTc_`
-	let i = (mkUserId nm ty) in
+        checkForeignImport (isDynamicExtName ext_nm) (not isUnsafe) ty arg_tys res_ty `thenTc_`
+	let i = (mkVanillaId nm ty) in
 	returnTc (i, (ForeignDecl i imp_exp undefined ext_nm cconv src_loc))
 
 tcFExport :: RenamedForeignDecl -> TcM s (LIE, TcMonoBinds, TcForeignExportDecl)
@@ -140,9 +134,8 @@ tcFExport fo@(ForeignDecl nm imp_exp hs_ty ext_nm cconv src_loc) =
    tcAddSrcLoc src_loc		     $
    tcAddErrCtxt (foreignDeclCtxt fo) $
 
-   tcHsType hs_ty		       `thenTc`	\ sig_ty ->
-   let sig_tc_ty = typeToTcType sig_ty in
-   tcPolyExpr (HsVar nm) sig_tc_ty     `thenTc`    \ (rhs, lie, _, _, _) ->
+   tcHsBoxedSigType hs_ty	       `thenTc`	\ sig_ty ->
+   tcPolyExpr (HsVar nm) sig_ty     `thenTc`    \ (rhs, lie, _, _, _) ->
 
    let
       -- drop the foralls before inspecting the structure
@@ -156,7 +149,7 @@ tcFExport fo@(ForeignDecl nm imp_exp hs_ty ext_nm cconv src_loc) =
 	  -- than its declared/inferred type. Hence the need
 	  -- to create a local binding which will call the exported function
 	  -- at a particular type (and, maybe, overloading).
-	newLocalId (nameOccName nm) sig_tc_ty	`thenNF_Tc` \ i ->
+	newLocalId (nameOccName nm) sig_ty src_loc	`thenNF_Tc` \ i ->
 	let
 	    bind  = VarMonoBind i rhs
 	in
@@ -168,62 +161,62 @@ tcFExport fo@(ForeignDecl nm imp_exp hs_ty ext_nm cconv src_loc) =
 
 
 \begin{code}
-checkForeignImport :: Bool -> Type -> [Type] -> Type -> TcM s ()
-checkForeignImport is_dynamic ty args res
+checkForeignImport :: Bool -> Bool -> Type -> [Type] -> Type -> TcM s ()
+checkForeignImport is_dynamic is_safe ty args res
  | is_dynamic =
     -- * first arg has got to be an Addr
    case args of
      []     -> check False (illegalForeignTyErr True{-Arg-} ty)
      (x:xs) ->
-        check (isAddrTy x) (illegalForeignTyErr True{-Arg-} ty) `thenTc_`
-        mapTc (checkForeignArg isFFIArgumentTy) xs		`thenTc_`
-	checkForeignRes (isFFIResultTy) res
+        check (isFFIDynArgumentTy x) (illegalForeignTyErr True{-Arg-} ty) `thenTc_`
+        mapTc (checkForeignArg (isFFIArgumentTy is_safe)) xs	`thenTc_`
+	checkForeignRes True {-NonIO ok-} isFFIResultTy res
  | otherwise =
-     mapTc (checkForeignArg isFFIArgumentTy) args	        `thenTc_`
-     checkForeignRes (isFFIResultTy) res
+     mapTc (checkForeignArg (isFFIArgumentTy is_safe)) args     `thenTc_`
+     checkForeignRes True {-NonIO ok-} isFFIResultTy res
 
 checkForeignExport :: Bool -> Type -> [Type] -> Type -> TcM s ()
 checkForeignExport is_dynamic ty args res
  | is_dynamic = 
     -- * the first (and only!) arg has got to be a function type
-    -- * result type is an Addr
+    --   and it must return IO t
+    -- * result type is IO Addr
    case args of
      [arg]  ->
 	case splitFunTys arg of
 	   (arg_tys, res_ty) -> 
-		mapTc (checkForeignArg isFFIExternalTy) arg_tys `thenTc_`
-		checkForeignRes (isFFIResultTy) res_ty		`thenTc_`
-		checkForeignRes (isAddrTy) res
+		mapTc (checkForeignArg isFFIExternalTy) arg_tys	`thenTc_`
+		checkForeignRes True {-NonIO ok-} isFFIResultTy res_ty `thenTc_`
+		checkForeignRes False {-Must be IO-} isFFIDynResultTy res
      _      -> check False (illegalForeignTyErr True{-Arg-} ty)
  | otherwise =
      mapTc (checkForeignArg isFFIExternalTy) args  	        `thenTc_`
-     checkForeignRes (isFFIResultTy) res
+     checkForeignRes True {-NonIO ok-} isFFIResultTy res
  
-check :: Bool -> Message -> TcM s ()
-check True _	   = returnTc ()
-check _    the_err = addErrTc the_err `thenNF_Tc_` returnTc ()
-
 checkForeignArg :: (Type -> Bool) -> Type -> TcM s ()
 checkForeignArg pred ty = check (pred ty) (illegalForeignTyErr True{-Arg-} ty)
 
 -- Check that the type has the form 
 --    (IO t) or (t) , and that t satisfies the given predicate.
 --
-checkForeignRes :: (Type -> Bool) -> Type -> TcM s ()
-checkForeignRes pred_res_ty ty =
+checkForeignRes :: Bool -> (Type -> Bool) -> Type -> TcM s ()
+checkForeignRes non_io_result_ok pred_res_ty ty =
  case (splitTyConApp_maybe ty) of
     Just (io, [res_ty]) 
-        | (getUnique io) == ioTyConKey && pred_res_ty res_ty 
+        | io `hasKey` ioTyConKey && pred_res_ty res_ty 
 	-> returnTc ()
     _   
-        | pred_res_ty ty -> returnTc ()
-	| otherwise      -> check False (illegalForeignTyErr False{-Res-} ty)
-
+        -> check (non_io_result_ok && pred_res_ty ty) 
+		 (illegalForeignTyErr False{-Res-} ty)
 \end{code}
 
 Warnings
 
 \begin{code}
+check :: Bool -> Message -> TcM s ()
+check True _	   = returnTc ()
+check _    the_err = addErrTc the_err `thenNF_Tc_` returnTc ()
+
 illegalForeignTyErr isArg ty
   = hang (hsep [ptext SLIT("Unacceptable"), arg_or_res, ptext SLIT("type in foreign declaration:")])
 	 4 (hsep [ppr ty])
@@ -235,5 +228,4 @@ illegalForeignTyErr isArg ty
 foreignDeclCtxt fo = 
  hang (ptext SLIT("When checking declaration:"))
   4   (ppr fo)
-
 \end{code}