diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ - [X] 2017-06-05 v1.0.1.2 [Permit utf8-string-1](https://github.com/iconnect/regex/milestone/21) - [X] 2017-06-05 v1.0.1.3 [Suspend Windows tests for PCRE on UTF-8 text](https://github.com/iconnect/regex/milestone/22) - [X] 2018-12-14 v1.0.1.4 [Fix for GHC 8.4.4, GHC-8.6.2](https://github.com/iconnect/regex/milestone/23) -- [X] 2018-12-18 v1.0.1.5 [TDFA quasi quoters not dealing with \n, etc.](https://github.com/iconnect/regex/milestone/24) +- [X] 2018-12-18 v1.0.1.5 [TDFA quasi quoters not dealing with newlines](https://github.com/iconnect/regex/milestone/24) +- [X] 2018-12-19 v1.0.2.0 [Tidy build issues](https://github.com/iconnect/regex/milestone/25) See the [Roadmap page](http://roadmap.regex.uk) for details. diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,7 +1,12 @@ -*-change-log-*- +1.0.2.0 Chris Dornan 2018-12-19 + * cabal-install build with 8.0 and 8.2 failing (#163) + * Switch to GHC-8.6.3/nightly-2018-12-19 (#164) + * Switch from Default-Extensions to Other-Extensions (#165) + 1.0.1.5 Chris Dornan 2018-12-18 - * TDFA quasi quoters not dealing with \n, etc. (#157) + * TDFA quasi quoters not dealing with newlines (#157) 1.0.1.4 Chris Dornan 2018-12-14 * GHC-8.4.4, GHC-8.6.2 (#160) diff --git a/examples/re-gen-cabals.lhs b/examples/re-gen-cabals.lhs --- a/examples/re-gen-cabals.lhs +++ b/examples/re-gen-cabals.lhs @@ -26,7 +26,7 @@ import qualified Data.List as L import qualified Data.Map as Map import Data.Maybe -import Data.Monoid +import qualified Data.Monoid as M import qualified Data.Text as T import qualified Data.Text.Encoding as TE import Prelude.Compat @@ -160,9 +160,9 @@ mb <- readIORef _ctx_test_exe case mb of Nothing -> return $ ReplaceWith ln - Just te -> case isSpace $ LBS.head $ ln<>"\n" of + Just te -> case isSpace $ LBS.head $ ln M.<> "\n" of True -> put ctx ln - False -> adjust_le (<>ln) <$> close_test_exe ctx te + False -> adjust_le (M.<>ln) <$> close_test_exe ctx te where ln = matchSource mtch mtch = allMatches mtchs !! 0 @@ -203,17 +203,17 @@ case mb of Nothing -> return $ ReplaceWith lbs Just te -> do - writeIORef _ctx_test_exe $ Just te { _te_text = _te_text te <> lbs <> "\n" } + writeIORef _ctx_test_exe $ Just te { _te_text = _te_text te M.<> lbs M.<> "\n" } return Delete mk_test_exe :: Bool -> TestExe -> LBS.ByteString -> LBS.ByteString -mk_test_exe is_t te te_lbs_kw = (<>_te_text te) $ LBS.unlines $ concat +mk_test_exe is_t te te_lbs_kw = (M.<> _te_text te) $ LBS.unlines $ concat [ [ LBS.pack $ printf "%s %s" (LBS.unpack te_lbs_kw) nm ] , [ " type: exitcode-stdio-1.0" | is_t ] ] where nm = case is_t of - True -> LBS.unpack $ _te_name te <> "-test" + True -> LBS.unpack $ _te_name te M.<> "-test" False -> LBS.unpack $ _te_name te mk_build_depends :: Bool @@ -255,7 +255,7 @@ [ " GHC-Options:" , " -Wall" , " -fwarn-tabs" - , " " <> w_error_or_warn + , " " M.<> w_error_or_warn , "" , " Build-depends:" ] ++ (map fmt $ zip (True : repeat False) $ L.sortBy comp pks) @@ -318,7 +318,7 @@ SH.cp readme "README.markdown" SH.run_ "stack" ["sdist","--stack-yaml","stack-8.0.yaml"] (pth,tb) <- analyse_so <$> SH.lastStderr - SH.cp (SH.fromText $ pth) $ SH.fromText $ "releases/"<>tb + SH.cp (SH.fromText $ pth) $ SH.fromText $ "releases/" M.<> tb where analyse_so so = (mtch!$$[cp|pth|],mtch!$$[cp|tb|]) where @@ -333,8 +333,8 @@ SH.rm_f "regex-examples.cabal" SH.cp (SH.fromText sf) (SH.fromText df) where - sf = "lib/"<>nm<>".cabal" - df = nm'<>".cabal" + sf = "lib/" M.<> nm M.<> ".cabal" + df = nm' M.<> ".cabal" test_release :: T.Text -> IO () test_release vrn_t = do @@ -351,10 +351,10 @@ setCurrentDirectory "../.." where unpack rp pn = do - SH.run_ "tar" ["xzf",rp<>"/"<>pn_vrn<>".tar.gz"] - SH.mv (SH.fromText pn_vrn) (SH.fromText $ "test-"<>pn) + SH.run_ "tar" ["xzf",rp M.<> "/" M.<> pn_vrn M.<> ".tar.gz"] + SH.mv (SH.fromText pn_vrn) (SH.fromText $ "test-" M.<> pn) where - pn_vrn = pn<>"-"<>vrn_t + pn_vrn = pn M.<> "-" M.<> vrn_t \end{code} diff --git a/examples/re-gen-modules.lhs b/examples/re-gen-modules.lhs --- a/examples/re-gen-modules.lhs +++ b/examples/re-gen-modules.lhs @@ -17,7 +17,7 @@ module Main (main) where import qualified Data.ByteString.Lazy.Char8 as LBS -import Data.Monoid +import qualified Data.Monoid as M import qualified Data.Text as T import Prelude.Compat import System.Directory @@ -149,7 +149,7 @@ source_api_mp = "Text.RE.TDFA.ByteString.Lazy" orphan_import :: ModPath -> LBS.ByteString -orphan_import mp = "import Text.Regex." <> LBS.pack mp <> "()" +orphan_import mp = "import Text.Regex." M.<> LBS.pack mp M.<> "()" tdfa_re, module_re, import_re, bs_re, orp_re :: RE tdfa_re = [re|TDFA|] diff --git a/examples/re-prep.lhs b/examples/re-prep.lhs --- a/examples/re-prep.lhs +++ b/examples/re-prep.lhs @@ -28,7 +28,7 @@ import Data.IORef import qualified Data.List as L import Data.Maybe -import Data.Monoid +import qualified Data.Monoid as M import qualified Data.Text as T import Network.HTTP.Conduit import Prelude.Compat @@ -301,8 +301,8 @@ \begin{code} begin_code, end_code :: LBS.ByteString -begin_code = "\\"<>"begin{code}" -end_code = "\\"<>"end{code}" +begin_code = "\\" M.<> "begin{code}" +end_code = "\\" M.<> "end{code}" \end{code} \begin{code} @@ -310,7 +310,7 @@ mk_list [] = [" []"] mk_list (ide0:ides) = f "[" ide0 $ foldr (f ",") [" ]"] ides where - f pfx ide t = (" "<>pfx<>" "<>LBS.pack ide) : t + f pfx ide t = (" " M.<> pfx M.<> " " M.<> LBS.pack ide) : t \end{code} @@ -533,7 +533,7 @@ pandoc_page pg = do mt_lbs <- setup_ttl <$> LBS.readFile (page_master_file pg) (hdgs,md_lbs) <- prep_page' MM_pandoc mt_lbs - LBS.writeFile "tmp/metadata.markdown" $ LBS.unlines ["---","title: "<>page_title pg,"---"] + LBS.writeFile "tmp/metadata.markdown" $ LBS.unlines ["---","title: " M.<> page_title pg,"---"] LBS.writeFile "tmp/heading.markdown" $ page_heading pg LBS.writeFile "tmp/page_pre_body.html" $ mk_pre_body_html pg hdgs LBS.writeFile "tmp/page_pst_body.html" pst_body_html @@ -574,7 +574,7 @@ page_heading :: Page -> LBS.ByteString page_heading PG_index = "" page_heading pg = - "

Home » **"<>page_title pg<>"**

\n" + "

Home » **" M.<> page_title pg M.<> "**

\n" prep_page :: LBS.ByteString -> MarkdownMode -> FilePath -> FilePath -> IO () prep_page ttl mmd in_fp out_fp = do @@ -597,7 +597,7 @@ lbs1 <- fmap (tweak_md mmd) $ sed' (scr rf_h rf_t) =<< include lbs lbs2 <- fromMaybe "" <$> fin_task_list' mmd rf_t hdgs <- reverse <$> readIORef rf_h - return (hdgs,lbs1<>lbs2) + return (hdgs,lbs1 M.<> lbs2) where scr rf_h rf_t = Select [ Function [re|^%heading#${ide}(@{%id}) +${ttl}([^ ].*)$|] TOP $ heading mmd rf_t rf_h @@ -617,24 +617,24 @@ heading mmd rf_t rf_h _ mtch _ _ = do lbs <- fromMaybe "" <$> fin_task_list' mmd rf_t modifyIORef rf_h (Heading ide ttl:) - return $ Just $ lbs<>h2 + return $ Just $ lbs M.<> h2 where h2 = case mmd of - MM_github -> "## "<>ttl - MM_hackage -> "## "<>ttl - MM_pandoc -> "

"<>ttl<>"

" + MM_github -> "## " M.<> ttl + MM_hackage -> "## " M.<> ttl + MM_pandoc -> "

" M.<> ttl M.<> "

" ide = mtch !$$ [cp|ide|] ttl = mtch !$$ [cp|ttl|] mk_pre_body_html :: Page -> [Heading] -> LBS.ByteString -mk_pre_body_html pg hdgs = hdr <> LBS.concat (map nav [minBound..maxBound]) <> ftr +mk_pre_body_html pg hdgs = hdr M.<> LBS.concat (map nav [minBound..maxBound]) M.<> ftr where hdr :: LBS.ByteString hdr = [here|
-|] <> tracking +|] M.<> tracking \end{code} @@ -729,7 +729,7 @@ task_list mmd rf chk _ mtch _ _ = case mmd of MM_github -> return Nothing - MM_hackage -> return $ Just $ "    "<>cb<>"  "<>itm<>"\n" + MM_hackage -> return $ Just $ "    " M.<> cb M.<> "  " M.<> itm M.<> "\n" MM_pandoc -> do in_tl <- readIORef rf writeIORef rf True @@ -759,7 +759,7 @@ -> Capture LBS.ByteString -- ^ the capture weare replacing (unsuded) -> IO (Maybe LBS.ByteString) -- ^ the replacement text, or Nothing to indicate no change to this line fin_task_list mmd rf_t _ mtch _ _ = - fmap (<>matchSource mtch) <$> fin_task_list' mmd rf_t + fmap ( M.<> matchSource mtch) <$> fin_task_list' mmd rf_t -- | close any task list being processed, returning the closing text -- as necessary @@ -788,7 +788,7 @@ LBS.writeFile "tmp/metadata.markdown" $ LBS.unlines [ "---" - , "title: "<>LBS.pack title + , "title: " M.<> LBS.pack title , "---" ] LBS.writeFile "tmp/bc.html" bc @@ -812,13 +812,13 @@ where bc = LBS.unlines -- [ "
" - -- , " " <> branding + -- , " " M.<> branding -- , "
" [ "
" , "
    " - , "
  1. "<>branding<>"
    2. " - , "
  2. " <> (LBS.pack title) <> "
    3. " + , "
  3. " M.<> branding M.<> "
    4. " + , "
  4. " M.<> (LBS.pack title) M.<> "
    5. " , "
" , "
" , "
" @@ -826,7 +826,7 @@ ft = LBS.concat [ "
" - ] <> tracking + ] M.<> tracking repo_url = LBS.concat [ "https://github.com/iconnect/regex/blob/master/" diff --git a/examples/re-tests.lhs b/examples/re-tests.lhs --- a/examples/re-tests.lhs +++ b/examples/re-tests.lhs @@ -34,7 +34,7 @@ import qualified Data.Foldable as F import qualified Data.HashMap.Strict as HM import Data.Maybe -import Data.Monoid +import qualified Data.Monoid as M import qualified Data.Sequence as S import Data.String import qualified Data.Text as T @@ -333,8 +333,8 @@ , testCase "Seq Char" $ do let ms = S.fromList str_ =~ regex_ :: Matches (S.Seq Char) f = \_ (RELocation i j) Capture{..} -> Just $ S.fromList $ - "(" <> show i <> ":" <> show_co j <> ":" <> - F.toList capturedText <> ")" + "(" M.<> show i M.<> ":" M.<> show_co j M.<> ":" M.<> + F.toList capturedText M.<> ")" r = replaceAllCaptures ALL f ms assertEqual "replaceAllCaptures" r $ S.fromList "(0:0:(0:1:a) (0:2:bbbb)) (1:0:(1:1:aa) (1:2:b))" @@ -355,8 +355,8 @@ "(0:0:(0:1:a) (0:2:bbbb)) (1:0:(1:1:aa) (1:2:b))" fmt :: (IsString s,Replace s) => a -> RELocation -> Capture s -> Maybe s - fmt _ (RELocation i j) Capture{..} = Just $ "(" <> packR (show i) <> ":" <> - packR (show_co j) <> ":" <> capturedText <> ")" + fmt _ (RELocation i j) Capture{..} = Just $ "(" M.<> packR (show i) M.<> ":" M.<> + packR (show_co j) M.<> ":" M.<> capturedText M.<> ")" show_co (CaptureOrdinal j) = show j \end{code} diff --git a/examples/re-top.lhs b/examples/re-top.lhs --- a/examples/re-top.lhs +++ b/examples/re-top.lhs @@ -24,7 +24,7 @@ import qualified Data.HashMap.Lazy as HML import qualified Data.List as L import Data.Maybe -import Data.Monoid +import qualified Data.Monoid as M import Data.Ord import qualified Data.Text as T import qualified Data.Text.IO as T @@ -474,7 +474,7 @@ \begin{code} formatTable :: Job -> Table -> IO T.Text formatTable Job{..} (Table ps) = to_html $ T.unlines $ - [ "# " <> jobTitle + [ "# " M.<> jobTitle , "" , mk_row header_row , mk_row divider_row @@ -602,9 +602,9 @@ mk dy js@JobSpec{..} = [ Job { jobTitle = T.unwords $ - [ "Premier League " <> T.pack jsSeason - , maybe "" (\n->"Top "<>showText n<>" ") jsSize - , "["<>showText dy<>"]" + [ "Premier League " M.<> T.pack jsSeason + , maybe "" (\n->"Top " M.<> showText n M.<> " ") jsSize + , "[" M.<> showText dy M.<> "]" ] , jobSize = jsSize , jobInputs = @@ -622,7 +622,7 @@ updateIndex = pandoc title toc >>= T.writeFile index_file where toc = T.unlines $ - [ "# " <> title + [ "# " M.<> title , "" , mk_row ["Season", "Top-N", "Html", "Text"] , mk_row ["------", "-----", "----", "----"] @@ -641,7 +641,7 @@ mk_row = T.intercalate "|" - lk lab url = "["<>lab<>"]("<>url<>")" + lk lab url = "[" M.<> lab M.<> "](" M.<> url M.<> ")" tableFile :: JobSpec -> Bool -> FilePath tableFile JobSpec{..} is_html = jsSeason ++ "-" ++ sze <.> ext @@ -683,7 +683,7 @@ where fp_t = T.pack fp - mk_ttl ssn = "Premier League " <> ssn + mk_ttl ssn = "Premier League " M.<> ssn dscvr [] = error $ fp ++ ": no data found" dscvr (fps:cds) = do @@ -721,7 +721,7 @@ T.writeFile inp_file txt T.writeFile mda_file $ T.unlines [ "---" - , "title: "<>title + , "title: " M.<> title , "---" ] fmap (const ()) $ diff --git a/lib/cabal-masters/executables-incl.cabal b/lib/cabal-masters/executables-incl.cabal --- a/lib/cabal-masters/executables-incl.cabal +++ b/lib/cabal-masters/executables-incl.cabal @@ -86,7 +86,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes %build-depends-prog regex array base base-compat bytestring containers directory hashable heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell transformers text time time-locale-compat unordered-containers %test re-tutorial-os @@ -97,7 +97,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes OverloadedStrings %build-depends-prog regex array base base-compat bytestring containers directory hashable heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell transformers text time time-locale-compat unordered-containers @@ -109,7 +109,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes %build-depends-prog regex regex-with-pcre array base base-compat bytestring containers directory hashable heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell transformers text time time-locale-compat unordered-containers %test-exe re-tutorial-replacing @@ -120,7 +120,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes %build-depends-prog regex array base base-compat bytestring containers directory hashable heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell transformers text time time-locale-compat unordered-containers %test-exe re-tutorial-testbench @@ -131,7 +131,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes %build-depends-prog regex array base base-compat bytestring containers directory hashable heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell transformers text time time-locale-compat unordered-containers %test-exe re-tutorial-tools @@ -142,5 +142,5 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes %build-depends-prog regex array base base-compat bytestring containers directory hashable heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell transformers text time time-locale-compat unordered-containers diff --git a/lib/mega-regex.cabal b/lib/mega-regex.cabal --- a/lib/mega-regex.cabal +++ b/lib/mega-regex.cabal @@ -1,5 +1,5 @@ Name: regex -Version: 1.0.1.5 +Version: 1.0.2.0 Synopsis: Toolkit for regex-base Description: A regular expression toolkit for regex-base with compile-time checking of RE syntax, data types for @@ -68,7 +68,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 1.0.1.5 + Tag: 1.0.2.0 @@ -701,7 +701,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -745,7 +745,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -790,7 +790,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes OverloadedStrings Default-Language: Haskell2010 @@ -835,7 +835,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -879,7 +879,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -923,7 +923,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -967,7 +967,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -1011,7 +1011,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -1055,7 +1055,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -1099,7 +1099,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -1144,7 +1144,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: diff --git a/lib/version.txt b/lib/version.txt --- a/lib/version.txt +++ b/lib/version.txt @@ -1,1 +1,1 @@ -1.0.1.5 +1.0.2.0 diff --git a/regex-examples.cabal b/regex-examples.cabal --- a/regex-examples.cabal +++ b/regex-examples.cabal @@ -1,5 +1,5 @@ Name: regex-examples -Version: 1.0.1.5 +Version: 1.0.2.0 Synopsis: Tutorial, tests and example programs for regex Description: Tutorial, tests and example programs for regex, a Regular Expression Toolkit for regex-base with @@ -68,7 +68,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 1.0.1.5 + Tag: 1.0.2.0 Executable re-gen-cabals @@ -581,7 +581,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -625,7 +625,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -670,7 +670,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes OverloadedStrings Default-Language: Haskell2010 @@ -715,7 +715,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -760,7 +760,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -805,7 +805,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -849,7 +849,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -893,7 +893,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -937,7 +937,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -981,7 +981,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: @@ -1026,7 +1026,7 @@ Other-Modules: TestKit - Default-Extensions: QuasiQuotes + Other-Extensions: QuasiQuotes Default-Language: Haskell2010 GHC-Options: