cleanup & stumped on variadic val

1 files changed, 2 insertions, 15 deletions

diff --git a/src/Sequence/Utils.hs b/src/Sequence/Utils.hs
index f0a8849..274a69d 100644
--- a/src/Sequence/Utils.hs
+++ b/src/Sequence/Utils.hs
@@ -2,8 +2,8 @@
 
 module Sequence.Utils
   ( withArg, withFocus
-  , askQ, askBool
   , toName, fromName
+  , module Sequence.Utils.Ask
   ) where
 
 import Sequence.Types
@@ -33,8 +33,7 @@ import System.Console.Shell
 import System.Console.Shell.ShellMonad
 import System.Console.Shell.Backend.Haskeline
 
-import System.Console.Readline (readline)
-
+import Sequence.Utils.Ask
 
 class Argument a st | a -> st where
   arg :: String -> Sh st (Maybe a)
@@ -49,18 +48,6 @@ withFocus f = use gFocus >>= \focus -> case focus of
   Nothing -> shellPutErrLn $ "Currently not focusing any entity"
   Just id -> f id
 
-askBool :: MonadIO m => String -> Bool -> m Bool
-askBool prompt initial = askQ prompt $ fromMaybe initial . join . fmap (eval . CI.mk)
-  where
-    eval "yes" = Just True
-    eval "y" = Just True
-    eval "no" = Just False
-    eval "n" = Just False
-    eval _ = Nothing
-
-askQ :: MonadIO m => String -> (Maybe String -> a) -> m a
-askQ prompt eval = eval <$> liftIO (readline $ prompt ++ " ")
-  
 unaligned = view faction' def
   
 toName :: MonadState GameState m => EntityIdentifier -> m String