4cb9080 · project-m36 · git.iko.soy

git.iko.soy/project-m36

fix new hlint warnings regarding fromRight

commit4cb9080a6ce6da993f91d74a2a14504101a6b423 authorAgentM <agentm@themactionfaction.com> dateThu 14 Jan 2021, 12:02 (6 years ago) parent478dd71

2 files changed+4−2

compare with master

unifiedsplit

src/bin/ProjectM36/Server/WebSocket.hs+2−1 src/bin/TutorialD/Interpreter.hs+2−1

src/bin/ProjectM36/Server/WebSocket.hs+2−1

@@ -22,6 +22,7 @@ import Data.Attoparsec.Text

2222import Control.Applicative

2323import Text.Megaparsec.Error

2424import Data.Functor

25+import Data.Either

2526

2627#if MIN_VERSION_megaparsec(7,0,0)

2728import Data.List.NonEmpty as NE

@@ -117,7 +118,7 @@ promptInfo :: SessionId -> Connection -> IO (HeadName, SchemaName)

117118promptInfo sessionId conn = do

118119 eHeadName <- headName sessionId conn

119120 eSchemaName <- currentSchemaName sessionId conn

120− pure (either (const "<unknown>") id eHeadName, either (const "<no schema>") id eSchemaName)

121+ pure (fromRight "<unknown>" eHeadName, fromRight "<no schema>" eSchemaName)

121122

122123sendPromptInfo :: (HeadName, SchemaName) -> WS.Connection -> IO ()

123124sendPromptInfo (hName, sName) conn = WS.sendTextData conn (encode (object ["promptInfo" .= object ["headname" .= hName, "schemaname" .= sName]]))

src/bin/TutorialD/Interpreter.hs+2−1

@@ -28,6 +28,7 @@ import System.Console.Haskeline

2828import System.Directory (getHomeDirectory)

2929import qualified Data.Text as T

3030import System.IO (hPutStrLn, stderr)

31+import Data.Either

3132#if __GLASGOW_HASKELL__ < 804

3233import Data.Monoid

3334#endif

@@ -77,7 +78,7 @@ safeInterpreterParserP = fmap RODatabaseContextOp (roDatabaseContextOperatorP <*

7778promptText :: Either RelationalError HeadName -> Either RelationalError SchemaName -> StringType

7879promptText eHeadName eSchemaName = "TutorialD (" <> transInfo <> "): "

7980 where

80− transInfo = either (const "<unknown>") id eHeadName <> "/" <> either (const "<no schema>") id eSchemaName

81+ transInfo = fromRight "<unknown>" eHeadName <> "/" <> fromRight "<no schema>" eSchemaName

8182

8283parseTutorialD :: T.Text -> Either ParserError ParsedOperation

8384parseTutorialD = parse interpreterParserP ""