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 name: brittany
version: 0.8.0.0 version: 0.8.0.0
-- synopsis: -- synopsis:
-- description: -- description:
license: AllRightsReserved license: AllRightsReserved
-- license-file: LICENSE -- license-file: LICENSE
author: Lennart Spitzner author: Lennart Spitzner
maintainer: lsp@informatik.uni-kiel.de maintainer: lsp@informatik.uni-kiel.de
-- copyright: -- copyright:
category: Language category: Language
build-type: Simple build-type: Simple
extra-source-files: ChangeLog.md extra-source-files: ChangeLog.md
cabal-version: >=1.10 cabal-version: >=1.10
flag brittany-dev flag brittany-dev
description: dev options description: dev options
@ -27,6 +27,9 @@ library {
Haskell2010 Haskell2010
hs-source-dirs: hs-source-dirs:
src src
install-includes: {
srcinc/prelude.inc
}
exposed-modules: { exposed-modules: {
Language.Haskell.Brittany Language.Haskell.Brittany
Language.Haskell.Brittany.Prelude Language.Haskell.Brittany.Prelude
@ -54,7 +57,6 @@ library {
} }
ghc-options: { ghc-options: {
-Wall -Wall
-fprof-auto -fprof-cafs -fno-spec-constr
-j -j
-fno-warn-unused-imports -fno-warn-unused-imports
-fno-warn-orphans -fno-warn-orphans

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

@ -171,49 +171,49 @@ aesonDecodeOptionsBrittany = Aeson.defaultOptions
toEncoding = toEncoding . cMap getOption toEncoding = toEncoding . cMap getOption
makeFromJSON(ErrorHandlingConfigFMaybe) makeFromJSON(ErrorHandlingConfigFMaybe)
makeToJSON (ErrorHandlingConfigFMaybe) makeToJSON(ErrorHandlingConfigFMaybe)
deriving instance Show (ErrorHandlingConfigFMaybe) deriving instance Show (ErrorHandlingConfigFMaybe)
makeFromJSONOption (DebugConfigF) makeFromJSONOption(DebugConfigF)
makeFromJSONMaybe (DebugConfigF) makeFromJSONMaybe(DebugConfigF)
makeToJSONOption (DebugConfigF) makeToJSONOption(DebugConfigF)
makeToJSONMaybe (DebugConfigF) makeToJSONMaybe(DebugConfigF)
-- instance FromJSON (DebugConfigF Option) where -- instance FromJSON (DebugConfigF Option) where
-- parseJSON = genericParseJSON aesonDecodeOptionsBrittany -- parseJSON = genericParseJSON aesonDecodeOptionsBrittany
-- instance ToJSON (DebugConfigF Option) where -- instance ToJSON (DebugConfigF Option) where
-- toEncoding = Aeson.genericToEncoding aesonDecodeOptionsBrittany -- toEncoding = Aeson.genericToEncoding aesonDecodeOptionsBrittany
makeFromJSON (IndentPolicy) makeFromJSON(IndentPolicy)
makeToJSON (IndentPolicy) makeToJSON(IndentPolicy)
makeFromJSON (AltChooser) makeFromJSON(AltChooser)
makeToJSON (AltChooser) makeToJSON(AltChooser)
makeFromJSON (ColumnAlignMode) makeFromJSON(ColumnAlignMode)
makeToJSON (ColumnAlignMode) makeToJSON(ColumnAlignMode)
makeFromJSON (CPPMode) makeFromJSON(CPPMode)
makeToJSON (CPPMode) makeToJSON(CPPMode)
makeFromJSON (ExactPrintFallbackMode) makeFromJSON(ExactPrintFallbackMode)
makeToJSON (ExactPrintFallbackMode) makeToJSON(ExactPrintFallbackMode)
makeFromJSONOption (LayoutConfigF) makeFromJSONOption(LayoutConfigF)
makeFromJSONMaybe (LayoutConfigF) makeFromJSONMaybe(LayoutConfigF)
makeToJSONOption (LayoutConfigF) makeToJSONOption(LayoutConfigF)
makeToJSONMaybe (LayoutConfigF) makeToJSONMaybe(LayoutConfigF)
makeFromJSONOption (ErrorHandlingConfigF) makeFromJSONOption(ErrorHandlingConfigF)
makeFromJSONMaybe (ErrorHandlingConfigF) makeFromJSONMaybe(ErrorHandlingConfigF)
makeToJSONOption (ErrorHandlingConfigF) makeToJSONOption(ErrorHandlingConfigF)
makeToJSONMaybe (ErrorHandlingConfigF) makeToJSONMaybe(ErrorHandlingConfigF)
makeFromJSONOption (ForwardOptionsF) makeFromJSONOption(ForwardOptionsF)
makeFromJSONMaybe (ForwardOptionsF) makeFromJSONMaybe(ForwardOptionsF)
makeToJSONOption (ForwardOptionsF) makeToJSONOption(ForwardOptionsF)
makeToJSONMaybe (ForwardOptionsF) makeToJSONMaybe(ForwardOptionsF)
makeFromJSONOption (ConfigF) makeFromJSONOption(ConfigF)
makeFromJSONMaybe (ConfigF) makeFromJSONMaybe(ConfigF)
makeToJSONOption (ConfigF) makeToJSONOption(ConfigF)
makeToJSONMaybe (ConfigF) makeToJSONMaybe(ConfigF)
-- instance Monoid DebugConfig where -- instance Monoid DebugConfig where
-- mempty = DebugConfig Nothing Nothing -- mempty = DebugConfig Nothing Nothing