Burning the bridges: remove #if for GHC < 8

Author: andreasabel

alex.cabal

@@ -122,27 +122,25 @@ executable alex
   ghc-options: -Wall -Wcompat -rtsopts
 
   other-modules:
-        AbsSyn
-        CharSet
-        DFA
-        DFAMin
-        DFS
-        Info
-        Map
-        NFA
-        Output
-        Paths_alex
-        Parser
-        ParseMonad
-        Scan
-        Set
-        Sort
-        Util
-        UTF8
-        Data.Ranged
-        Data.Ranged.Boundaries
-        Data.Ranged.RangedSet
-        Data.Ranged.Ranges
+    AbsSyn
+    CharSet
+    DFA
+    DFAMin
+    DFS
+    Info
+    NFA
+    Output
+    Paths_alex
+    Parser
+    ParseMonad
+    Scan
+    Sort
+    Util
+    UTF8
+    Data.Ranged
+    Data.Ranged.Boundaries
+    Data.Ranged.RangedSet
+    Data.Ranged.Ranges
 
 test-suite tests
   type: exitcode-stdio-1.0

src/AbsSyn.hs

@@ -23,14 +23,14 @@ module AbsSyn (
   StrType(..)
   ) where
 
-import CharSet ( CharSet, Encoding )
-import Map ( Map )
-import qualified Map hiding ( Map )
-import Data.IntMap (IntMap)
-import Sort ( nub' )
-import Util ( str, nl )
-
-import Data.Maybe ( fromJust )
+import CharSet     ( CharSet, Encoding )
+import Data.Maybe  ( fromJust )
+import Data.Map    ( Map )
+import Data.IntMap ( IntMap )
+import Sort        ( nub' )
+import Util        ( str, nl )
+import qualified Data.Map as Map
+
 
 infixl 4 :||
 infixl 5 :%%

src/DFA.hs

@@ -16,7 +16,7 @@
 module DFA(scanner2dfa) where
 
 import AbsSyn
-import qualified Map
+import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
 import NFA
 import Sort ( msort, nub' )

src/DFAMin.hs

@@ -6,13 +6,15 @@ module DFAMin (minimizeDFA) where
 
 import AbsSyn
 
-import Data.Map (Map)
-import qualified Data.Map as Map
-import Data.IntSet (IntSet)
+import Data.IntMap ( IntMap )
+import Data.IntSet ( IntSet )
+import Data.Map    ( Map )
+import Data.Maybe  ( mapMaybe )
+
+import qualified Data.Map    as Map
 import qualified Data.IntSet as IntSet
-import Data.IntMap (IntMap)
 import qualified Data.IntMap as IntMap
-import qualified Data.List as List
+import qualified Data.List   as List
 
 -- % Hopcroft's Algorithm for DFA minimization (cut/pasted from Wikipedia):
 -- % X refines Y into Y1 and Y2 means

src/DFS.hs

@@ -23,10 +23,9 @@ Chris Dornan, 23-Jun-94, 2-Jul-96, 29-Aug-96, 29-Sep-97
 
 module DFS where
 
-import Set ( Set )
-import qualified Set hiding ( Set )
-
 import Data.Array ( (!), accumArray, listArray )
+import Data.Set   ( Set )
+import qualified Data.Set as Set
 
 -- The result of a depth-first search of a graph is a list of trees,
 -- `GForest'.  `post_order' provides a post-order traversal of a forest.

src/Data/Ranged/RangedSet.hs

@@ -29,10 +29,8 @@ module Data.Ranged.RangedSet (
 
 import Data.Ranged.Boundaries
 import Data.Ranged.Ranges
-#if MIN_VERSION_base(4,9,0) && !MIN_VERSION_base(4,11,0)
+#if !MIN_VERSION_base(4,11,0)
 import Data.Semigroup
-#elif !MIN_VERSION_base(4,9,0)
-import Data.Monoid
 #endif
 
 import qualified Data.List as List
@@ -46,18 +44,12 @@ infixl 5 -<=-, -<-, -?-
 newtype DiscreteOrdered v => RSet v = RSet {rSetRanges :: [Range v]}
    deriving (Eq, Show, Ord)
 
-#if MIN_VERSION_base(4,9,0)
 instance DiscreteOrdered a => Semigroup (RSet a) where
     (<>) = rSetUnion
-#endif
 
 instance DiscreteOrdered a => Monoid (RSet a) where
-#if MIN_VERSION_base(4,9,0)
+    mempty  = rSetEmpty
     mappend = (<>)
-#else
-    mappend = rSetUnion
-#endif
-    mempty = rSetEmpty
 
 -- | Determine if the ranges in the list are both in order and non-overlapping.
 -- If so then they are suitable input for the unsafeRangedSet function.

src/Info.hs

@@ -11,7 +11,7 @@
 module Info (infoDFA) where
 
 import AbsSyn
-import qualified Map
+import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
 import Util
 

src/Main.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE NondecreasingIndentation #-}
 
 -- -----------------------------------------------------------------------------
@@ -17,56 +16,39 @@ import DFA
 import DFAMin
 import NFA
 import Info
-import Map ( Map )
-import qualified Map hiding ( Map )
 import Output
-import ParseMonad ( runP, Warning(..) )
+import ParseMonad            ( runP, Warning(..) )
 import Parser
 import Scan
-import Util ( hline )
-import Paths_alex ( version, getDataDir )
-
-#if __GLASGOW_HASKELL__ < 610
-import Control.Exception as Exception ( block, unblock, catch, throw )
-#endif
-#if __GLASGOW_HASKELL__ >= 610
-import Control.Exception ( bracketOnError )
-#endif
-import Control.Monad ( when, liftM )
-import Data.Char ( chr )
-import Data.List ( isSuffixOf, nub )
-import Data.Version ( showVersion )
+import Util                  ( hline )
+import Paths_alex            ( version, getDataDir )
+
+import Control.Exception     ( bracketOnError )
+import Control.Monad         ( when, liftM )
+import Data.Char             ( chr )
+import Data.List             ( isSuffixOf, nub )
+import Data.Map              ( Map )
+import Data.Version          ( showVersion )
 import System.Console.GetOpt ( getOpt, usageInfo, ArgOrder(..), OptDescr(..), ArgDescr(..) )
-import System.Directory ( removeFile )
-import System.Environment ( getProgName, getArgs )
-import System.Exit ( ExitCode(..), exitWith )
-import System.IO ( stderr, Handle, IOMode(..), openFile, hClose, hPutStr, hPutStrLn )
-#if __GLASGOW_HASKELL__ >= 612
-import System.IO ( hGetContents, hSetEncoding, utf8 )
-#endif
+import System.Directory      ( removeFile )
+import System.Environment    ( getProgName, getArgs )
+import System.Exit           ( ExitCode(..), exitWith )
+import System.IO             ( stderr, Handle, IOMode(..), openFile, hClose, hPutStr, hPutStrLn
+                             , hGetContents, hSetEncoding, utf8 )
+import qualified Data.Map    as Map
 
 -- We need to force every file we open to be read in
 -- as UTF8
 alexReadFile :: FilePath -> IO String
-#if __GLASGOW_HASKELL__ >= 612
-alexReadFile file = do
-  h <- alexOpenFile file ReadMode
-  hGetContents h
-#else
-alexReadFile = readFile
-#endif
+alexReadFile file = hGetContents =<< alexOpenFile file ReadMode
 
 -- We need to force every file we write to be written
 -- to as UTF8
 alexOpenFile :: FilePath -> IOMode -> IO Handle
-#if __GLASGOW_HASKELL__ >= 612
 alexOpenFile file mode = do
   h <- openFile file mode
   hSetEncoding h utf8
   return h
-#else
-alexOpenFile = openFile
-#endif
 
 -- `main' decodes the command line arguments and calls `alex'.
 
@@ -523,19 +505,3 @@ die s = hPutStr stderr s >> exitWith (ExitFailure 1)
 
 dieAlex :: String -> IO a
 dieAlex s = getProgramName >>= \prog -> die (prog ++ ": " ++ s)
-
-#if __GLASGOW_HASKELL__ < 610
-bracketOnError
-        :: IO a         -- ^ computation to run first (\"acquire resource\")
-        -> (a -> IO b)  -- ^ computation to run last (\"release resource\")
-        -> (a -> IO c)  -- ^ computation to run in-between
-        -> IO c         -- returns the value from the in-between computation
-bracketOnError before after thing =
-  block (do
-    a <- before
-    r <- Exception.catch
-           (unblock (thing a))
-           (\e -> do { after a; throw e })
-    return r
- )
-#endif

src/Map.hs

@@ -14,23 +14,19 @@
 --
 -- ----------------------------------------------------------------------------}
 
-{-# LANGUAGE CPP #-}
-
 module NFA where
 
+import Control.Monad ( forM_, zipWithM, zipWithM_, when, liftM, ap )
+import Data.Array    ( Array, (!), array, listArray, assocs, bounds )
+import Data.Map      ( Map )
+import qualified Data.Map as Map
+import qualified Data.List.NonEmpty as List1
+
 import AbsSyn
 import CharSet
-import DFS ( t_close, out )
-import Map ( Map )
-import qualified Map
+import DFS  ( t_close, out )
 import Util ( str, space )
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ( Applicative(..) )
-#endif
-import Control.Monad ( forM_, zipWithM, zipWithM_, when, liftM, ap )
-import Data.Array ( Array, (!), array, listArray, assocs, bounds )
-import qualified Data.List.NonEmpty as List1
 
 -- Each state of a nondeterministic automaton contains a list of `Accept'
 -- values, a list of epsilon transitions (an epsilon transition represents a