Ticket #5242: 0001-Moved-data-IntSet-to-Data.IntSet.Internal.patch

Data/IntSet.hs

@@ -139 +139 @@
 import Data.Word
 #endif
 
+import Data.IntSet.Internal
+
 infixl 9 \\{-This comment teaches CPP correct behaviour -}
 
 -- A "Nat" is a natural machine word (an unsigned Int)
@@ -171 +173 @@
 (\\) :: IntSet -> IntSet -> IntSet
 m1 \\ m2 = difference m1 m2
 
-{--------------------------------------------------------------------
-  Types  
---------------------------------------------------------------------}
--- | A set of integers.
-data IntSet = Nil
-            | Tip {-# UNPACK #-} !Int
-            | Bin {-# UNPACK #-} !Prefix {-# UNPACK #-} !Mask !IntSet !IntSet
--- Invariant: Nil is never found as a child of Bin.
--- Invariant: The Mask is a power of 2.  It is the largest bit position at which
---            two elements of the set differ.
--- Invariant: Prefix is the common high-order bits that all elements share to
---            the left of the Mask bit.
--- Invariant: In Bin prefix mask left right, left consists of the elements that
---            don't have the mask bit set; right is all the elements that do.
-
-
-type Prefix = Int
-type Mask   = Int
-
 instance Monoid IntSet where
     mempty  = empty
     mappend = union

(a) /dev/null vs. (b) b/Data/IntSet/Internal.hs

@@ +1 @@
+module Data.IntSet.Internal {- export everything -} where
+
+{--------------------------------------------------------------------
+  Types
+--------------------------------------------------------------------}
+
+-- | A set of integers.
+data IntSet = Nil
+            | Tip {-# UNPACK #-} !Int
+            | Bin {-# UNPACK #-} !Prefix {-# UNPACK #-} !Mask !IntSet !IntSet
+-- Invariant: Nil is never found as a child of Bin.
+-- Invariant: The Mask is a power of 2.  It is the largest bit position at which
+--            two elements of the set differ.
+-- Invariant: Prefix is the common high-order bits that all elements share to
+--            the left of the Mask bit.
+-- Invariant: In Bin prefix mask left right, left consists of the elements that
+--            don't have the mask bit set; right is all the elements that do.
+
+type Prefix = Int
+type Mask   = Int
+

containers.cabal

@@ -29 +29 @@
         Data.IntSet
         Data.Map
         Data.Set
+    other-modules:
+        Data.IntSet.Internal
     include-dirs: include
     extensions: CPP
     if !impl(nhc98) {