X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Foreign%2FC%2FTypes.hs;h=22bae5c187b3d59b44886b4eef40b1c087b9201d;hb=41e8fba828acbae1751628af50849f5352b27873;hp=b897718c0c9dcc0f7bdc1941914d0cbcd6b86992;hpb=aaf764b3ad8b1816d68b5f27299eac125f08e1a5;p=ghc-base.git

diff --git a/Foreign/C/Types.hs b/Foreign/C/Types.hs
index b897718..22bae5c 100644
--- a/Foreign/C/Types.hs
+++ b/Foreign/C/Types.hs
@@ -1,4 +1,12 @@
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# LANGUAGE CPP
+           , NoImplicitPrelude
+           , MagicHash
+           , GeneralizedNewtypeDeriving
+  #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds #-}
+-- XXX -fno-warn-unused-binds stops us warning about unused constructors,
+-- but really we should just remove them if we don't want them
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.C.Types
@@ -14,61 +22,76 @@
 -----------------------------------------------------------------------------
 
 module Foreign.C.Types
-	( -- * Representations of C types
+        ( -- * Representations of C types
 #ifndef __NHC__
-	  -- $ctypes
-
-	  -- ** Integral types
-	  -- | These types are are represented as @newtype@s of
-	  -- types in "Data.Int" and "Data.Word", and are instances of
-	  -- 'Prelude.Eq', 'Prelude.Ord', 'Prelude.Num', 'Prelude.Read',
-	  -- 'Prelude.Show', 'Prelude.Enum', 'Typeable', 'Storable',
-	  -- 'Prelude.Bounded', 'Prelude.Real', 'Prelude.Integral' and
-	  -- 'Bits'.
-	  CChar,  CSChar,  CUChar
-	, CShort, CUShort, CInt,   CUInt
-	, CLong,  CULong
-	, CPtrdiff, CSize, CWchar, CSigAtomic
+          -- $ctypes
+
+          -- ** Integral types
+          -- | These types are are represented as @newtype@s of
+          -- types in "Data.Int" and "Data.Word", and are instances of
+          -- 'Prelude.Eq', 'Prelude.Ord', 'Prelude.Num', 'Prelude.Read',
+          -- 'Prelude.Show', 'Prelude.Enum', 'Typeable', 'Storable',
+          -- 'Prelude.Bounded', 'Prelude.Real', 'Prelude.Integral' and
+          -- 'Bits'.
+          CChar,  CSChar,  CUChar
+        , CShort, CUShort, CInt,   CUInt
+        , CLong,  CULong
+        , CPtrdiff, CSize, CWchar, CSigAtomic
         , CLLong, CULLong
-
-	  -- ** Numeric types
-	  -- | These types are are represented as @newtype@s of basic
-	  -- foreign types, and are instances of
-	  -- 'Prelude.Eq', 'Prelude.Ord', 'Prelude.Num', 'Prelude.Read',
-	  -- 'Prelude.Show', 'Prelude.Enum', 'Typeable' and 'Storable'.
-	, CClock,   CTime
-
-	  -- ** Floating types
-	  -- | These types are are represented as @newtype@s of
-	  -- 'Prelude.Float' and 'Prelude.Double', and are instances of
-	  -- 'Prelude.Eq', 'Prelude.Ord', 'Prelude.Num', 'Prelude.Read',
-	  -- 'Prelude.Show', 'Prelude.Enum', 'Typeable', 'Storable',
-	  -- 'Prelude.Real', 'Prelude.Fractional', 'Prelude.Floating',
-	  -- 'Prelude.RealFrac' and 'Prelude.RealFloat'.
-	, CFloat,  CDouble, CLDouble
+        , CIntPtr, CUIntPtr
+        , CIntMax, CUIntMax
+
+          -- ** Numeric types
+          -- | These types are are represented as @newtype@s of basic
+          -- foreign types, and are instances of
+          -- 'Prelude.Eq', 'Prelude.Ord', 'Prelude.Num', 'Prelude.Read',
+          -- 'Prelude.Show', 'Prelude.Enum', 'Typeable' and 'Storable'.
+        , CClock,   CTime
+
+        -- extracted from CTime, because we don't want this comment in
+        -- the Haskell 2010 report:
+
+        -- | To convert 'CTime' to 'Data.Time.UTCTime', use the following formula:
+        --
+        -- >  posixSecondsToUTCTime (realToFrac :: POSIXTime)
+        --
+
+          -- ** Floating types
+          -- | These types are are represented as @newtype@s of
+          -- 'Prelude.Float' and 'Prelude.Double', and are instances of
+          -- 'Prelude.Eq', 'Prelude.Ord', 'Prelude.Num', 'Prelude.Read',
+          -- 'Prelude.Show', 'Prelude.Enum', 'Typeable', 'Storable',
+          -- 'Prelude.Real', 'Prelude.Fractional', 'Prelude.Floating',
+          -- 'Prelude.RealFrac' and 'Prelude.RealFloat'.
+        , CFloat,  CDouble
+-- GHC doesn't support CLDouble yet
+#ifndef __GLASGOW_HASKELL__
+        , CLDouble
+#endif
 #else
-	  -- Exported non-abstractly in nhc98 to fix an interface file problem.
-	  CChar(..),    CSChar(..),  CUChar(..)
-	, CShort(..),   CUShort(..), CInt(..),   CUInt(..)
-	, CLong(..),    CULong(..)
-	, CPtrdiff(..), CSize(..),   CWchar(..), CSigAtomic(..)
+          -- Exported non-abstractly in nhc98 to fix an interface file problem.
+          CChar(..),    CSChar(..),  CUChar(..)
+        , CShort(..),   CUShort(..), CInt(..),   CUInt(..)
+        , CLong(..),    CULong(..)
+        , CPtrdiff(..), CSize(..),   CWchar(..), CSigAtomic(..)
         , CLLong(..),   CULLong(..)
-	, CClock(..),   CTime(..)
-	, CFloat(..),   CDouble(..), CLDouble(..)
+        , CClock(..),   CTime(..)
+        , CFloat(..),   CDouble(..), CLDouble(..)
+        , CIntPtr(..), CUIntPtr(..), CIntMax(..), CUIntMax(..)
 #endif
-	  -- ** Other types
+          -- ** Other types
 
           -- Instances of: Eq and Storable
-	, CFile,        CFpos,     CJmpBuf
-	) where
+        , CFile,        CFpos,     CJmpBuf
+        ) where
 
 #ifndef __NHC__
 
 import Foreign.Storable
