Merge pull request #10 from haskell-works/newhoggy/improvements

Improvements
haskell-works · Nov 24, 2024 · fe9b6a2 · fe9b6a2
2 parents ffee0b7 + cdd5121
commit fe9b6a2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/hw-prelude.cabal b/hw-prelude.cabal
@@ -92,6 +92,7 @@ library
 
   exposed-modules:      HaskellWorks.Control.Monad
                         HaskellWorks.Data.String
+                        HaskellWorks.Either
                         HaskellWorks.Error
                         HaskellWorks.Error.Types
                         HaskellWorks.Error.Types.GenericError

diff --git a/src/HaskellWorks/Either.hs b/src/HaskellWorks/Either.hs
@@ -0,0 +1,10 @@
+module HaskellWorks.Either
+  ( orElse
+  ) where
+
+import           Data.Either
+import           Data.Function
+
+orElse :: Either e a -> Either e a -> Either e a
+orElse a b =
+  either (const b) Right a
diff --git a/src/HaskellWorks/Prelude.hs b/src/HaskellWorks/Prelude.hs
@@ -71,7 +71,6 @@ module HaskellWorks.Prelude
     (&&),
     (||),
     (.),
-    (</>),
 
     void,
     mapM_,
@@ -102,6 +101,7 @@ module HaskellWorks.Prelude
     (<$!>),
 
     (<$>),
+    (<&>),
 
     (<**>),
     liftA,
@@ -111,13 +111,6 @@ module HaskellWorks.Prelude
 
     for_,
 
-    zip,
-    zip3,
-    zipWith,
-    zipWith3,
-    unzip,
-    unzip3,
-
     Read(..),
     readEither,
 
@@ -148,6 +141,7 @@ module HaskellWorks.Prelude
 
     Monad(..),
     MonadFail(..),
+    MonadIO(..),
     MonadPlus(..),
     Applicative(..),
     Alternative(..),
@@ -194,6 +188,7 @@ module HaskellWorks.Prelude
 import           Control.Applicative
 import           Control.Exception
 import           Control.Monad
+import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Except
 import           Data.Bifunctor
 import           Data.Bool
@@ -205,6 +200,7 @@ import           Data.Either
 import           Data.Eq
 import           Data.Foldable
 import           Data.Function
+import           Data.Functor
 import           Data.Functor.Contravariant
 import           Data.Functor.Contravariant.Divisible
 import           Data.Functor.Identity
@@ -229,7 +225,6 @@ import           GHC.Real
 import           GHC.Stack
 import           HaskellWorks.Error
 import           Prelude
-import           System.FilePath
 import           System.IO                            (Handle)
 import           Text.Read