Merge pull request #145 from hvr/pr/integer-simple
authorBryan O'Sullivan <bos@serpentine.com>
Thu, 17 Mar 2016 17:06:19 +0000 (10:06 -0700)
committerBryan O'Sullivan <bos@serpentine.com>
Thu, 17 Mar 2016 17:06:19 +0000 (10:06 -0700)
Revert "Rename integer-simple to integer-pure (gh-138)"

Data/Text/Lazy/Builder/Int.hs
text.cabal

index 6d26ecd..1cb0651 100644 (file)
@@ -36,14 +36,14 @@ import Control.Monad.ST
 #ifdef  __GLASGOW_HASKELL__
 # if defined(INTEGER_GMP)
 import GHC.Integer.GMP.Internals (Integer(S#))
-# elif defined(INTEGER_PURE)
+# elif defined(INTEGER_SIMPLE)
 import GHC.Integer
 # else
-# error "You need to use either GMP or integer-pure."
+# error "You need to use either GMP or integer-simple."
 # endif
 #endif
 
-#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
 # define PAIR(a,b) (# a,b #)
 #else
 # define PAIR(a,b) (a,b)
index ffb92cf..5fa1be0 100644 (file)
@@ -69,10 +69,10 @@ flag developer
   default: False
   manual: True
 
-flag integer-pure
-  description: Use the pure-Haskell integer library instead of GMP
+flag integer-simple
+  description: Use the simple integer library instead of GMP
   default: False
-  manual: True
+  manual: False
 
 library
   c-sources:    cbits/cbits.c
@@ -145,9 +145,9 @@ library
     ghc-options: -Werror
     cpp-options: -DASSERTS
 
-  if flag(integer-pure)
-    cpp-options: -DINTEGER_PURE
-    build-depends: integer-pure >= 1.0
+  if flag(integer-simple)
+    cpp-options: -DINTEGER_SIMPLE
+    build-depends: integer-simple >= 0.1 && < 0.5
   else
     cpp-options: -DINTEGER_GMP
     build-depends: integer-gmp >= 0.2
@@ -181,9 +181,9 @@ test-suite tests
     test-framework-hunit >= 0.2,
     test-framework-quickcheck2 >= 0.2
 
-  if flag(integer-pure)
-    cpp-options: -DINTEGER_PURE
-    build-depends: integer-pure >= 0.1 && < 0.5
+  if flag(integer-simple)
+    cpp-options: -DINTEGER_SIMPLE
+    build-depends: integer-simple >= 0.1 && < 0.5
   else
     cpp-options: -DINTEGER_GMP
     build-depends: integer-gmp >= 0.2