From 00c7384d204ba7eb41fa76e0ea283fbedf8a3403 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Tue, 7 Mar 2017 21:14:41 +0100 Subject: [PATCH] Fix config printing (config file generation) --- src/Language/Haskell/Brittany/Config.hs | 2 +- src/Language/Haskell/Brittany/Config/Types.hs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Language/Haskell/Brittany/Config.hs b/src/Language/Haskell/Brittany/Config.hs index e91f698..e9a0c33 100644 --- a/src/Language/Haskell/Brittany/Config.hs +++ b/src/Language/Haskell/Brittany/Config.hs @@ -154,4 +154,4 @@ readMergePersConfig path shouldCreate conf = do showConfigYaml :: Config -> String showConfigYaml = Data.ByteString.Char8.unpack . Data.Yaml.encode - . cMap (\(Identity x) -> Option (Just x)) + . cMap (\(Identity x) -> Just x) diff --git a/src/Language/Haskell/Brittany/Config/Types.hs b/src/Language/Haskell/Brittany/Config/Types.hs index 15995d8..3d995ce 100644 --- a/src/Language/Haskell/Brittany/Config/Types.hs +++ b/src/Language/Haskell/Brittany/Config/Types.hs @@ -163,9 +163,11 @@ aesonDecodeOptionsBrittany = Aeson.defaultOptions parseJSON = fmap (cMap Option) . parseJSON #define makeToJSONMaybe(type)\ instance ToJSON (type Maybe) where\ + toJSON = Aeson.genericToJSON aesonDecodeOptionsBrittany;\ toEncoding = Aeson.genericToEncoding aesonDecodeOptionsBrittany #define makeToJSONOption(type)\ instance ToJSON (type Option) where\ + toJSON = toJSON . cMap getOption;\ toEncoding = toEncoding . cMap getOption makeFromJSON(ErrorHandlingConfigFMaybe)