diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # ats-format +## 0.2.2.31 + + * Remove `static` and `profiling` flags; use `--enable-executable-static` from + `cabal-install` instead. + ## 0.2.2.30 * Fix typo in command-line parser diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright Vanessa McHale (c) 2017 +Copyright Vanessa McHale (c) 2017-2019 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/ats-format.cabal b/ats-format.cabal --- a/ats-format.cabal +++ b/ats-format.cabal @@ -1,54 +1,51 @@ -cabal-version: 1.18 -name: ats-format -version: 0.2.0.30 -license: BSD3 -license-file: LICENSE -copyright: Copyright: (c) 2017-2018 Vanessa McHale -maintainer: vamchale@gmail.com -author: Vanessa McHale -synopsis: A source-code formatter for ATS +cabal-version: 1.18 +name: ats-format +version: 0.2.0.31 +license: BSD3 +license-file: LICENSE +copyright: Copyright: (c) 2017-2019 Vanessa McHale +maintainer: vamchale@gmail.com +author: Vanessa McHale +synopsis: A source-code formatter for ATS description: An opinionated source-code formatter for [ATS](http://www.ats-lang.org/). -category: Parser, Language, ATS, Development -build-type: Custom + +category: Parser, Language, ATS, Development +build-type: Custom extra-source-files: man/atsfmt.1 .atsfmt.toml -extra-doc-files: README.md - CHANGELOG.md +extra-doc-files: + README.md + CHANGELOG.md + source-repository head - type: darcs + type: darcs location: https://hub.darcs.net/vmchale/ats custom-setup - setup-depends: base -any, - Cabal -any, - cli-setup >=0.1.0.2, - filepath -any - -flag static - description: - Make static binaries - default: False + setup-depends: + base -any, + Cabal -any, + cli-setup >=0.1.0.2, + filepath -any flag development - description: - Enable `-Werror` - default: False - manual: True + description: Enable `-Werror` + default: False + manual: True executable atsfmt - main-is: Main.hs - hs-source-dirs: src - other-modules: - Paths_ats_format + main-is: Main.hs + hs-source-dirs: src + other-modules: Paths_ats_format default-language: Haskell2010 other-extensions: OverloadedStrings TemplateHaskell - ghc-options: -Wall + ghc-options: -Wall build-depends: base >=4.9 && <5, - language-ats >=0.1.1.10, + language-ats >=1.7.4.0, optparse-applicative -any, htoml-megaparsec >=2.1.0.0, megaparsec >=7.0.0, @@ -57,13 +54,10 @@ directory -any, unordered-containers -any, process -any, - file-embed -any - + file-embed >=0.0.9 + if flag(development) ghc-options: -Werror - + if impl(ghc >=8.0) ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates - - if flag(static) - ghc-options: -static -optc-static -optl-static diff --git a/man/atsfmt.1 b/man/atsfmt.1 --- a/man/atsfmt.1 +++ b/man/atsfmt.1 @@ -1,78 +1,68 @@ -.\" Automatically generated by Pandoc 2.3 +.\" Automatically generated by Pandoc 2.7.3 .\" .TH "atsfmt (1)" "" "" "" "" .hy .SH NAME .PP -atsfmt \- a source code formatter for ATS +atsfmt - a source code formatter for ATS .SH SYNOPSIS .PP atsfmt .PP -atsfmt \-i +atsfmt -i .PP -atsfmt \-\-default\-config +atsfmt --default-config .PP cat file.dats | atsfmt .PP -atsfmt \[en]default\-config +atsfmt \[en]default-config .SH DESCRIPTION .PP -\f[B]atsfmt\f[] is an opinionated formatter for that ATS2 language. +\f[B]atsfmt\f[R] is an opinionated formatter for that ATS2 language. .SH OPTIONS .TP -.B \f[B]\-h\f[] \f[B]\-\-help\f[] +.B \f[B]-h\f[R] \f[B]--help\f[R] Display help -.RS -.RE .TP -.B \f[B]\-V\f[] \f[B]\-\-version\f[] +.B \f[B]-V\f[R] \f[B]--version\f[R] Display version information -.RS -.RE .TP -.B \f[B]\-o\f[] \f[B]\-\-no\-config\f[] +.B \f[B]-o\f[R] \f[B]--no-config\f[R] Ignore configuration files in scope -.RS -.RE .TP -.B \f[B]\-i\f[] -Modify a file in\-place. -.RS -.RE +.B \f[B]-i\f[R] +Modify a file in-place. .TP -.B \f[B]\-\-default\-config\f[] +.B \f[B]--default-config\f[R] Generate a default configuration file in the current directory -.RS -.RE .SH CONFIGURATION .PP -\f[B]atsfmt\f[] is configured using a TOML file, by default +\f[B]atsfmt\f[R] is configured using a TOML file, by default \&.atsfmt.toml. You can generate a default configuration with .IP .nf \f[C] -atsfmt\ \-\-default\-config -\f[] +atsfmt --default-config +\f[R] .fi .PP -To make \f[B]atsfmt\f[] call clang\-format on embedded C code, add the +To make \f[B]atsfmt\f[R] call clang-format on embedded C code, add the following to your .atsfmt.toml .IP .nf \f[C] -clang\-format\ =\ true -\f[] +clang-format = true +\f[R] .fi .PP You can also set ribbon width and line width in the file, viz. .IP .nf \f[C] -ribbon\ =\ 0.6 -width\ =\ 120 -\f[] +ribbon = 0.6 +width = 120 +\f[R] .fi .PP Ribbon width is the width of a line excluding indentation. @@ -82,10 +72,10 @@ .PP Editor integration is available with the ATS vim plugin at: .PP -https://github.com/vmchale/ats\-vim +https://github.com/vmchale/ats-vim .SH COPYRIGHT .PP -Copyright 2017\-2018. +Copyright 2017-2019. Vanessa McHale. All Rights Reserved. .SH AUTHORS diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -65,7 +65,7 @@ <> help "Generate default configuration file in the current directory") versionInfo :: Parser (a -> a) -versionInfo = infoOption ("atsfmt version: " ++ showVersion version) (short 'V' <> long "version" <> help "Show version") +versionInfo = infoOption ("atsfmt version: " ++ showVersion version ++ "\nlanguage-ats version: " ++ showVersion languageATSVersion) (short 'V' <> long "version" <> help "Show version") wrapper :: ParserInfo Program wrapper = info (helper <*> versionInfo <*> file)