From b72cfc097ad84ad047b99f983c7209c4434b5cd5 Mon Sep 17 00:00:00 2001 From: Danny Navarro Date: Tue, 26 Jan 2016 13:53:15 +0100 Subject: [PATCH] Fix for GHC-7.8.4 --- Data/GraphQL/Execute.hs | 2 +- tests/Test/StarWars.hs | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Data/GraphQL/Execute.hs b/Data/GraphQL/Execute.hs index 40eb122..0e7c134 100644 --- a/Data/GraphQL/Execute.hs +++ b/Data/GraphQL/Execute.hs @@ -3,7 +3,7 @@ module Data.GraphQL.Execute where #if !MIN_VERSION_base(4,8,0) -import Control.Applicative (Applicative) +import Control.Applicative ((<$>), Applicative) #endif import qualified Data.Aeson as Aeson diff --git a/tests/Test/StarWars.hs b/tests/Test/StarWars.hs index b75e6b6..ec8fadd 100644 --- a/tests/Test/StarWars.hs +++ b/tests/Test/StarWars.hs @@ -1,13 +1,15 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedLists #-} +{-# LANGUAGE OverloadedStrings #-} module Test.StarWars where +#if !MIN_VERSION_base(4,8,0) +import Control.Applicative ((<$>)) +#endif import Control.Applicative ((<|>), liftA2) import Data.Maybe (catMaybes) --- import Data.Functor.Identity (Identity(..)) import Data.Text (Text) --- import Data.Aeson (ToJSON(toJSON), genericToJSON, defaultOptions) import qualified Data.Aeson as Aeson import Data.Attoparsec.Text (parseOnly) @@ -47,6 +49,8 @@ query (InputField "human") = OutputResolver human query (InputField "droid") = OutputResolver droid query _ = OutputError +-- TODO: Extract helper function from next 3 functions. + hero :: Resolver hero (InputList (InputScalar (ScalarInt ep) : inputFields)) = maybe OutputError (\char -> OutputList $ (`characterOutput` char) <$> fields inputFields) $ getHero ep