[commit: containers] master: Merge branch 'dense-intset' (e20133f)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/containers

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e20133f4e2f843be87827ab86ae71946b1db7181

>---------------------------------------------------------------

commit e20133f4e2f843be87827ab86ae71946b1db7181
Merge: 36ae5c3... 34bdac9...
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 22 19:00:26 2011 +0100

    Merge branch 'dense-intset'
    
    Conflicts:
    	containers.cabal

 Data/IntSet.hs             |  645 ++++++++++++++++++++++++++++++--------------
 benchmarks/IntSet.hs       |    2 +-
 containers.cabal           |   27 ++-
 tests/intset-properties.hs |   99 +++++++-
 4 files changed, 556 insertions(+), 217 deletions(-)

diff --cc containers.cabal
index 5d25d7f,36a2ff0..a293a84
--- a/containers.cabal
+++ b/containers.cabal
@@@ -19,96 -19,32 +19,105 @@@ source-repository hea
      type:     git
      location: http://github.com/haskell/containers.git
  
 +flag testing
 +    description: Expose internals for testing (required for cabal test)
 +    default: False
 +
  Library
      build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.3
+     if impl(ghc)
+         build-depends: ghc-prim
+ 
      ghc-options: -O2
      if impl(ghc>6.10)
-         Ghc-Options: -fregs-graph
-     other-modules:
-         Data.IntMap.Base
-         Data.Map.Base
-         Data.StrictPair
+         ghc-options: -fregs-graph
+ 
      exposed-modules:
          Data.IntMap
 +        Data.IntMap.Lazy
 +        Data.IntMap.Strict
          Data.IntSet
          Data.Map
 +        Data.Map.Lazy
 +        Data.Map.Strict
          Data.Set
-     include-dirs: include
-     extensions: CPP
      if !impl(nhc98)
          exposed-modules:
              Data.Graph
              Data.Sequence
              Data.Tree
++    other-modules:
++        Data.IntMap.Base
++        Data.Map.Base
++        Data.StrictPair
+ 
+     include-dirs: include
+ 
+     extensions: CPP
      if impl(ghc)
-         extensions: DeriveDataTypeable, StandaloneDeriving,
-                     MagicHash, Rank2Types
+         extensions:
+             DeriveDataTypeable
+             StandaloneDeriving
+             MagicHash
+             Rank2Types
 +    if flag(testing)
 +        cpp-options: -DTESTING
 +        build-depends: QuickCheck
 +
 +Test-suite map-lazy-properties
 +    hs-source-dirs: tests
 +    main-is: map-properties.hs
 +    type: exitcode-stdio-1.0
 +
 +    build-depends:
 +        base,
 +        containers,
 +        HUnit,
 +        QuickCheck,
 +        test-framework,
 +        test-framework-hunit,
 +        test-framework-quickcheck2
 +
 +Test-suite map-strict-properties
 +    hs-source-dirs: tests
 +    main-is: map-properties.hs
 +    type: exitcode-stdio-1.0
 +
 +    build-depends:
 +        base,
 +        containers,
 +        HUnit,
 +        QuickCheck,
 +        test-framework,
 +        test-framework-hunit,
 +        test-framework-quickcheck2
 +    cpp-options: -DSTRICT
 +
 +Test-suite intmap-lazy-properties
 +    hs-source-dirs: tests
 +    main-is: intmap-properties.hs
 +    type: exitcode-stdio-1.0
 +
 +    build-depends:
 +        base,
 +        containers,
 +        HUnit,
 +        QuickCheck,
 +        test-framework,
 +        test-framework-hunit,
 +        test-framework-quickcheck2
 +
 +Test-suite intmap-strict-properties
 +    hs-source-dirs: tests
 +    main-is: intmap-properties.hs
 +    type: exitcode-stdio-1.0
 +
 +    build-depends:
 +        base,
 +        containers,
 +        HUnit,
 +        QuickCheck,
 +        test-framework,
 +        test-framework-hunit,
 +        test-framework-quickcheck2
 +    cpp-options: -DSTRICT