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

Fix CPP/macro usage for MacOS; Fix minor stuff in .cabal

pull/35/head
Lennart Spitzner 2017-03-27 16:18:14 +02:00
parent aa2a8af6e1
commit 2b30d83fe8
2 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
brittany.cabal
View File

@ -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

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

@ -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