-import Data.Bits	( Bits(..) )
-import Data.Int		( Int8,  Int16,  Int32,  Int64  )
-import Data.Word	( Word8, Word16, Word32, Word64 )
-import Data.Typeable
+import Data.Bits        ( Bits(..) )
+import Data.Int         ( Int8,  Int16,  Int32,  Int64  )
+import Data.Word        ( Word8, Word16, Word32, Word64 )
+import {-# SOURCE #-} Data.Typeable (Typeable(typeOf), TyCon, mkTyCon, mkTyConApp)
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
@@ -79,8 +102,11 @@ import GHC.Show
 import GHC.Read
 import GHC.Num
 #else
-import Control.Monad
-import Foreign.Ptr
+import Control.Monad    ( liftM )
+#endif
+
+#ifdef __HUGS__
+import Hugs.Ptr         ( castPtr )
 #endif
 
 #include "HsBaseConfig.h"
@@ -143,20 +169,25 @@ INTEGRAL_TYPE(CULLong,tyConCULLong,"CULLong",HTYPE_UNSIGNED_LONG_LONG)
 FLOATING_TYPE(CFloat,tyConCFloat,"CFloat",HTYPE_FLOAT)
 -- | Haskell type representing the C @double@ type.
 FLOATING_TYPE(CDouble,tyConCDouble,"CDouble",HTYPE_DOUBLE)
+-- GHC doesn't support CLDouble yet
+#ifndef __GLASGOW_HASKELL__
 -- HACK: Currently no long double in the FFI, so we simply re-use double
 -- | Haskell type representing the C @long double@ type.
 FLOATING_TYPE(CLDouble,tyConCLDouble,"CLDouble",HTYPE_DOUBLE)
+#endif
 
 {-# RULES
 "realToFrac/a->CFloat"    realToFrac = \x -> CFloat   (realToFrac x)
 "realToFrac/a->CDouble"   realToFrac = \x -> CDouble  (realToFrac x)
-"realToFrac/a->CLDouble"  realToFrac = \x -> CLDouble (realToFrac x)
 
 "realToFrac/CFloat->a"    realToFrac = \(CFloat   x) -> realToFrac x
 "realToFrac/CDouble->a"   realToFrac = \(CDouble  x) -> realToFrac x
-"realToFrac/CLDouble->a"  realToFrac = \(CLDouble x) -> realToFrac x
  #-}
 
+-- GHC doesn't support CLDouble yet
+-- "realToFrac/a->CLDouble"  realToFrac = \x -> CLDouble (realToFrac x)
+-- "realToFrac/CLDouble->a"  realToFrac = \(CLDouble x) -> realToFrac x
+
 -- | Haskell type representing the C @ptrdiff_t@ type.
 INTEGRAL_TYPE(CPtrdiff,tyConCPtrdiff,"CPtrdiff",HTYPE_PTRDIFF_T)
 -- | Haskell type representing the C @size_t@ type.
@@ -181,6 +212,7 @@ INTEGRAL_TYPE(CSigAtomic,tyConCSigAtomic,"CSigAtomic",HTYPE_SIG_ATOMIC_T)
 -- | Haskell type representing the C @clock_t@ type.
 ARITHMETIC_TYPE(CClock,tyConCClock,"CClock",HTYPE_CLOCK_T)
 -- | Haskell type representing the C @time_t@ type.
+--
 ARITHMETIC_TYPE(CTime,tyConCTime,"CTime",HTYPE_TIME_T)
 
 -- FIXME: Implement and provide instances for Eq and Storable
@@ -191,8 +223,20 @@ data CFpos = CFpos
 -- | Haskell type representing the C @jmp_buf@ type.
 data CJmpBuf = CJmpBuf
 
+INTEGRAL_TYPE(CIntPtr,tyConCIntPtr,"CIntPtr",HTYPE_INTPTR_T)
+INTEGRAL_TYPE(CUIntPtr,tyConCUIntPtr,"CUIntPtr",HTYPE_UINTPTR_T)
+INTEGRAL_TYPE(CIntMax,tyConCIntMax,"CIntMax",HTYPE_INTMAX_T)
+INTEGRAL_TYPE(CUIntMax,tyConCUIntMax,"CUIntMax",HTYPE_UINTMAX_T)
+
+{-# RULES
+"fromIntegral/a->CIntPtr"  fromIntegral = \x -> CIntPtr  (fromIntegral x)
+"fromIntegral/a->CUIntPtr" fromIntegral = \x -> CUIntPtr (fromIntegral x)
+"fromIntegral/a->CIntMax"  fromIntegral = \x -> CIntMax  (fromIntegral x)
+"fromIntegral/a->CUIntMax" fromIntegral = \x -> CUIntMax (fromIntegral x)
+ #-}
+
 -- C99 types which are still missing include:
--- intptr_t, uintptr_t, intmax_t, uintmax_t, wint_t, wctrans_t, wctype_t
+-- wint_t, wctrans_t, wctype_t
 
 {- $ctypes
 
@@ -237,7 +281,7 @@ representing a C type @t@:
 
 -}
 
-#else	/* __NHC__ */
+#else   /* __NHC__ */
 
 import NHC.FFI
   ( CChar(..),    CSChar(..),  CUChar(..)
@@ -246,6 +290,7 @@ import NHC.FFI
   , CPtrdiff(..), CSize(..),   CWchar(..), CSigAtomic(..)
   , CClock(..),   CTime(..)
   , CFloat(..),   CDouble(..), CLDouble(..)
+  , CIntPtr(..),  CUIntPtr(..),CIntMax(..), CUIntMax(..)
   , CFile,        CFpos,       CJmpBuf
   , Storable(..)
   )
@@ -283,5 +328,9 @@ INSTANCE_BITS(CPtrdiff)
 INSTANCE_BITS(CWchar)
 INSTANCE_BITS(CSigAtomic)
 INSTANCE_BITS(CSize)
+INSTANCE_BITS(CIntPtr)
+INSTANCE_BITS(CUIntPtr)
+INSTANCE_BITS(CIntMax)
+INSTANCE_BITS(CUIntMax)
 
 #endif