From 2b30d83fe8964b6e4b7fdfc5decb75a2932f0652 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Mon, 27 Mar 2017 16:18:14 +0200 Subject: [PATCH] Fix CPP/macro usage for MacOS; Fix minor stuff in .cabal --- brittany.cabal | 24 +++---- src/Language/Haskell/Brittany/Config/Types.hs | 62 +++++++++---------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/brittany.cabal b/brittany.cabal index 36f2d38..054563f 100644 --- a/brittany.cabal +++ b/brittany.cabal @@ -1,16 +1,16 @@ -name: brittany -version: 0.8.0.0 +name: brittany +version: 0.8.0.0 -- synopsis: -- description: -license: AllRightsReserved --- license-file: LICENSE -author: Lennart Spitzner -maintainer: lsp@informatik.uni-kiel.de +license: AllRightsReserved +-- license-file: LICENSE +author: Lennart Spitzner +maintainer: lsp@informatik.uni-kiel.de -- copyright: -category: Language -build-type: Simple -extra-source-files: ChangeLog.md -cabal-version: >=1.10 +category: Language +build-type: Simple +extra-source-files: ChangeLog.md +cabal-version: >=1.10 flag brittany-dev description: dev options @@ -27,6 +27,9 @@ library { Haskell2010 hs-source-dirs: src + install-includes: { + srcinc/prelude.inc + } exposed-modules: { Language.Haskell.Brittany Language.Haskell.Brittany.Prelude @@ -54,7 +57,6 @@ library { } ghc-options: { -Wall - -fprof-auto -fprof-cafs -fno-spec-constr -j -fno-warn-unused-imports -fno-warn-orphans diff --git a/src/Language/Haskell/Brittany/Config/Types.hs b/src/Language/Haskell/Brittany/Config/Types.hs index 3d995ce..7c1ad85 100644 --- a/src/Language/Haskell/Brittany/Config/Types.hs +++ b/src/Language/Haskell/Brittany/Config/Types.hs @@ -171,49 +171,49 @@ aesonDecodeOptionsBrittany = Aeson.defaultOptions toEncoding = toEncoding . cMap getOption makeFromJSON(ErrorHandlingConfigFMaybe) -makeToJSON (ErrorHandlingConfigFMaybe) +makeToJSON(ErrorHandlingConfigFMaybe) deriving instance Show (ErrorHandlingConfigFMaybe) -makeFromJSONOption (DebugConfigF) -makeFromJSONMaybe (DebugConfigF) -makeToJSONOption (DebugConfigF) -makeToJSONMaybe (DebugConfigF) +makeFromJSONOption(DebugConfigF) +makeFromJSONMaybe(DebugConfigF) +makeToJSONOption(DebugConfigF) +makeToJSONMaybe(DebugConfigF) -- instance FromJSON (DebugConfigF Option) where -- parseJSON = genericParseJSON aesonDecodeOptionsBrittany -- instance ToJSON (DebugConfigF Option) where -- toEncoding = Aeson.genericToEncoding aesonDecodeOptionsBrittany -makeFromJSON (IndentPolicy) -makeToJSON (IndentPolicy) -makeFromJSON (AltChooser) -makeToJSON (AltChooser) -makeFromJSON (ColumnAlignMode) -makeToJSON (ColumnAlignMode) -makeFromJSON (CPPMode) -makeToJSON (CPPMode) -makeFromJSON (ExactPrintFallbackMode) -makeToJSON (ExactPrintFallbackMode) +makeFromJSON(IndentPolicy) +makeToJSON(IndentPolicy) +makeFromJSON(AltChooser) +makeToJSON(AltChooser) +makeFromJSON(ColumnAlignMode) +makeToJSON(ColumnAlignMode) +makeFromJSON(CPPMode) +makeToJSON(CPPMode) +makeFromJSON(ExactPrintFallbackMode) +makeToJSON(ExactPrintFallbackMode) -makeFromJSONOption (LayoutConfigF) -makeFromJSONMaybe (LayoutConfigF) -makeToJSONOption (LayoutConfigF) -makeToJSONMaybe (LayoutConfigF) +makeFromJSONOption(LayoutConfigF) +makeFromJSONMaybe(LayoutConfigF) +makeToJSONOption(LayoutConfigF) +makeToJSONMaybe(LayoutConfigF) -makeFromJSONOption (ErrorHandlingConfigF) -makeFromJSONMaybe (ErrorHandlingConfigF) -makeToJSONOption (ErrorHandlingConfigF) -makeToJSONMaybe (ErrorHandlingConfigF) +makeFromJSONOption(ErrorHandlingConfigF) +makeFromJSONMaybe(ErrorHandlingConfigF) +makeToJSONOption(ErrorHandlingConfigF) +makeToJSONMaybe(ErrorHandlingConfigF) -makeFromJSONOption (ForwardOptionsF) -makeFromJSONMaybe (ForwardOptionsF) -makeToJSONOption (ForwardOptionsF) -makeToJSONMaybe (ForwardOptionsF) +makeFromJSONOption(ForwardOptionsF) +makeFromJSONMaybe(ForwardOptionsF) +makeToJSONOption(ForwardOptionsF) +makeToJSONMaybe(ForwardOptionsF) -makeFromJSONOption (ConfigF) -makeFromJSONMaybe (ConfigF) -makeToJSONOption (ConfigF) -makeToJSONMaybe (ConfigF) +makeFromJSONOption(ConfigF) +makeFromJSONMaybe(ConfigF) +makeToJSONOption(ConfigF) +makeToJSONMaybe(ConfigF) -- instance Monoid DebugConfig where -- mempty = DebugConfig Nothing Nothing