iconnect · cdornan · Feb 4, 2017 · Feb 3, 2017 · Feb 3, 2017 · Feb 4, 2017
diff --git a/Text/RE/Edit.lhs b/Text/RE/Edit.lhs
@@ -1,5 +1,10 @@
 \begin{code}
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.Edit
   ( LineNo
@@ -11,9 +16,8 @@ module Text.RE.Edit
   , applyLineEdit
   ) where
 
-import           Control.Applicative
 import           Data.Maybe
-import           Data.Monoid
+import           Prelude.Compat
 import           Text.RE.Capture
 import           Text.RE.IsRegex
 import           Text.RE.LineNo

diff --git a/Text/RE/Internal/PreludeMacros.hs b/Text/RE/Internal/PreludeMacros.hs
@@ -1,6 +1,11 @@
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.Internal.PreludeMacros
   ( RegexType(..)
@@ -18,12 +23,12 @@ module Text.RE.Internal.PreludeMacros
   , preludeMacroDescriptor
   ) where
 
-import           Control.Applicative
 import           Data.Array
 import qualified Data.HashMap.Lazy              as HML
 import           Data.List
 import           Data.Maybe
 import           Data.Time
+import           Prelude.Compat
 import           Text.RE.Options
 import           Text.RE.Parsers
 import           Text.RE.TestBench

