X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsForeign.lhs;h=ba19124f0c315c368ca94726b973e2a2dba673bb;hb=680f11d3f1ad9065c4969ed5d9db857cc245d778;hp=e5cbbfbe51ee2c7c759ed5aae5b9962893f750df;hpb=ceaa116940587d4ea2e2104e3c3313002d852659;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsForeign.lhs b/compiler/deSugar/DsForeign.lhs
index e5cbbfb..ba19124 100644
--- a/compiler/deSugar/DsForeign.lhs
+++ b/compiler/deSugar/DsForeign.lhs
@@ -1,9 +1,9 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The AQUA Project, Glasgow University, 1998
 %
-\section[DsCCall]{Desugaring \tr{foreign} declarations}
 
-Expanding out @foreign import@ and @foreign export@ declarations.
+Desugaring foreign declarations (see also DsCCall).
 
 \begin{code}
 module DsForeign ( dsForeigns ) where
@@ -13,47 +13,33 @@ import TcRnMonad	-- temp
 
 import CoreSyn
 
-import DsCCall		( dsCCall, mkFCall, boxResult, unboxArg, resultWrapper )
+import DsCCall
 import DsMonad
 
-import HsSyn		( ForeignDecl(..), ForeignExport(..), LForeignDecl,
-			  ForeignImport(..), CImportSpec(..) )
-import DataCon		( splitProductType_maybe )
-#ifdef DEBUG
-import DataCon		( dataConSourceArity )
-import Type		( isUnLiftedType )
-#endif
-import MachOp		( machRepByteWidth, MachRep(..) )
-import SMRep		( argMachRep, typeCgRep )
-import CoreUtils	( exprType, mkInlineMe )
-import Id		( Id, idType, idName, mkSysLocal, setInlinePragma )
-import Literal		( Literal(..), mkStringLit )
-import Module		( moduleFS )
-import Name		( getOccString, NamedThing(..) )
-import Type		( repType, coreEqType )
-import TcType		( Type, mkFunTys, mkForAllTys, mkTyConApp,
-			  mkFunTy, tcSplitTyConApp_maybe, tcSplitIOType_maybe,
-			  tcSplitForAllTys, tcSplitFunTys, tcTyConAppArgs,
-			  isBoolTy
-			)
-
-import BasicTypes       ( Boxity(..) )
-import HscTypes		( ForeignStubs(..) )
-import ForeignCall	( ForeignCall(..), CCallSpec(..), 
-			  Safety(..), 
-			  CExportSpec(..), CLabelString,
-			  CCallConv(..), ccallConvToInt,
-			  ccallConvAttribute
-			)
-import TysWiredIn	( unitTy, tupleTyCon )
-import TysPrim		( addrPrimTy, mkStablePtrPrimTy, alphaTy, intPrimTy )
-import PrelNames	( stablePtrTyConName, newStablePtrName, bindIOName,
-			  checkDotnetResName )
-import BasicTypes	( Activation( NeverActive ) )
-import SrcLoc		( Located(..), unLoc )
+import HsSyn
+import DataCon
+import MachOp
+import SMRep
+import CoreUtils
+import Id
+import Literal
+import Module
+import Name
+import Type
+import Coercion
+import TcType
+
+import HscTypes
+import ForeignCall
+import TysWiredIn
+import TysPrim
+import PrelNames
+import BasicTypes
+import SrcLoc
 import Outputable
-import Maybe 		( fromJust, isNothing )
 import FastString
+
+import Data.Maybe
 \end{code}
 
 Desugaring of @foreign@ declarations is naturally split up into
@@ -83,10 +69,9 @@ dsForeigns fos
   combine stubs (L loc decl) = putSrcSpanDs loc (combine1 stubs decl)
 
   combine1 (ForeignStubs acc_h acc_c acc_hdrs acc_feb, acc_f) 
-	   (ForeignImport id _ spec depr)
+	   (ForeignImport id _ spec)
     = traceIf (text "fi start" <+> ppr id)	`thenDs` \ _ ->
       dsFImport (unLoc id) spec	                `thenDs` \ (bs, h, c, mbhd) -> 
-      warnDepr depr				`thenDs` \ _                ->
       traceIf (text "fi end" <+> ppr id)	`thenDs` \ _ ->
       returnDs (ForeignStubs (h $$ acc_h)
       			     (c $$ acc_c)
@@ -95,10 +80,9 @@ dsForeigns fos
 		bs ++ acc_f)
 
   combine1 (ForeignStubs acc_h acc_c acc_hdrs acc_feb, acc_f) 
-	   (ForeignExport (L _ id) _ (CExport (CExportStatic ext_nm cconv)) depr)
+	   (ForeignExport (L _ id) _ (CExport (CExportStatic ext_nm cconv)))
     = dsFExport id (idType id) 
 		ext_nm cconv False                 `thenDs` \(h, c, _, _) ->
-      warnDepr depr				   `thenDs` \_              ->
       returnDs (ForeignStubs (h $$ acc_h) (c $$ acc_c) acc_hdrs (id:acc_feb), 
 		acc_f)
 
@@ -106,11 +90,6 @@ dsForeigns fos
   addH (Just e) ls
    | e `elem` ls = ls
    | otherwise   = e:ls
-
-  warnDepr False = returnDs ()
-  warnDepr True  = dsWarn msg
-     where
-       msg = ptext SLIT("foreign declaration uses deprecated non-standard syntax")
 \end{code}
 
 
@@ -331,7 +310,7 @@ f :: Fun -> IO (FunPtr Fun)
 f cback =
    bindIO (newStablePtr cback)
           (\StablePtr sp# -> IO (\s1# ->
-              case _ccall_ createAdjustor cconv sp# ``f_helper'' s1# of
+              case _ccall_ createAdjustor cconv sp# ``f_helper'' <arg info> s1# of
                  (# s2#, a# #) -> (# s2#, A# a# #)))
 
 foreign import "&f_helper" f_helper :: FunPtr (StablePtr Fun -> Fun)
@@ -351,10 +330,10 @@ dsFExportDynamic :: Id
 		 -> DsM ([Binding], SDoc, SDoc)
 dsFExportDynamic id cconv
   =  newSysLocalDs ty				 `thenDs` \ fe_id ->
-     getModuleDs				`thenDs` \ mod_name -> 
+     getModuleDs				`thenDs` \ mod -> 
      let 
         -- hack: need to get at the name of the C stub we're about to generate.
-       fe_nm	   = mkFastString (unpackFS (zEncodeFS (moduleFS mod_name)) ++ "_" ++ toCName fe_id)
+       fe_nm	   = mkFastString (unpackFS (zEncodeFS (moduleNameFS (moduleName mod))) ++ "_" ++ toCName fe_id)
      in
      newSysLocalDs arg_ty			`thenDs` \ cback ->
      dsLookupGlobalId newStablePtrName		`thenDs` \ newStablePtrId ->
@@ -409,8 +388,9 @@ dsFExportDynamic id cconv
 	-- PlayRisky: the adjustor doesn't allocate in the Haskell heap or do a callback
      let ccall_adj_ty = exprType ccall_adj
          ccall_io_adj = mkLams [stbl_value]		     $
-			Note (Coerce io_res_ty ccall_adj_ty)
-			     ccall_adj
+			(pprTrace "DsForeign: why is there an unsafeCoerce here?" (text "") $
+			(Cast ccall_adj (mkUnsafeCoercion ccall_adj_ty io_res_ty )))
+
          io_app = mkLams tvs	 $
 		  mkLams [cback] $
 		  stbl_app ccall_io_adj res_ty