git.iko.soy/text
on master help sign in
Merge pull request #145 from hvr/pr/integer-simple

Revert "Rename integer-simple to integer-pure (gh-138)"

commit00cff3d9237894c5d451608e386a22b30d913c60 authorBryan O'Sullivan <bos@serpentine.com> dateThu 17 Mar 2016, 10:06 (11 years ago) parentaa0721c6c69034
2 files changed+12−12
compare with master
unifiedsplit
Data/Text/Lazy/Builder/Int.hs+3−3 text.cabal+9−9
Data/Text/Lazy/Builder/Int.hs+3−3
@@ -36,14 +36,14 @@ import Control.Monad.ST
3636#ifdef __GLASGOW_HASKELL__
3737# if defined(INTEGER_GMP)
3838import GHC.Integer.GMP.Internals (Integer(S#))
39−# elif defined(INTEGER_PURE)
39+# elif defined(INTEGER_SIMPLE)
4040import GHC.Integer
4141# else
42−# error "You need to use either GMP or integer-pure."
42+# error "You need to use either GMP or integer-simple."
4343# endif
4444#endif
4545
46−#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
46+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
4747# define PAIR(a,b) (# a,b #)
4848#else
4949# define PAIR(a,b) (a,b)
text.cabal+9−9
@@ -69,10 +69,10 @@ flag developer
6969 default: False
7070 manual: True
7171
72−flag integer-pure
73− description: Use the pure-Haskell integer library instead of GMP
72+flag integer-simple
73+ description: Use the simple integer library instead of GMP
7474 default: False
75− manual: True
75+ manual: False
7676
7777library
7878 c-sources: cbits/cbits.c
@@ -145,9 +145,9 @@ library
145145 ghc-options: -Werror
146146 cpp-options: -DASSERTS
147147
148− if flag(integer-pure)
149− cpp-options: -DINTEGER_PURE
150− build-depends: integer-pure >= 1.0
148+ if flag(integer-simple)
149+ cpp-options: -DINTEGER_SIMPLE
150+ build-depends: integer-simple >= 0.1 && < 0.5
151151 else
152152 cpp-options: -DINTEGER_GMP
153153 build-depends: integer-gmp >= 0.2
@@ -181,9 +181,9 @@ test-suite tests
181181 test-framework-hunit >= 0.2,
182182 test-framework-quickcheck2 >= 0.2
183183
184− if flag(integer-pure)
185− cpp-options: -DINTEGER_PURE
186− build-depends: integer-pure >= 0.1 && < 0.5
184+ if flag(integer-simple)
185+ cpp-options: -DINTEGER_SIMPLE
186+ build-depends: integer-simple >= 0.1 && < 0.5
187187 else
188188 cpp-options: -DINTEGER_GMP
189189 build-depends: integer-gmp >= 0.2