summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonasDuregard <>2012-07-26 08:33:22 (GMT)
committerhdiff <hdiff@luite.com>2012-07-26 08:33:22 (GMT)
commit07e8162f4a0609a62465c704ad94e48c36fe2c21 (patch)
tree780d7e94eabe11568227cc4f1679ff851f347951
parent1f47303c55b208e83297235c5f158c2c9d55a494 (diff)
version 0.2.0.10.2.0.1
-rw-r--r--Agata.cabal8
-rw-r--r--Test/Agata/Common.hs31
2 files changed, 4 insertions, 35 deletions
diff --git a/Agata.cabal b/Agata.cabal
index cd18fe7..92b3a57 100644
--- a/Agata.cabal
+++ b/Agata.cabal
@@ -1,5 +1,5 @@
Name: Agata
-version: 0.2.1
+version: 0.2.0.1
cabal-Version: >= 1.6
build-type: Simple
license: BSD3
@@ -16,10 +16,10 @@ extra-source-files: Example.hs
Library
Build-Depends:
mtl, base>=4&&<5,
- template-haskell<2.5,
- QuickCheck>=2.1&&<2.2,
+ template-haskell<2.8,
+ QuickCheck>=2.1&&<2.6,
containers,
- tagged==0.0
+ tagged>=0.4.2.1&&<1
Exposed-modules:
Test.Agata,
Test.AgataTH,
diff --git a/Test/Agata/Common.hs b/Test/Agata/Common.hs
index 352f7d9..48bc458 100644
--- a/Test/Agata/Common.hs
+++ b/Test/Agata/Common.hs
@@ -11,37 +11,6 @@ import Data.Tagged
type Dimension a = Tagged a Int
-instance Num b => Num (Tagged a b) where
- (+) = liftM2 (+)
- (*) = liftM2 (*)
- (-) = liftM2 (-)
- negate = liftM negate
- abs = liftM abs
- signum = liftM signum
- fromInteger = return . fromInteger
-
-instance Real b => Real (Tagged a b) where
- toRational = toRational . unTagged
-
-instance Integral b => Integral (Tagged a b) where
- quot = liftM2 quot
- rem = liftM2 rem
- div = liftM2 div
- mod = liftM2 mod
- quotRem a b = unTagged $ liftM2 quotRem a b >>= \(x,y) -> return (return x,return y)
- divMod a b = unTagged $ liftM2 divMod a b >>= \(x,y) -> return (return x,return y)
- toInteger = toInteger . unTagged
-
-instance Enum b => Enum (Tagged a b) where
- succ = liftM succ
- pred = liftM pred
- toEnum = return . toEnum
- fromEnum = fromEnum . unTagged
- enumFrom = map return . unTagged . liftM enumFrom
- enumFromThen a = map return . unTagged . liftM2 enumFromThen a
- enumFromTo a = map return . unTagged . liftM2 enumFromTo a
- enumFromThenTo a b = map return . unTagged . liftM3 enumFromThenTo a b
-
taggedWith :: Tagged b a -> b -> Tagged b a
taggedWith = const