sbv 2.4 → 2.5

raw patch · 5 files changed

+23/−12 lines, 5 filesdep −strict-concurrency

Dependencies removed: strict-concurrency

Files

• Data/SBV/BitVectors/AlgReals.hs +6/−1
• Data/SBV/Provers/Prover.hs +6/−7
• RELEASENOTES +8/−1
• SBVUnitTest/SBVUnitTestBuildTime.hs +1/−1
• sbv.cabal +2/−2

@@ -103,12 +103,13 @@   AlgRational True a `compare` AlgRational True b = a `compare` b   a                  `compare` b                  = error $ "AlgReal.compare: unsupported arguments: " ++ show (a, b) --- Structural equality and ord for AlgReal; used when constants are Map keys+-- | Structural equality for AlgReal; used when constants are Map keys algRealStructuralEqual   :: AlgReal -> AlgReal -> Bool AlgRational a b `algRealStructuralEqual` AlgRational c d = (a, b) == (c, d) AlgPolyRoot a b `algRealStructuralEqual` AlgPolyRoot c d = (a, b) == (c, d) _               `algRealStructuralEqual` _               = False +-- | Structural comparisons for AlgReal; used when constants are Map keys algRealStructuralCompare :: AlgReal -> AlgReal -> Ordering AlgRational a b `algRealStructuralCompare` AlgRational c d = (a, b) `compare` (c, d) AlgRational _ _ `algRealStructuralCompare` AlgPolyRoot _ _ = LT@@ -127,6 +128,10 @@ instance Fractional AlgReal where   (/)          = lift2 "/" (/)   fromRational = AlgRational True++instance Real AlgReal where+  toRational (AlgRational True v) = v+  toRational x                    = error $ "AlgReal.toRational: Argument cannot be represented as a rational value: " ++ algRealToHaskell x  instance Random Rational where   random g = let (a, g')  = random g

@@ -35,13 +35,12 @@  import qualified Control.Exception as E -import Control.Concurrent             (forkIO)-import Control.Concurrent.Chan.Strict (newChan, writeChan, getChanContents)-import Control.Monad                  (when, unless)-import Data.List                      (intercalate)-import Data.Maybe                     (fromJust, isJust, catMaybes)-import System.FilePath                (addExtension)-import System.Time                    (getClockTime)+import Control.Concurrent (forkIO, newChan, writeChan, getChanContents)+import Control.Monad      (when, unless)+import Data.List          (intercalate)+import Data.Maybe         (fromJust, isJust, catMaybes)+import System.FilePath    (addExtension)+import System.Time        (getClockTime)  import Data.SBV.BitVectors.Data import Data.SBV.BitVectors.Model

@@ -1,7 +1,14 @@ Hackage: <http://hackage.haskell.org/package/sbv> GitHub:  <http://github.com/LeventErkok/sbv> -Latest Hackage released version: 2.4+Latest Hackage released version: 2.5++======================================================================+Version 2.5, 2012-10-19++  - Remove dependency on the hackage package strict-concurrency, as+    hackage can no longer compile it due to some dependency mismatch.+  - Add forgotten Real class instance for the type 'AlgReal'  ====================================================================== Version 2.4, 2012-10-19

@@ -2,4 +2,4 @@ module SBVUnitTestBuildTime (buildTime) where  buildTime :: String-buildTime = "Thu Oct 18 20:24:21 PDT 2012"+buildTime = "Fri Oct 19 06:17:52 PDT 2012"

@@ -1,5 +1,5 @@ Name:          sbv-Version:       2.4+Version:       2.5 Category:      Formal Methods, Theorem Provers, Bit vectors, Symbolic Computation, Math, SMT Synopsis:      SMT Based Verification: Symbolic Haskell theorem prover using SMT solving. Description:   Express properties about Haskell programs and automatically prove them using SMT@@ -118,7 +118,7 @@                     TypeSynonymInstances   Build-Depends   : base >= 4 && < 5                   , array, containers, deepseq, directory, filepath, old-time-                  , pretty, process, mtl, QuickCheck, random, strict-concurrency, syb+                  , pretty, process, mtl, QuickCheck, random, syb   Exposed-modules : Data.SBV                   , Data.SBV.Internals                   , Data.SBV.Examples.BitPrecise.BitTricks