hexagoxel
/
brittany
1
0
Fork 0
Code Issues 117 Pull Requests 5 Packages Projects Releases 5 Wiki Activity

Fix config printing (config file generation)

pull/35/head
Lennart Spitzner 2017-03-07 21:14:41 +01:00
parent ed10137174
commit 00c7384d20
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Language/Haskell/Brittany/Config.hs
View File

@ -154,4 +154,4 @@ readMergePersConfig path shouldCreate conf = do
showConfigYaml :: Config -> String showConfigYaml :: Config -> String
showConfigYaml = Data.ByteString.Char8.unpack showConfigYaml = Data.ByteString.Char8.unpack
. Data.Yaml.encode . Data.Yaml.encode
. cMap (\(Identity x) -> Option (Just x)) . cMap (\(Identity x) -> Just x)

2
src/Language/Haskell/Brittany/Config/Types.hs
View File

@ -163,9 +163,11 @@ aesonDecodeOptionsBrittany = Aeson.defaultOptions
parseJSON = fmap (cMap Option) . parseJSON parseJSON = fmap (cMap Option) . parseJSON
#define makeToJSONMaybe(type)\ #define makeToJSONMaybe(type)\
instance ToJSON (type Maybe) where\ instance ToJSON (type Maybe) where\
toJSON = Aeson.genericToJSON aesonDecodeOptionsBrittany;\
toEncoding = Aeson.genericToEncoding aesonDecodeOptionsBrittany toEncoding = Aeson.genericToEncoding aesonDecodeOptionsBrittany
#define makeToJSONOption(type)\ #define makeToJSONOption(type)\
instance ToJSON (type Option) where\ instance ToJSON (type Option) where\
toJSON = toJSON . cMap getOption;\
toEncoding = toEncoding . cMap getOption toEncoding = toEncoding . cMap getOption
makeFromJSON(ErrorHandlingConfigFMaybe) makeFromJSON(ErrorHandlingConfigFMaybe)