diff --git a/Text/RE/PCRE.hs b/Text/RE/PCRE.hs
@@ -1,4 +1,8 @@
 {-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 {-# OPTIONS_GHC -fno-warn-dodgy-exports #-}
 
 module Text.RE.PCRE

diff --git a/Text/RE/PCRE/ByteString.hs b/Text/RE/PCRE/ByteString.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.PCRE.ByteString
   ( (*=~)

diff --git a/Text/RE/PCRE/ByteString/Lazy.hs b/Text/RE/PCRE/ByteString/Lazy.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.PCRE.ByteString.Lazy
   ( (*=~)

diff --git a/Text/RE/PCRE/RE.hs b/Text/RE/PCRE/RE.hs
@@ -1,10 +1,15 @@
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE QuasiQuotes                #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE TypeSynonymInstances       #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
 
 module Text.RE.PCRE.RE
@@ -39,11 +44,11 @@ module Text.RE.PCRE.RE
   , compileRegex
   ) where
 
-import           Control.Applicative
 import           Data.Bits
 import           Data.Functor.Identity
 import           Language.Haskell.TH
 import           Language.Haskell.TH.Quote
+import           Prelude.Compat
 import           Text.RE
 import           Text.RE.Internal.NamedCaptures
 import           Text.RE.Internal.PreludeMacros

diff --git a/Text/RE/PCRE/Sequence.hs b/Text/RE/PCRE/Sequence.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.PCRE.Sequence
   ( (*=~)

diff --git a/Text/RE/PCRE/String.hs b/Text/RE/PCRE/String.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.PCRE.String
   ( (*=~)

diff --git a/Text/RE/Replace.lhs b/Text/RE/Replace.lhs
@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE QuasiQuotes                #-}
 {-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE RecordWildCards            #-}
@@ -41,6 +42,7 @@ import qualified Data.Sequence                  as S
 import qualified Data.Text                      as T
 import qualified Data.Text.Encoding             as TE
 import qualified Data.Text.Lazy                 as LT
+import           Prelude.Compat
 import           Text.Heredoc
 import           Text.RE.Capture
 import           Text.RE.CaptureID

diff --git a/Text/RE/TDFA.hs b/Text/RE/TDFA.hs
@@ -1,4 +1,8 @@
 {-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 {-# OPTIONS_GHC -fno-warn-dodgy-exports #-}
 
 module Text.RE.TDFA

diff --git a/Text/RE/TDFA/ByteString.hs b/Text/RE/TDFA/ByteString.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TDFA.ByteString
   ( (*=~)

diff --git a/Text/RE/TDFA/ByteString/Lazy.hs b/Text/RE/TDFA/ByteString/Lazy.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TDFA.ByteString.Lazy
   ( (*=~)

diff --git a/Text/RE/TDFA/RE.hs b/Text/RE/TDFA/RE.hs
@@ -1,10 +1,15 @@
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE QuasiQuotes                #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE TypeSynonymInstances       #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
 
 module Text.RE.TDFA.RE
@@ -39,10 +44,10 @@ module Text.RE.TDFA.RE
   , compileRegex
   ) where
 
-import           Control.Applicative
 import           Data.Functor.Identity
 import           Language.Haskell.TH
 import           Language.Haskell.TH.Quote
+import           Prelude.Compat
 import           Text.RE
 import           Text.RE.Internal.NamedCaptures
 import           Text.RE.Internal.PreludeMacros

diff --git a/Text/RE/TDFA/Sequence.hs b/Text/RE/TDFA/Sequence.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TDFA.Sequence
   ( (*=~)

diff --git a/Text/RE/TDFA/String.hs b/Text/RE/TDFA/String.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TDFA.String
   ( (*=~)

diff --git a/Text/RE/TDFA/Text.hs b/Text/RE/TDFA/Text.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TDFA.Text
   ( (*=~)

diff --git a/Text/RE/TDFA/Text/Lazy.hs b/Text/RE/TDFA/Text/Lazy.hs
@@ -2,6 +2,10 @@
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# OPTIONS_GHC -fno-warn-orphans       #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TDFA.Text.Lazy
   ( (*=~)

diff --git a/Text/RE/TestBench.lhs b/Text/RE/TestBench.lhs
@@ -1,7 +1,12 @@
 \begin{code}
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.TestBench
   ( MacroID(..)
@@ -23,17 +28,16 @@ module Text.RE.TestBench
   , formatMacroSources
   , formatMacroSource
   , testMacroDescriptors
--- , regexSource
   ) where
 
 import           Data.Array
-import           Control.Applicative
 import qualified Data.HashMap.Lazy              as HML
-import           Data.List
+import qualified Data.List                      as L
 import           Data.Maybe
 import           Data.Ord
 import           Data.String
 import           Text.Printf
+import           Prelude.Compat
 import           Text.RE.Capture
 import           Text.RE.Options
 import           Text.RE.Replace
@@ -209,7 +213,7 @@ formatMacroTable :: RegexType -> MacroEnv -> String
 formatMacroTable rty env = unlines $
   format_table macro_table_hdr
     [ macro_table_row rty mid md
-        | (mid,md) <- sortBy (comparing fst) $ HML.toList env
+        | (mid,md) <- L.sortBy (comparing fst) $ HML.toList env
         ]
 \end{code}
 
@@ -240,7 +244,7 @@ formatMacroSources :: RegexType
                    -> String
 formatMacroSources rty wc env = unlines $
     [ printf "%-20s : %s" (_MacroID mid) $ formatMacroSource rty wc env mid
-        | mid <- sort $ HML.keys env
+        | mid <- L.sort $ HML.keys env
         ]
 \end{code}
 
@@ -363,7 +367,7 @@ widths rows = listArray (minBound,maxBound)
 
 format_row :: Array Col Int -> TableRow -> [String]
 format_row cw_arr row =
-  [ ("|"++) $ intercalate "|"
+  [ ("|"++) $ L.intercalate "|"
       [ field cw_arr row c i | c<-[minBound..maxBound] ]
     | i <- [0..depth-1]
     ]

diff --git a/Text/RE/Tools/Grep.lhs b/Text/RE/Tools/Grep.lhs
@@ -1,6 +1,8 @@
 \begin{code}
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE CPP                        #-}
 
 module Text.RE.Tools.Grep
   ( grep
@@ -9,8 +11,8 @@ module Text.RE.Tools.Grep
   , grepScript
   ) where
 
-import           Control.Applicative
 import qualified Data.ByteString.Lazy.Char8               as LBS
+import           Prelude.Compat
 import           Text.Printf
 import           Text.RE.Capture
 import           Text.RE.IsRegex

diff --git a/Text/RE/Tools/Lex.lhs b/Text/RE/Tools/Lex.lhs
@@ -1,7 +1,9 @@
 \begin{code}
+{-# LANGUAGE NoImplicitPrelude          #-}
+
 module Text.RE.Tools.Lex where
 
-import           Control.Applicative
+import           Prelude.Compat
 import           Text.RE
 
 

diff --git a/Text/RE/Tools/Sed.lhs b/Text/RE/Tools/Sed.lhs
@@ -1,15 +1,20 @@
 \begin{code}
+{-# LANGUAGE NoImplicitPrelude          #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE CPP                        #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+#endif
 
 module Text.RE.Tools.Sed
   ( SedScript
   , sed
   , sed'
   ) where
 
-import           Control.Applicative
 import qualified Data.ByteString.Lazy.Char8               as LBS
+import           Prelude.Compat
 import           Text.RE.Edit
 import           Text.RE.LineNo
 import           Text.RE.IsRegex

diff --git a/docs/Capture.html b/docs/Capture.html
@@ -47,7 +47,7 @@
   <link rel="stylesheet" href="lib/bs.css" type="text/css" />
 </head>
 <body>
-<ol class='breadcrumb'><li><a href='.' title='Home'>Home</a></li> &gt; <a title='source file' href='https://github.com/iconnect/regex/blob/master/Text/RE/Capture.lhs'>RE/Capture</a></ol><div class='content'>
+<ol class='breadcrumb'><li><a href='.' title='Home'>Home</a></li> &gt; <a title='source file' href='https://github.com/iconnect/regex/blob/master/src/Text/RE/Capture.lhs'>RE/Capture</a></ol><div class='content'>
 <div class="sourceCode"><pre class="sourceCode literate haskell"><code class="sourceCode haskell"><span class="ot">{-# LANGUAGE RecordWildCards            #-}</span>
 <span class="ot">{-# LANGUAGE FlexibleInstances          #-}</span>
 <span class="ot">{-# LANGUAGE UndecidableInstances       #-}</span>

diff --git a/docs/Edit.html b/docs/Edit.html
@@ -47,8 +47,13 @@
   <link rel="stylesheet" href="lib/bs.css" type="text/css" />
 </head>
 <body>
-<ol class='breadcrumb'><li><a href='.' title='Home'>Home</a></li> &gt; <a title='source file' href='https://github.com/iconnect/regex/blob/master/Text/RE/Edit.lhs'>RE/Edit</a></ol><div class='content'>
-<div class="sourceCode"><pre class="sourceCode literate haskell"><code class="sourceCode haskell"><span class="ot">{-# LANGUAGE RecordWildCards            #-}</span>
+<ol class='breadcrumb'><li><a href='.' title='Home'>Home</a></li> &gt; <a title='source file' href='https://github.com/iconnect/regex/blob/master/src/Text/RE/Edit.lhs'>RE/Edit</a></ol><div class='content'>
+<div class="sourceCode"><pre class="sourceCode literate haskell"><code class="sourceCode haskell"><span class="ot">{-# LANGUAGE NoImplicitPrelude          #-}</span>
+<span class="ot">{-# LANGUAGE RecordWildCards            #-}</span>
+<span class="ot">{-# LANGUAGE CPP                        #-}</span>
+<span class="ot">#if __GLASGOW_HASKELL__ &gt;= 800</span>
+<span class="ot">{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}</span>
+<span class="ot">#endif</span>
 
 <span class="kw">module</span> <span class="dt">Text.RE.Edit</span>
   ( <span class="dt">LineNo</span>
@@ -60,9 +65,8 @@
   , applyLineEdit
   ) <span class="kw">where</span>
 
-<span class="kw">import           </span><span class="dt">Control.Applicative</span>
 <span class="kw">import           </span><span class="dt">Data.Maybe</span>
-<span class="kw">import           </span><span class="dt">Data.Monoid</span>
+<span class="kw">import           </span><span class="dt">Prelude.Compat</span>
 <span class="kw">import           </span><span class="dt">Text.RE.Capture</span>
 <span class="kw">import           </span><span class="dt">Text.RE.IsRegex</span>
 <span class="kw">import           </span><span class="dt">Text.RE.LineNo</span>