regexchar 0.9.0.14 → 0.9.0.15
raw patch · 9 files changed
+40/−32 lines, 9 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- changelog.markdown +4/−0
- debian/DEBIAN/control +1/−1
- man/man1/grecce.1 +2/−2
- regexchar.cabal +24/−13
- regexchar.spec +1/−1
- src-exe/Grecce/Test/Performance/ExtendedRegEx.hs +1/−1
- src-exe/Main.hs +5/−12
- src-lib/RegExChar/ExtendedRegExChar.hs +1/−1
- src-lib/RegExChar/MetaChar.hs +1/−1
changelog.markdown view
@@ -100,3 +100,7 @@ * Replaced use of module **ToolShed.Defaultable** with **Data.Default**. * Reimplemented **RegExChar.MetaChar.deconstruct**, **QuickCheck.ExtendedRegExChar.deconstruct**, **QuickCheck.RepeatableMetaChar.deconstruct** using record-syntax. * Tested with **ghc-8.0.1**.+## 0.9.0.15+* Added default RTS-options to **regexchar.cabal**.+* Removed dependency on **Distribution.Package.PackageName**+
debian/DEBIAN/control view
@@ -1,5 +1,5 @@ Package: regexchar-Version: 0.9.0.14-1+Version: 0.9.0.15-1 Section: text Priority: optional Architecture: amd64
man/man1/grecce.1 view
@@ -72,10 +72,10 @@ This is an addition to the options available in \fBegrep\fR, & is of relatively little use. .SS Performance .TP-\fB +RTS -N\fR [\fICores\fR] [\fB-H\fR \fIHeap-size\fR] \fB-RTS\fR+\fB +RTS -N\fR [\fICores\fR] [\fB-H\fR \fIMinimum heap-size\fR] \fB-RTS\fR If the executable has been linked with the threaded GHC-runtime, use \fICores\fR simultaneous threads (defaulting to the number of CPU-cores available), to process alternative sub-expressions and multiple files in parallel;-When specifying this option, it is usually beneficial, given sufficient resources, to suggest a large initial heap-size for the garbage-collector.+When specifying this option, it is usually beneficial, given sufficient resources, to suggest a large minimum heap-size for the garbage-collector. .br <http://www.haskell.org/ghc/docs/latest/html/users_guide/using-smp.html#parallel-options>. .PP
regexchar.cabal view
@@ -14,7 +14,7 @@ -- along with RegExChar. If not, see <http://www.gnu.org/licenses/>. Name: regexchar-Version: 0.9.0.14+Version: 0.9.0.15 Cabal-version: >= 1.10 Copyright: (C) 2010-2015 Dr. Alistair Ward License: GPL@@ -85,20 +85,19 @@ else GHC-prof-options: -auto-all -caf-all - if impl(ghc >= 7.0) && flag(llvm)- GHC-options: -fllvm+ if impl(ghc >= 7.0)+ if flag(llvm)+ GHC-options: -fllvm + if impl(ghc >= 8.0)+ GHC-options: -Wredundant-constraints+ Executable grecce Default-language: Haskell2010 GHC-options: -O2 -Wall -fno-warn-tabs Hs-source-dirs: src-exe Main-is: Main.hs - if impl(ghc >= 7.4.1)- GHC-prof-options: -fprof-auto -fprof-cafs- else- GHC-prof-options: -auto-all -caf-all- -- Required for 'cabal sdist'. Other-modules: Grecce.CommandOptions@@ -120,15 +119,24 @@ regexdot >= 0.12, toolshed >= 0.17 - if flag(threaded)- GHC-options: -threaded- if impl(ghc >= 7.0)- GHC-options: -rtsopts- if flag(llvm) GHC-options: -fllvm + if flag(threaded)+ GHC-options: -rtsopts "-with-rtsopts=-N -H10M"++ if impl(ghc >= 8.0)+ GHC-options: -Wredundant-constraints++ if impl(ghc >= 7.4.1)+ GHC-prof-options: -fprof-auto -fprof-cafs -rtsopts -with-rtsopts=-H10M+ else+ GHC-prof-options: -auto-all -caf-all++ if flag(threaded)+ GHC-options: -threaded+ Test-Suite test Default-language: Haskell2010 GHC-options: -Wall -fno-warn-tabs@@ -148,4 +156,7 @@ regexchar, regexdot >= 0.12, toolshed >= 0.17++ if impl(ghc >= 8.0)+ GHC-options: -Wredundant-constraints
regexchar.spec view
@@ -22,7 +22,7 @@ Summary: A re-implementation of egrep, using a specialisation of a polymorphic regex-engine Name: regexchar-Version: 0.9.0.14+Version: 0.9.0.15 Release: 1 License: GPLv3 # From '/usr/share/doc/packages/rpm/GROUPS'.
src-exe/Grecce/Test/Performance/ExtendedRegEx.hs view
@@ -65,7 +65,7 @@ import qualified Text.Regex.Posix import qualified ToolShed.System.TimePure -#if !defined(MIN_VERSION_base) || !MIN_VERSION_base(4,8,0)+#if !MIN_VERSION_base(4,8,0) import Control.Applicative((<$>), (<*>)) #endif
src-exe/Main.hs view
@@ -33,9 +33,6 @@ import qualified Data.Default import qualified Data.List import qualified Data.Version-import qualified Distribution.Package-import qualified Distribution.Text-import qualified Distribution.Version import qualified Grecce.CommandOptions as CommandOptions import qualified Grecce.Grep as Grep import qualified Grecce.Test.Assert.RegExOptsChar as Test.Assert.RegExOptsChar@@ -123,17 +120,13 @@ printVersion, printUsage :: IO CommandOptions.CommandOptions printVersion = System.IO.hPutStrLn System.IO.stderr (- Distribution.Text.display packageIdentifier ++ "\n\nCompiled by " ++ show compiler ++ ".\n\nCopyright (C) 2010-2015 " ++ author ++ ".\nThis program comes with ABSOLUTELY NO WARRANTY.\nThis is free software, and you are welcome to redistribute it under certain conditions.\n\nWritten by " ++ author ++ "."+ showString progName . showChar '-' . showsVersion Paths.version . showString "\n\nCompiled by " . showString System.Info.compilerName . showChar '-' . showsVersion System.Info.compilerVersion . showString ".\n\nCopyright (C) 2010-2017 " . showString author . showString ".\nThis program comes with ABSOLUTELY NO WARRANTY.\nThis is free software, and you are welcome to redistribute it under certain conditions.\n\nWritten by " $ showString author "." ) >> System.Exit.exitSuccess where- packageIdentifier :: Distribution.Package.PackageIdentifier- packageIdentifier = Distribution.Package.PackageIdentifier {- Distribution.Package.pkgName = Distribution.Package.PackageName "grecce",- Distribution.Package.pkgVersion = Distribution.Version.Version (Data.Version.versionBranch Paths.version) []- }+ author :: String+ author = "Dr. Alistair Ward" - author, compiler :: String- author = "Dr. Alistair Ward"- compiler = System.Info.compilerName ++ "-" ++ Data.List.intercalate "." (map show $ Data.Version.versionBranch System.Info.compilerVersion)+ showsVersion :: Data.Version.Version -> ShowS+ showsVersion = foldr (.) id . Data.List.intersperse (showChar '.') . map shows . Data.Version.versionBranch printUsage = System.IO.hPutStrLn System.IO.stderr usageMessage >> System.Exit.exitSuccess
src-lib/RegExChar/ExtendedRegExChar.hs view
@@ -47,7 +47,7 @@ import qualified ToolShed.Data.Pair import qualified ToolShed.SelfValidate -#if !defined(MIN_VERSION_base) || !MIN_VERSION_base(4,8,0)+#if !MIN_VERSION_base(4,8,0) import Control.Applicative((<$>), (<*>)) #endif
src-lib/RegExChar/MetaChar.hs view
@@ -77,7 +77,7 @@ import qualified ToolShed.Data.Pair import qualified ToolShed.SelfValidate -#if !defined(MIN_VERSION_base) || !MIN_VERSION_base(4,8,0)+#if !MIN_VERSION_base(4,8,0) import Control.Applicative((<$>), (<*>)) #endif