diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,6 @@ # regex-examples -Regex is a regular expression toolkit for regex-base with: +regex is a regular expression toolkit for regex-base with: * text-replacement operations with named captures; * special datatypes for matches and captures; @@ -35,6 +35,12 @@     ☒  2017-02-18 v0.1.0.0 [Proposed core API with presentable Haddocks](https://github.com/iconnect/regex/milestone/1)     ☒  2017-02-19 v0.2.0.0 [Package split into regex and regex-examples](https://github.com/iconnect/regex/milestone/5) + +    ☒  2017-02-20 v0.2.0.1 [Remove library from regex-examples](https://github.com/iconnect/regex/issues/43) + +    ☒  2017-02-21 v0.2.0.2 [Fix tests for Hackage](https://github.com/iconnect/regex/issues/45) + +    ☒  2017-02-21 v0.2.0.3 Tweak README/index layout     ☐  2017-02-26 v0.3.0.0 [API adjustments, tutorials and examples finalized](https://github.com/iconnect/regex/milestone/2) diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,5 +1,12 @@ -*-change-log-*- +0.2.0.3 Chris Dornan 2017-02-21 + * README/index layout tweak + +0.2.0.2 Chris Dornan 2017-02-21 + * Fix re-gen-modules-test for Hackage (#45) + * Minor style tweks to README/index + 0.2.0.1 Chris Dornan 2017-02-20 * remove library from regex-examples (#43) 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 @@ -109,7 +109,7 @@ bs_re = [re|LBS.ByteString|] mod_filepath :: ModPath -> FilePath -mod_filepath mp = map tr mp ++ ".hs" +mod_filepath mp = "src/" ++ map tr mp ++ ".hs" where tr '.' = '/' tr c = c diff --git a/examples/re-prep.lhs b/examples/re-prep.lhs --- a/examples/re-prep.lhs +++ b/examples/re-prep.lhs @@ -567,7 +567,7 @@ prep_page' mmd lbs = do rf_h <- newIORef [] rf_t <- newIORef False - lbs1 <- sed' (scr rf_h rf_t) =<< include lbs + 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) @@ -799,6 +799,22 @@ [ "https://github.com/iconnect/regex/blob/master/" , LBS.pack $ T.unpack repo_path ] +\end{code} + + +tweak_md +-------- + +\begin{code} +tweak_md :: MarkdownMode -> LBS.ByteString -> LBS.ByteString +tweak_md MM_github lbs = lbs +tweak_md MM_pandoc lbs = lbs +tweak_md MM_hackage lbs = fromMaybe oops $ flip sed' lbs $ Pipe + [ (,) [re|
$|] $ EDIT_fun TOP $ \_ _ _ _->return $ Just "\n" + ] + where + -- runIdentity added to base in 4.9 only + oops = error "tweak_md" \end{code} 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: 0.2.0.1 +Version: 0.2.0.3 Synopsis: Toolkit for regex-base Description: A Regular Expression Toolkit for regex-base with Compile-time checking of RE syntax, data types for @@ -62,7 +62,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 0.2.0.1 + Tag: 0.2.0.3 @@ -143,7 +143,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -171,7 +171,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -196,7 +196,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -220,7 +220,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -247,7 +247,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -271,7 +271,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -292,7 +292,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -320,7 +320,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -351,7 +351,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -377,7 +377,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -403,7 +403,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -439,7 +439,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -476,7 +476,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -518,7 +518,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -562,7 +562,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 diff --git a/lib/version.txt b/lib/version.txt --- a/lib/version.txt +++ b/lib/version.txt @@ -1,1 +1,1 @@ -0.2.0.1 +0.2.0.3 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: 0.2.0.1 +Version: 0.2.0.3 Synopsis: Tutorial, tests and example programs for regex Description: Tutorial, tests and example programs for regex, a Regular Expression Toolkit for regex-base with @@ -63,7 +63,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 0.2.0.1 + Tag: 0.2.0.3 @@ -81,7 +81,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -109,7 +109,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -134,7 +134,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -158,7 +158,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -185,7 +185,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -209,7 +209,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -230,7 +230,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -258,7 +258,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -289,7 +289,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -315,7 +315,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -341,7 +341,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -377,7 +377,7 @@ TestKit Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -414,7 +414,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -456,7 +456,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -500,7 +500,7 @@ -fwarn-tabs Build-depends: - regex == 0.2.0.1 + regex == 0.2.0.3 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0