From f8dc186e17f5de0d28aef3051766bab8d41f204c Mon Sep 17 00:00:00 2001 From: Tissevert Date: Fri, 21 Dec 2018 10:14:18 +0100 Subject: [PATCH] Make the code compatible with base==4.9 --- pokeNeige.cabal | 2 +- src/Automaton.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pokeNeige.cabal b/pokeNeige.cabal index ab228b9..51cdfc8 100644 --- a/pokeNeige.cabal +++ b/pokeNeige.cabal @@ -39,7 +39,7 @@ executable pokeNeige , Pokemon.Type , Tool.Array -- other-extensions: - build-depends: base >=4.11 && <4.12 + build-depends: base >=4.9 && <4.12 , aeson , bytestring , containers diff --git a/src/Automaton.hs b/src/Automaton.hs index ab70b68..c658d44 100644 --- a/src/Automaton.hs +++ b/src/Automaton.hs @@ -29,7 +29,7 @@ edges Empty Client.NewGame = return $ Game { edges Empty (Client.Resume {Client.game}) = return game edges game message = do - let errorMessage = "inacceptable message " <> encode message <> " in this context" + let errorMessage = "inacceptable message " `mappend` encode message `mappend` " in this context" send (Server.Error $ unpack errorMessage) log errorMessage return game