Merge branch 'ghc-9.2' into master

Author: Ericson2314

CHANGELOG.md

@@ -2,15 +2,15 @@
 
  * Support for the GHC 9.2.
 
-   The array access primops now read/write with the fixed-sized numeric
-   type corresponding to the width of the data accessed. Additionally,
-   the primops to convert to and from fixed-sized numeric types have
-   been given new names.
-
-   9.2 isn't cut yet, so these changes are somewhat speculative, but
-   unfortunately GHC must used a released version of Alex (and Happy) at
-   all times until further changes have been made, so we must make the
-   release to actually implement these changes in GHC.
+   The array access primops now use the fixed-sized numeric types
+   corresponding to the width of the data accessed. Additionally, the
+   primops to convert to and from fixed-sized numeric types have been
+   given new names.
+
+   9.2 isn't cut yet, so these changes are somewhat speculative.
+   Unfortunately, GHC must used a released version of Alex (and Happy)
+   at all times until further changes have been made, so we must make
+   the release to actually implement these changes in GHC.
 
    If the final GHC 9.2 ends up being different, this release will be
    marked broken to make it less likely people use it by accident.

alex.cabal

@@ -1,4 +1,4 @@
-cabal-version: >= 1.8
+cabal-version: >= 1.10
 name: alex
 version: 3.2.6
 -- don't forget updating changelog.md!
@@ -143,8 +143,12 @@ executable alex
 
   build-depends: base < 5
 
-  extensions: CPP
+  default-language: Haskell98
+  default-extensions: CPP
+  other-extensions: MagicHash
+
   ghc-options: -Wall -rtsopts
+
   other-modules:
         AbsSyn
         CharSet
@@ -174,4 +178,6 @@ test-suite tests
   -- This line is important as it ensures that the local `exe:alex` component declared above is built before the test-suite component is invoked, as well as making sure that `alex` is made available on $PATH and `$alex_datadir` is set accordingly before invoking `test.hs`
   build-tools: alex
 
+  default-language: Haskell98
+
   build-depends: base, process

src/AbsSyn.hs

@@ -336,9 +336,9 @@ extractActions scheme scanner = (scanner{scannerTokens = new_tokens}, decl_str .
  where
   (new_tokens, decls) = unzip (zipWith f (scannerTokens scanner) act_names)
 
-  f r@RECtx{ reCtxCode = Just code } name
+  f r@(RECtx{ reCtxCode = Just code }) name
         = (r{reCtxCode = Just name}, Just (mkDecl name code))
-  f r@RECtx{ reCtxCode = Nothing } _
+  f r@(RECtx{ reCtxCode = Nothing }) _
         = (r{reCtxCode = Nothing}, Nothing)
 
   gscanActionType res =

src/DFAMin.hs

@@ -36,9 +36,9 @@ import qualified Data.List as List
 -- end;
 
 minimizeDFA :: forall a. Ord a => DFA Int a -> DFA Int a
-minimizeDFA  dfa@DFA { dfa_start_states = starts,
-                       dfa_states       = statemap
-                     }
+minimizeDFA  dfa@(DFA { dfa_start_states = starts,
+                        dfa_states       = statemap
+                      })
   = DFA { dfa_start_states = starts,
           dfa_states       = Map.fromList states }
   where

templates/GenericTemplate.hs

@@ -12,7 +12,7 @@
 #define ALEX_IF_GHC_GT_500 #if __GLASGOW_HASKELL__ > 500
 #define ALEX_IF_GHC_LT_503 #if __GLASGOW_HASKELL__ < 503
 #define ALEX_IF_GHC_GT_706 #if __GLASGOW_HASKELL__ > 706
-#define ALEX_IF_GHC_GT_901 #if __GLASGOW_HASKELL__ > 901
+#define ALEX_IF_GHC_GE_901 #if __GLASGOW_HASKELL__ >= 901
 #define ALEX_ELIF_GHC_500 #elif __GLASGOW_HASKELL__ == 500
 #define ALEX_IF_BIGENDIAN #ifdef WORDS_BIGENDIAN
 #define ALEX_ELSE #else
@@ -61,18 +61,17 @@ ALEX_ENDIF
 alexIndexInt16OffAddr :: AlexAddr -> Int# -> Int#
 alexIndexInt16OffAddr (AlexA# arr) off =
 ALEX_IF_BIGENDIAN
-ALEX_IF_GHC_GT_901
   narrow16Int# i
-ALEX_ELSE
-  int16ToInt# i
-ALEX_ENDIF
   where
         i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
         high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
         low  = int2Word# (ord# (indexCharOffAddr# arr off'))
         off' = off *# 2#
 ALEX_ELSE
-  indexInt16OffAddr# arr off
+ALEX_IF_GHC_GE_901
+  int16ToInt#
+ALEX_ENDIF
+    (indexInt16OffAddr# arr off)
 ALEX_ENDIF
 #else
 alexIndexInt16OffAddr arr off = arr ! off
@@ -83,11 +82,7 @@ alexIndexInt16OffAddr arr off = arr ! off
 alexIndexInt32OffAddr :: AlexAddr -> Int# -> Int#
 alexIndexInt32OffAddr (AlexA# arr) off =
 ALEX_IF_BIGENDIAN
-ALEX_IF_GHC_GT_901
   narrow32Int# i
-ALEX_ELSE
-  int32ToInt# i
-ALEX_ENDIF
   where
    i    = word2Int# ((b3 `uncheckedShiftL#` 24#) `or#`
                      (b2 `uncheckedShiftL#` 16#) `or#`
@@ -98,7 +93,10 @@ ALEX_ENDIF
    b0   = int2Word# (ord# (indexCharOffAddr# arr off'))
    off' = off *# 4#
 ALEX_ELSE
-  indexInt32OffAddr# arr off
+ALEX_IF_GHC_GE_901
+  int32ToInt#
+ALEX_ENDIF
+    (indexInt32OffAddr# arr off)
 ALEX_ENDIF
 #else
 alexIndexInt32OffAddr arr off = arr ! off