Make it work on wasm32-wasi and older GHCs

Author: TravisWhitaker

Data/Atomic.hs

@@ -17,17 +17,29 @@ module Data.Atomic
     , subtract
     ) where
 
+#include "MachDeps.h"
+#ifndef SIZEOF_HSINT
+#error "MachDeps.h didn't define SIZEOF_HSINT"
+#endif
+
 import Prelude hiding (read, subtract)
 
 import GHC.Int
+
+#if SIZEOF_HSINT == 8
+
+-- 64-bit imports
 import GHC.IO
 import GHC.Prim
 
-#include "MachDeps.h"
-#ifndef SIZEOF_HSINT
-#error "MachDeps.h didn't define SIZEOF_HSINT"
+#else
+
+-- 32-bit imports
+import Data.IORef
+
 #endif
 
+
 -- 64-bit machine, Int ~ Int64, do it the fast way:
 #if SIZEOF_HSINT == 8
 
@@ -85,11 +97,11 @@ write (C ior) !i = atomicWriteIORef ior i
 
 -- | Increase the atomic by the given amount.
 add :: Atomic -> Int64 -> IO ()
-add (C ior) !i = atomicModifyIORef' ior (\!n -> (n+i, ()))
+add (C ior) !i = atomicModifyIORef' ior (\(!n) -> (n+i, ()))
 
 -- | Decrease the atomic by the given amount.
 subtract :: Atomic -> Int64 -> IO ()
-subtract (C ior) !i = atomicModifyIORef' ior (\!n -> (n-i, ()))
+subtract (C ior) !i = atomicModifyIORef' ior (\(!n) -> (n-i, ()))
 
 #endif
 

System/Metrics/Distribution.hsc

@@ -1,5 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE ExtendedLiterals #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE RecordWildCards #-}
@@ -91,7 +90,7 @@ newDistrib = IO $ \s ->
     -- probably unecessary
     case atomicWriteIntArray## mba lockPos' 0## s1 of { s2 ->
     case countPos of { (I## countPos') ->
-    case writeInt64Array## mba countPos' 0##Int64 s2 of { s3 ->
+    case writeInt64Array## mba countPos' (intToInt64## 0##) s2 of { s3 ->
     case meanPos of { (I## meanPos') ->
     case writeDoubleArray## mba meanPos' 0.0#### s3 of { s4 ->
     case sumSqDeltaPos of { (I## sumSqDeltaPos') ->
@@ -228,7 +227,7 @@ combine (Distrib bMBA) (Distrib aMBA) = IO $ \s ->
                )
          ) of { sumSqDelta' ->
     case writeInt64Array## aMBA countPos' count' s7 of { s8 ->
-    case (case eqInt64## count' 0##Int64 of { 0## -> mean'; _ -> 0.0#### }) of { writeMean ->
+    case (case eqInt64## count' (intToInt64## 0##) of { 0## -> mean'; _ -> 0.0#### }) of { writeMean ->
     case writeDoubleArray## aMBA meanPos' writeMean s8 of { s9 ->
     case writeDoubleArray## aMBA sumSqDeltaPos' sumSqDelta' s9 of { s10 ->
     case sumPos of { (I## sumPos') ->