Fix big-endian archs

- Add missing include "MachDeps.h"
- Use narrow32Word# to ensure correct result after byteSwap32# on Big-Endian arch

Author: wismill

unicode-data-names/lib/Unicode/Internal/Char/UnicodeData/DerivedName.hs

@@ -51,9 +51,9 @@ name (C# c#) = getName 0# 149185#
     indexInt32OffAddr'# k# =
 #ifdef WORDS_BIGENDIAN
 #if MIN_VERSION_base(4,16,0)
-        word2Int# (byteSwap32# (word32ToWord# (indexWord32OffAddr# offsets# k#)))
+        word2Int# (narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# offsets# k#))))
 #else
-        word2Int# (byteSwap32# (indexWord32OffAddr# offsets# k#))
+        word2Int# (narrow32Word# (byteSwap32# (indexWord32OffAddr# offsets# k#)))
 #endif
 #elif MIN_VERSION_base(4,16,0)
         int32ToInt# (indexInt32OffAddr# offsets# k#)

unicode-data-scripts/lib/Unicode/Char/General/Scripts.hs

@@ -20,6 +20,8 @@ module Unicode.Char.General.Scripts
     )
 where
 
+#include "MachDeps.h"
+
 import Data.Char (chr)
 import Data.List.NonEmpty (NonEmpty)
 import GHC.Exts
@@ -30,7 +32,7 @@ import GHC.Exts
 import GHC.Exts (word32ToWord#)
 #endif
 #ifdef WORDS_BIGENDIAN
-import GHC.Exts (byteSwap32#)
+import GHC.Exts (byteSwap32#, narrow32Word#)
 #endif
 
 import qualified Unicode.Internal.Char.Scripts as S
@@ -62,9 +64,9 @@ scriptDefinition = unpack . S.scriptDefinition
         getRawCodePoint k# =
 #ifdef WORDS_BIGENDIAN
 #if MIN_VERSION_base(4,16,0)
-            byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#));
+            narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#)));
 #else
-            byteSwap32# (indexWord32OffAddr# addr# k#);
+            narrow32Word# (byteSwap32# (indexWord32OffAddr# addr# k#));
 #endif
 #elif MIN_VERSION_base(4,16,0)
             word32ToWord# (indexWord32OffAddr# addr# k#);

unicode-data-scripts/test/Unicode/Char/General/ScriptsSpec.hs

@@ -4,6 +4,8 @@ module Unicode.Char.General.ScriptsSpec
   ( spec
   ) where
 
+#include "MachDeps.h"
+
 import Data.Foldable (traverse_)
 import Test.Hspec
 import qualified Unicode.Char.General.Scripts as UScripts
@@ -19,7 +21,7 @@ import GHC.Exts
 import GHC.Exts (word32ToWord#)
 #endif
 #ifdef WORDS_BIGENDIAN
-import GHC.Exts (byteSwap32#)
+import GHC.Exts (byteSwap32#, narrow32Word#)
 #endif
 
 {- [NOTE]
@@ -177,9 +179,9 @@ inScript s (C# c#) = check (S.scriptDefinition s)
         getRawCodePoint k# =
 #ifdef WORDS_BIGENDIAN
 #if MIN_VERSION_base(4,16,0)
-            byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#));
+            narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#)));
 #else
-            byteSwap32# (indexWord32OffAddr# addr# k#);
+            narrow32Word# (byteSwap32# (indexWord32OffAddr# addr# k#));
 #endif
 #elif MIN_VERSION_base(4,16,0)
             word32ToWord# (indexWord32OffAddr# addr# k#);

unicode-data/exe/Parser/Text.hs

@@ -318,6 +318,8 @@ genBlocksModule moduleName = done <$> Fold.foldl' step initial
         , "(Block(..), BlockDefinition(..), block, blockDefinition)"
         , "where"
         , ""
+        , "#include \"MachDeps.h\""
+        , ""
         , "import Data.Ix (Ix)"
         , "import GHC.Exts"
         , ""
@@ -381,9 +383,9 @@ genBlocksModule moduleName = done <$> Fold.foldl' step initial
         , "    getRawCodePoint# k# ="
         , "#ifdef WORDS_BIGENDIAN"
         , "#if MIN_VERSION_base(4,16,0)"
-        , "        byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#))"
+        , "        narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# ranges# k#)))"
         , "#else"
-        , "        byteSwap32# (indexWord32OffAddr# ranges# k#)"
+        , "        narrow32Word# (byteSwap32# (indexWord32OffAddr# ranges# k#))"
         , "#endif"
         , "#elif MIN_VERSION_base(4,16,0)"
         , "        word32ToWord# (indexWord32OffAddr# ranges# k#)"
@@ -1279,9 +1281,9 @@ genNamesModule moduleName =
         , "    indexInt32OffAddr'# k# ="
         , "#ifdef WORDS_BIGENDIAN"
         , "#if MIN_VERSION_base(4,16,0)"
-        , "        word2Int# (byteSwap32# (word32ToWord# (indexWord32OffAddr# offsets# k#)))"
+        , "        word2Int# (narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# offsets# k#))))"
         , "#else"
-        , "        word2Int# (byteSwap32# (indexWord32OffAddr# offsets# k#))"
+        , "        word2Int# (narrow32Word# (byteSwap32# (indexWord32OffAddr# offsets# k#)))"
         , "#endif"
         , "#elif MIN_VERSION_base(4,16,0)"
         , "        int32ToInt# (indexInt32OffAddr# offsets# k#)"

unicode-data/lib/Unicode/Internal/Char/Blocks.hs

@@ -13,6 +13,8 @@ module Unicode.Internal.Char.Blocks
 (Block(..), BlockDefinition(..), block, blockDefinition)
 where
 
+#include "MachDeps.h"
+
 import Data.Ix (Ix)
 import GHC.Exts
 
@@ -729,9 +731,9 @@ block (C# c#) = getBlock 0# 326#
     getRawCodePoint# k# =
 #ifdef WORDS_BIGENDIAN
 #if MIN_VERSION_base(4,16,0)
-        byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#))
+        narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# ranges# k#)))
 #else
-        byteSwap32# (indexWord32OffAddr# ranges# k#)
+        narrow32Word# (byteSwap32# (indexWord32OffAddr# ranges# k#))
 #endif
 #elif MIN_VERSION_base(4,16,0)
         word32ToWord# (indexWord32OffAddr# ranges# k#)