tweaks to ModularPrelude that should be done in CorePrelude; expanded…

… List module to fully reify Data.List
DanBurton · Aug 18, 2012 · 73ae332 · 73ae332
1 parent c7527cb
commit 73ae332
Show file tree

Hide file tree

Showing 16 changed files with 320 additions and 79 deletions.
diff --git a/modular-prelude-classy/ModularPrelude/Module/Classy.hs b/modular-prelude-classy/ModularPrelude/Module/Classy.hs
@@ -12,7 +12,7 @@ module ModularPrelude.Module.Classy
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import ModularPrelude.Classy
 
 import qualified ClassyPrelude as Classy

diff --git a/modular-prelude-classy/modular-prelude-classy.cabal b/modular-prelude-classy/modular-prelude-classy.cabal
@@ -1,5 +1,5 @@
 name:                modular-prelude-classy
-version:             0.1.0.0
+version:             0.1.0.1
 synopsis:            Reifying ClassyPrelude a la ModularPrelude
 
 homepage:            https://github.com/DanBurton/modular-prelude#readme
@@ -19,5 +19,5 @@ library
 
   build-depends:       base==4.*
                      , classy-prelude==0.2.*
-                     , modular-prelude==0.3.*
+                     , modular-prelude==0.4.*
 
diff --git a/modular-prelude/ModularPrelude.hs b/modular-prelude/ModularPrelude.hs
@@ -10,9 +10,10 @@ module ModularPrelude
     ( module CorePrelude
     , module Data.Default
     , Prelude.Read -- should be in CorePrelude
+    , Prelude.String
     ) where
 
-import CorePrelude
+import CorePrelude hiding (empty, concat, (++), or, elem, zip, zipWith, unzip)
 import Data.Default
 
 import qualified Prelude

diff --git a/modular-prelude/ModularPrelude/Module/ByteString.hs b/modular-prelude/ModularPrelude/Module/ByteString.hs
@@ -10,7 +10,7 @@ module ModularPrelude.Module.ByteString
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import qualified Data.ByteString as ByteString
 import qualified Filesystem.Path.CurrentOS as FilePath
 

diff --git a/modular-prelude/ModularPrelude/Module/HashMap.hs b/modular-prelude/ModularPrelude/Module/HashMap.hs
@@ -10,7 +10,7 @@ module ModularPrelude.Module.HashMap
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import qualified Data.HashMap.Strict as HashMap
 
 

diff --git a/modular-prelude/ModularPrelude/Module/HashSet.hs b/modular-prelude/ModularPrelude/Module/HashSet.hs
@@ -10,7 +10,7 @@ module ModularPrelude.Module.HashSet
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import qualified Data.HashSet as HashSet
 
 

diff --git a/modular-prelude/ModularPrelude/Module/LByteString.hs b/modular-prelude/ModularPrelude/Module/LByteString.hs
@@ -10,7 +10,7 @@ module ModularPrelude.Module.LByteString
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import qualified Data.ByteString.Lazy as LByteString
 import qualified Filesystem.Path.CurrentOS as FilePath
 

diff --git a/modular-prelude/ModularPrelude/Module/LHashMap.hs b/modular-prelude/ModularPrelude/Module/LHashMap.hs
@@ -13,7 +13,7 @@ module ModularPrelude.Module.LHashMap
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import qualified Data.HashMap.Lazy as LHashMap
 
 

diff --git a/modular-prelude/ModularPrelude/Module/LText.hs b/modular-prelude/ModularPrelude/Module/LText.hs
@@ -10,7 +10,7 @@ module ModularPrelude.Module.LText
   ) where
 
 
-import ModularPrelude hiding (empty)
+import ModularPrelude
 import qualified Data.Text.Lazy as LText
 import qualified Data.Text.Lazy.IO as LText
 import qualified Filesystem.Path.CurrentOS as FilePath