diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +version 0.4.0.2: + +* remove version upper bounds + +* lower version lower bounds to allow building with GHC 7.4 + +* add Sunlight tests + version 0.4.0.0: * removed bindings-dsl; see comments in git log diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ -deka provides correctly rounded decimal arithmetic for Haskell. +# deka -Currently the library is nearly done, but it needs more tests and -documentation, which I'm working on. Use at your own risk. +deka provides correctly rounded decimal arithmetic for Haskell. The core of deka is a binding to the C library decNumber. As the author of deka, I have no association with the author of decNumber, @@ -33,6 +32,10 @@ http://speleotrove.com/decimal/ +## Dependencies + +### decNumber C library + You will need to have the decNumber library installed in order to use this library. I have packaged decNumber for easy installation, as the original decNumber files are distributed as plain C files @@ -43,6 +46,15 @@ https://github.com/massysett/decnumber/releases +### Haskell dependencies + +The main deka library depends only on `base` and `bytestring`, so it +shouldn't be difficult to build. The +tests use [tasty](http://documentup.com/feuerbach/tasty) and +[QuickCheck](http://hackage.haskell.org/package/QuickCheck). + +## More documentation + Much more documentation is available in the Haddock comments in the source files. There is also a file of examples to get you started. It has copious comments. It is written in literate Haskell, so the @@ -52,7 +64,11 @@ [Examples](lib/Data/Deka/Docs/Examples.lhs) +## License + deka is licensed under the BSD license, see the LICENSE file. + +## Build status [![Build Status](https://travis-ci.org/massysett/deka.png?branch=master)](https://travis-ci.org/massysett/deka) diff --git a/current-versions.txt b/current-versions.txt new file mode 100644 --- /dev/null +++ b/current-versions.txt @@ -0,0 +1,65 @@ +This package was tested to work with these dependency +versions and compiler version. +These are the default versions fetched by cabal install. +Tested as of: 2014-02-27 18:31:33.38972 UTC +Path to compiler: ghc-7.6.3 +Compiler description: 7.6.3 + +/opt/ghc-7.6.3/lib/ghc-7.6.3/package.conf.d: + Cabal-1.16.0 + array-0.4.0.1 + base-4.6.0.1 + bin-package-db-0.0.0.0 + binary-0.5.1.1 + bytestring-0.10.0.2 + containers-0.5.0.0 + deepseq-1.3.0.1 + directory-1.2.0.1 + filepath-1.3.0.1 + (ghc-7.6.3) + ghc-prim-0.3.0.0 + (haskell2010-1.1.1.0) + (haskell98-2.0.0.2) + hoopl-3.9.0.0 + hpc-0.6.0.0 + integer-gmp-0.5.0.0 + old-locale-1.0.0.5 + old-time-1.1.0.1 + pretty-1.1.1.0 + process-1.1.0.2 + rts-1.0 + template-haskell-2.8.0.0 + time-1.4.0.1 + unix-2.6.0.1 + +/home/massysett/deka/sunlight-18972/db: + MonadRandom-0.1.13 + QuickCheck-2.6 + ansi-terminal-0.6.1.1 + base-unicode-symbols-0.2.2.4 + comonad-4.0 + contravariant-0.4.4 + deka-0.4.0.2 + distributive-0.4 + either-4.1.1 + hashable-1.2.1.0 + monad-control-0.3.2.3 + mtl-2.1.2 + nats-0.1.2 + optparse-applicative-0.7.0.2 + parsec-3.1.5 + random-1.0.1.1 + regex-base-0.93.2 + regex-tdfa-1.2.0 + semigroupoids-4.0 + semigroups-0.12.2 + stm-2.4.2 + tagged-0.7 + tasty-0.7 + tasty-quickcheck-0.3.1 + text-1.1.0.0 + transformers-0.3.0.0 + transformers-base-0.4.1 + transformers-compat-0.1.1.1 + unordered-containers-0.2.3.3 + diff --git a/deka.cabal b/deka.cabal --- a/deka.cabal +++ b/deka.cabal @@ -1,12 +1,5 @@ name: deka - --- The package version. See the Haskell package versioning policy (PVP) --- for standards guiding when and how versions should be incremented. --- http://www.haskell.org/haskellwiki/Package_versioning_policy --- PVP summary: +-+------- breaking API changes --- | | +----- non-breaking API additions --- | | | +--- code changes with no API change -version: 0.4.0.0 +version: 0.4.0.2 synopsis: Decimal floating point arithmetic description: @@ -31,35 +24,18 @@ . --- URL for the project homepage or repository. homepage: http://www.github.com/massysett/deka - --- The license under which the package is released. license: BSD3 - --- The file containing the license text. license-file: LICENSE - --- The package author(s). author: Omari Norman - --- An email address to which users can send suggestions, bug reports, and --- patches. maintainer: omari@smileystation.com - --- A copyright notice. --- copyright: - +copyright: 2014 Omari Norman category: Math - build-type: Simple - --- Extra files to be distributed with the package, such as examples or a --- README. extra-source-files: README.md ChangeLog - --- Constraint on the version of Cabal needed to build this package. + current-versions.txt minimum-versions.txt cabal-version: >=1.10 +tested-with: GHC==7.4.1 GHC==7.6.2 library hs-source-dirs: lib @@ -76,8 +52,8 @@ , Data.Deka.Internal build-depends: - base >=4.6 && <4.7 - , bytestring ==0.10.* + base >=4.5.0.0 && < 5 + , bytestring >=0.9.2.1 ghc-options: -Wall default-language: Haskell2010 @@ -89,16 +65,17 @@ Test-Suite tasty-test Build-depends: - base ==4.6.* - , tasty-quickcheck ==0.3.* - , tasty ==0.7.* - , QuickCheck ==2.6.* - , bytestring ==0.10.* + base >=4.5.0.0 && < 5 + , tasty-quickcheck >=0.3.1 + , tasty >=0.7 + , QuickCheck >=2.6 + , bytestring >=0.9.2.1 extra-libraries: decnumber other-modules: Data.Deka + , Data.Deka.Internal , Data.Deka.Decnumber , Data.Deka.Quad , Data.Deka.Docs diff --git a/lib/Data/Deka.hs b/lib/Data/Deka.hs --- a/lib/Data/Deka.hs +++ b/lib/Data/Deka.hs @@ -146,7 +146,7 @@ -- | Convert a string to a Deka. You can use ordinary numeric -- strings, such as @3.25@, or exponential notation, like @325E-2@. --- More infomration on your choices is at: +-- More information on your choices is at: -- -- -- diff --git a/minimum-versions.txt b/minimum-versions.txt new file mode 100644 --- /dev/null +++ b/minimum-versions.txt @@ -0,0 +1,66 @@ +This package was tested to work with these dependency +versions and compiler version. +These are the minimum versions given in the .cabal file. +Tested as of: 2014-02-27 18:31:33.38972 UTC +Path to compiler: ghc-7.4.1 +Compiler description: 7.4.1 + +/var/lib/ghc/package.conf.d: + Cabal-1.14.0 + array-0.4.0.0 + base-4.5.0.0 + bin-package-db-0.0.0.0 + binary-0.5.1.0 + bytestring-0.9.2.1 + containers-0.4.2.1 + deepseq-1.3.0.0 + directory-1.1.0.2 + extensible-exceptions-0.1.1.4 + filepath-1.3.0.0 + (ghc-7.4.1) + ghc-prim-0.2.0.0 + (haskell2010-1.1.0.1) + (haskell98-2.0.0.1) + hoopl-3.8.7.3 + hpc-0.5.1.1 + integer-gmp-0.4.0.0 + old-locale-1.0.0.4 + old-time-1.1.0.0 + pretty-1.1.1.0 + process-1.1.0.1 + rts-1.0 + template-haskell-2.7.0.0 + time-1.4 + unix-2.5.1.0 + +/home/massysett/deka/sunlight-18972/db: + MonadRandom-0.1.13 + QuickCheck-2.6 + ansi-terminal-0.6.1.1 + base-unicode-symbols-0.2.2.4 + comonad-4.0 + contravariant-0.4.4 + deka-0.4.0.2 + distributive-0.4 + either-4.1.1 + hashable-1.2.1.0 + monad-control-0.3.2.3 + mtl-2.1.2 + nats-0.1.2 + optparse-applicative-0.7.0.2 + parsec-3.1.5 + random-1.0.1.1 + regex-base-0.93.2 + regex-tdfa-1.2.0 + semigroupoids-4.0 + semigroups-0.12.2 + stm-2.4.2 + tagged-0.7 + tasty-0.7 + tasty-quickcheck-0.3.1 + text-1.1.0.0 + transformers-0.3.0.0 + transformers-base-0.4.1 + transformers-compat-0.1.1.1 + unordered-containers-0.2.3.3 + diff --git a/test/DataDir/DekaTest.hs b/test/DataDir/DekaTest.hs --- a/test/DataDir/DekaTest.hs +++ b/test/DataDir/DekaTest.hs @@ -37,7 +37,7 @@ r <- evaluate $ f xD yD return . Just $ r catcher e = let _types = e :: DekaError in return Nothing - in catch outer catcher + in Control.Exception.catch outer catcher -- | Puts finite Quad into a Deka. Calls "error" if it fails.