lazy evaluation for Storable instances

Author: kazu-yamamoto

Network/Socket/Info.hsc

@@ -108,8 +108,8 @@ data AddrInfo = AddrInfo {
   } deriving (Eq, Show)
 
 instance Storable AddrInfo where
-    sizeOf    _ = #const sizeof(struct addrinfo)
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = #const sizeof(struct addrinfo)
+    alignment ~_ = alignment (0 :: CInt)
 
     peek p = do
         ai_flags <- (#peek struct addrinfo, ai_flags) p

Network/Socket/Options.hsc

@@ -466,8 +466,8 @@ data StructLinger = StructLinger {
   deriving (Eq, Ord, Show)
 
 instance Storable StructLinger where
-    sizeOf    _ = (#const sizeof(struct linger))
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#const sizeof(struct linger))
+    alignment ~_ = alignment (0 :: CInt)
 
     peek p = do
         onoff  <- (#peek struct linger, l_onoff) p

Network/Socket/Posix/Cmsg.hsc

@@ -177,8 +177,8 @@ instance ControlMessage IPv4PktInfo where
 
 instance Storable IPv4PktInfo where
 #if defined (IP_PKTINFO)
-    sizeOf    _ = (#size struct in_pktinfo)
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#size struct in_pktinfo)
+    alignment ~_ = alignment (0 :: CInt)
     poke p (IPv4PktInfo n sa ha) = do
         (#poke struct in_pktinfo, ipi_ifindex)  p (fromIntegral n :: CInt)
         (#poke struct in_pktinfo, ipi_spec_dst) p sa
@@ -189,8 +189,8 @@ instance Storable IPv4PktInfo where
         ha <- (#peek struct in_pktinfo, ipi_addr)     p
         return $ IPv4PktInfo n sa ha
 #else
-    sizeOf    _ = 0
-    alignment _ = 1
+    sizeOf    ~_ = 0
+    alignment ~_ = 1
     poke _ _ = error "Unsupported control message type"
     peek _   = error "Unsupported control message type"
 #endif
@@ -208,8 +208,8 @@ instance ControlMessage IPv6PktInfo where
 
 instance Storable IPv6PktInfo where
 #if defined (IPV6_PKTINFO)
-    sizeOf    _ = (#size struct in6_pktinfo)
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#size struct in6_pktinfo)
+    alignment ~_ = alignment (0 :: CInt)
     poke p (IPv6PktInfo n ha6) = do
         (#poke struct in6_pktinfo, ipi6_ifindex) p (fromIntegral n :: CInt)
         (#poke struct in6_pktinfo, ipi6_addr)    p (In6Addr ha6)
@@ -218,8 +218,8 @@ instance Storable IPv6PktInfo where
         n :: CInt   <- (#peek struct in6_pktinfo, ipi6_ifindex) p
         return $ IPv6PktInfo (fromIntegral n) ha6
 #else
-    sizeOf    _ = 0
-    alignment _ = 1
+    sizeOf    ~_ = 0
+    alignment ~_ = 1
     poke _ _ = error "Unsupported control message type"
     peek _   = error "Unsupported control message type"
 #endif

Network/Socket/Posix/CmsgHdr.hsc

@@ -32,8 +32,8 @@ data CmsgHdr = CmsgHdr {
   } deriving (Eq, Show)
 
 instance Storable CmsgHdr where
-  sizeOf    _ = (#size struct cmsghdr)
-  alignment _ = alignment (0 :: CInt)
+  sizeOf    ~_ = (#size struct cmsghdr)
+  alignment ~_ = alignment (0 :: CInt)
 
   peek p = do
     len <- (#peek struct cmsghdr, cmsg_len)   p

Network/Socket/Posix/IOVec.hsc

@@ -19,8 +19,8 @@ data IOVec = IOVec
     }
 
 instance Storable IOVec where
-  sizeOf    _ = (#const sizeof(struct iovec))
-  alignment _ = alignment (0 :: CInt)
+  sizeOf    ~_ = (#const sizeof(struct iovec))
+  alignment ~_ = alignment (0 :: CInt)
 
   peek p = do
     base <- (#peek struct iovec, iov_base) p

Network/Socket/Posix/MsgHdr.hsc

@@ -32,8 +32,8 @@ data MsgHdr sa = MsgHdr
     }
 
 instance Storable (MsgHdr sa) where
-  sizeOf    _ = (#const sizeof(struct msghdr))
-  alignment _ = alignment (0 :: CInt)
+  sizeOf    ~_ = (#const sizeof(struct msghdr))
+  alignment ~_ = alignment (0 :: CInt)
 
   peek p = do
     name       <- (#peek struct msghdr, msg_name)       p

Network/Socket/Types.hsc

@@ -982,8 +982,8 @@ foreign import CALLCONV unsafe "ntohl" ntohl :: Word32 -> Word32
 {-# DEPRECATED ntohl "Use getAddrInfo instead" #-}
 
 instance Storable PortNumber where
-   sizeOf    _ = sizeOf    (0 :: Word16)
-   alignment _ = alignment (0 :: Word16)
+   sizeOf    ~_ = sizeOf    (0 :: Word16)
+   alignment ~_ = alignment (0 :: Word16)
    poke p (PortNum po) = poke (castPtr p) (htons po)
    peek p = PortNum . ntohs <$> peek (castPtr p)
 
@@ -1283,8 +1283,8 @@ newtype In6Addr = In6Addr HostAddress6
 #endif
 
 instance Storable In6Addr where
-    sizeOf    _ = #const sizeof(struct in6_addr)
-    alignment _ = #alignment struct in6_addr
+    sizeOf    ~_ = #const sizeof(struct in6_addr)
+    alignment ~_ = #alignment struct in6_addr
 
     peek p = do
         a <- peek32 p 0

Network/Socket/Unix.hsc

@@ -88,8 +88,8 @@ getPeerCred s = do
 
 newtype PeerCred = PeerCred (CUInt, CUInt, CUInt)
 instance Storable PeerCred where
-    sizeOf    _ = (#const sizeof(struct ucred))
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#const sizeof(struct ucred))
+    alignment ~_ = alignment (0 :: CInt)
     poke _ _ = return ()
     peek p = do
         pid <- (#peek struct ucred, pid) p

Network/Socket/Win32/Cmsg.hsc

@@ -160,8 +160,8 @@ instance ControlMessage IPv4PktInfo where
     controlMessageId = CmsgIdIPv4PktInfo
 
 instance Storable IPv4PktInfo where
-    sizeOf    _ = #{size IN_PKTINFO}
-    alignment _ = #alignment IN_PKTINFO
+    sizeOf    ~_ = #{size IN_PKTINFO}
+    alignment ~_ = #alignment IN_PKTINFO
     poke p (IPv4PktInfo n _ ha) = do
         (#poke IN_PKTINFO, ipi_ifindex)  p (fromIntegral n :: CInt)
         (#poke IN_PKTINFO, ipi_addr)     p ha
@@ -182,8 +182,8 @@ instance ControlMessage IPv6PktInfo where
     controlMessageId = CmsgIdIPv6PktInfo
 
 instance Storable IPv6PktInfo where
-    sizeOf    _ = #{size IN6_PKTINFO}
-    alignment _ = #alignment IN6_PKTINFO
+    sizeOf    ~_ = #{size IN6_PKTINFO}
+    alignment ~_ = #alignment IN6_PKTINFO
     poke p (IPv6PktInfo n ha6) = do
         (#poke IN6_PKTINFO, ipi6_ifindex) p (fromIntegral n :: CInt)
         (#poke IN6_PKTINFO, ipi6_addr)    p (In6Addr ha6)

Network/Socket/Win32/CmsgHdr.hsc

@@ -25,8 +25,8 @@ data CmsgHdr = CmsgHdr {
   } deriving (Eq, Show)
 
 instance Storable CmsgHdr where
-  sizeOf    _ = #{size WSACMSGHDR}
-  alignment _ = #alignment WSACMSGHDR
+  sizeOf    ~_ = #{size WSACMSGHDR}
+  alignment ~_ = #alignment WSACMSGHDR
 
   peek p = do
     len <- (#peek WSACMSGHDR, cmsg_len)   p