on master help sign in
Merge pull request #145 from hvr/pr/integer-simple
00cff3dBryan O'Sullivan
Data/Text/Lazy/Builder/Int.hs+3−3
@@ -36,14 +36,14 @@ import Control.Monad.ST
36#ifdef __GLASGOW_HASKELL__
36#ifdef __GLASGOW_HASKELL__
37# if defined(INTEGER_GMP)
37# if defined(INTEGER_GMP)
38import GHC.Integer.GMP.Internals (Integer(S#))
38import GHC.Integer.GMP.Internals (Integer(S#))
39−# elif defined(INTEGER_PURE)
39+# elif defined(INTEGER_SIMPLE)
40import GHC.Integer
40import GHC.Integer
41# else
41# else
42−# error "You need to use either GMP or integer-pure."
42+# error "You need to use either GMP or integer-simple."
43# endif
43# endif
44#endif
44#endif
45
45
46−#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
46+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
47# define PAIR(a,b) (# a,b #)
47# define PAIR(a,b) (# a,b #)
48#else
48#else
49# define PAIR(a,b) (a,b)
49# define PAIR(a,b) (a,b)
text.cabal+9−9
@@ -69,10 +69,10 @@ flag developer
69 default: False
69 default: False
70 manual: True
70 manual: True
71
71
72−flag integer-pure
72+flag integer-simple
73− description: Use the pure-Haskell integer library instead of GMP
73+ description: Use the simple integer library instead of GMP
74 default: False
74 default: False
75− manual: True
75+ manual: False
76
76
77library
77library
78 c-sources: cbits/cbits.c
78 c-sources: cbits/cbits.c
@@ -145,9 +145,9 @@ library
145 ghc-options: -Werror
145 ghc-options: -Werror
146 cpp-options: -DASSERTS
146 cpp-options: -DASSERTS
147
147
148− if flag(integer-pure)
148+ if flag(integer-simple)
149− cpp-options: -DINTEGER_PURE
149+ cpp-options: -DINTEGER_SIMPLE
150− build-depends: integer-pure >= 1.0
150+ build-depends: integer-simple >= 0.1 && < 0.5
151 else
151 else
152 cpp-options: -DINTEGER_GMP
152 cpp-options: -DINTEGER_GMP
153 build-depends: integer-gmp >= 0.2
153 build-depends: integer-gmp >= 0.2
@@ -181,9 +181,9 @@ test-suite tests
181 test-framework-hunit >= 0.2,
181 test-framework-hunit >= 0.2,
182 test-framework-quickcheck2 >= 0.2
182 test-framework-quickcheck2 >= 0.2
183
183
184− if flag(integer-pure)
184+ if flag(integer-simple)
185− cpp-options: -DINTEGER_PURE
185+ cpp-options: -DINTEGER_SIMPLE
186− build-depends: integer-pure >= 0.1 && < 0.5
186+ build-depends: integer-simple >= 0.1 && < 0.5
187 else
187 else
188 cpp-options: -DINTEGER_GMP
188 cpp-options: -DINTEGER_GMP
189 build-depends: integer-gmp >= 0.2
189 build-depends: integer-gmp >= 0.2