nirum 0.4.1 → 0.4.2
raw patch · 10 files changed
+183/−158 lines, 10 filesdep ~hlintdep ~megaparsec
Dependency ranges changed: hlint, megaparsec
Files
- CHANGES.md +129/−107
- README.md +27/−26
- nirum.cabal +11/−11
- src/Nirum/Cli.hs +3/−3
- src/Nirum/Package/Metadata.hs +4/−1
- src/Nirum/Parser.hs +2/−3
- src/Nirum/Targets/Docs.hs +2/−2
- src/Nirum/Targets/Python.hs +3/−3
- src/Nirum/Targets/Python/CodeGen.hs +1/−1
- test/Nirum/VersionSpec.hs +1/−1
CHANGES.md view
@@ -1,6 +1,28 @@ Nirum changelog =============== +Version 0.4.2+-------------++Released on Aug 24, 2018.++### Language++ - Fixed a bug that *package.toml* file had been failed to load when the system+ locale does not use UTF-8. It's now independent from the system locale+ settings.+ [[#290], [#322] by Seunghun Lee]++### Et cetera++ - The official Docker image repository was moved to+ [nirumlang/nirum](https://hub.docker.com/r/nirumlang/nirum/)+ (from [spoqa/nirum](https://hub.docker.com/r/spoqa/nirum/)).++[#290]: https://github.com/nirum-lang/nirum/issues/290+[#322]: https://github.com/nirum-lang/nirum/pull/322++ Version 0.4.1 ------------- @@ -329,23 +351,23 @@ Alpine Linux. It's because Alpine Linux doesn't provide GHC 8.2 as of March 2018. -[#13]: https://github.com/spoqa/nirum/issues/13-[#100]: https://github.com/spoqa/nirum/issues/100-[#126]: https://github.com/spoqa/nirum/issues/126-[#178]: https://github.com/spoqa/nirum/issues/178-[#217]: https://github.com/spoqa/nirum/issues/217-[#220]: https://github.com/spoqa/nirum/issues/220-[#227]: https://github.com/spoqa/nirum/pull/227-[#253]: https://github.com/spoqa/nirum/pull/253-[#254]: https://github.com/spoqa/nirum/pull/254-[#255]: https://github.com/spoqa/nirum/pull/255-[#257]: https://github.com/spoqa/nirum/pull/257-[#258]: https://github.com/spoqa/nirum/pull/258-[#259]: https://github.com/spoqa/nirum/pull/259-[#267]: https://github.com/spoqa/nirum/pull/267-[#269]: https://github.com/spoqa/nirum/pull/269-[#272]: https://github.com/spoqa/nirum/pull/272-[#277]: https://github.com/spoqa/nirum/pull/277+[#13]: https://github.com/nirum-lang/nirum/issues/13+[#100]: https://github.com/nirum-lang/nirum/issues/100+[#126]: https://github.com/nirum-lang/nirum/issues/126+[#178]: https://github.com/nirum-lang/nirum/issues/178+[#217]: https://github.com/nirum-lang/nirum/issues/217+[#220]: https://github.com/nirum-lang/nirum/issues/220+[#227]: https://github.com/nirum-lang/nirum/pull/227+[#253]: https://github.com/nirum-lang/nirum/pull/253+[#254]: https://github.com/nirum-lang/nirum/pull/254+[#255]: https://github.com/nirum-lang/nirum/pull/255+[#257]: https://github.com/nirum-lang/nirum/pull/257+[#258]: https://github.com/nirum-lang/nirum/pull/258+[#259]: https://github.com/nirum-lang/nirum/pull/259+[#267]: https://github.com/nirum-lang/nirum/pull/267+[#269]: https://github.com/nirum-lang/nirum/pull/269+[#272]: https://github.com/nirum-lang/nirum/pull/272+[#277]: https://github.com/nirum-lang/nirum/pull/277 [entry points]: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#entry-points [python2-numbers-integral]: https://docs.python.org/2/library/numbers.html#numbers.Integral [python2-int]: https://docs.python.org/2/library/functions.html#int@@ -385,7 +407,7 @@ - Fixed record/union deserializers to ignore unknown fields in data payload. Deserializers had raised `KeyError` before. [[#232]] -[#232]: https://github.com/spoqa/nirum/issues/232+[#232]: https://github.com/nirum-lang/nirum/issues/232 Version 0.3.0@@ -489,80 +511,80 @@ - The Docker image became based and built on [Alpine Linux][] so that the image is now much lighter. -[#10]: https://github.com/spoqa/nirum/issues/10-[#38]: https://github.com/spoqa/nirum/issues/38-[#50]: https://github.com/spoqa/nirum/issues/50-[#68]: https://github.com/spoqa/nirum/issues/68-[#70]: https://github.com/spoqa/nirum/issues/70-[#83]: https://github.com/spoqa/nirum/pull/83-[#85]: https://github.com/spoqa/nirum/pull/85-[#91]: https://github.com/spoqa/nirum/issues/91-[#92]: https://github.com/spoqa/nirum/issues/92-[#93]: https://github.com/spoqa/nirum/issues/93-[#99]: https://github.com/spoqa/nirum/pull/99-[#97]: https://github.com/spoqa/nirum/issues/97-[#100]: https://github.com/spoqa/nirum/issues/100-[#102]: https://github.com/spoqa/nirum/issues/102-[#104]: https://github.com/spoqa/nirum/pull/104-[#105]: https://github.com/spoqa/nirum/pull/105-[#106]: https://github.com/spoqa/nirum/pull/106-[#108]: https://github.com/spoqa/nirum/pull/108-[#111]: https://github.com/spoqa/nirum/pull/111-[#113]: https://github.com/spoqa/nirum/pull/113-[#114]: https://github.com/spoqa/nirum/pull/114-[#116]: https://github.com/spoqa/nirum/pull/116-[#117]: https://github.com/spoqa/nirum/pull/117-[#118]: https://github.com/spoqa/nirum/issues/118-[#119]: https://github.com/spoqa/nirum/pull/119-[#121]: https://github.com/spoqa/nirum/pull/121-[#123]: https://github.com/spoqa/nirum/pull/123-[#128]: https://github.com/spoqa/nirum/pull/128-[#125]: https://github.com/spoqa/nirum/issues/125-[#127]: https://github.com/spoqa/nirum/pull/127-[#131]: https://github.com/spoqa/nirum/pull/131-[#138]: https://github.com/spoqa/nirum/issues/138-[#141]: https://github.com/spoqa/nirum/pull/141-[#146]: https://github.com/spoqa/nirum/pull/146-[#149]: https://github.com/spoqa/nirum/pull/149-[#152]: https://github.com/spoqa/nirum/pull/152-[#153]: https://github.com/spoqa/nirum/issues/153-[#154]: https://github.com/spoqa/nirum/pull/154-[#155]: https://github.com/spoqa/nirum/pull/155-[#160]: https://github.com/spoqa/nirum/issues/160-[#165]: https://github.com/spoqa/nirum/pull/165-[#167]: https://github.com/spoqa/nirum/pull/167-[#168]: https://github.com/spoqa/nirum/issues/168-[#170]: https://github.com/spoqa/nirum/pull/170-[#174]: https://github.com/spoqa/nirum/pull/174-[#178]: https://github.com/spoqa/nirum/issues/178-[#179]: https://github.com/spoqa/nirum/issues/179-[#180]: https://github.com/spoqa/nirum/pull/180-[#183]: https://github.com/spoqa/nirum/pull/183-[#184]: https://github.com/spoqa/nirum/issues/184-[#185]: https://github.com/spoqa/nirum/issues/185-[#188]: https://github.com/spoqa/nirum/pull/188-[#189]: https://github.com/spoqa/nirum/pull/189-[#190]: https://github.com/spoqa/nirum/pull/190-[#192]: https://github.com/spoqa/nirum/pull/192-[#193]: https://github.com/spoqa/nirum/pull/193-[#194]: https://github.com/spoqa/nirum/pull/194-[#197]: https://github.com/spoqa/nirum/pull/197-[#199]: https://github.com/spoqa/nirum/pull/199-[#201]: https://github.com/spoqa/nirum/pull/201-[#202]: https://github.com/spoqa/nirum/pull/202-[#203]: https://github.com/spoqa/nirum/pull/203-[#204]: https://github.com/spoqa/nirum/pull/204-[#216]: https://github.com/spoqa/nirum/issues/216-[#218]: https://github.com/spoqa/nirum/issues/218-[#222]: https://github.com/spoqa/nirum/pull/222-[#223]: https://github.com/spoqa/nirum/pull/223-[#224]: https://github.com/spoqa/nirum/pull/224-[nirum-python #22]: https://github.com/spoqa/nirum-python/issues/22-[nirum-python #34]: https://github.com/spoqa/nirum-python/issues/34-[nirum-python #49]: https://github.com/spoqa/nirum-python/issues/49-[nirum-python #79]: https://github.com/spoqa/nirum-python/issues/79-[nirum-python #88]: https://github.com/spoqa/nirum-python/pull/88-[nirum-python #92]: https://github.com/spoqa/nirum-python/pull/92+[#10]: https://github.com/nirum-lang/nirum/issues/10+[#38]: https://github.com/nirum-lang/nirum/issues/38+[#50]: https://github.com/nirum-lang/nirum/issues/50+[#68]: https://github.com/nirum-lang/nirum/issues/68+[#70]: https://github.com/nirum-lang/nirum/issues/70+[#83]: https://github.com/nirum-lang/nirum/pull/83+[#85]: https://github.com/nirum-lang/nirum/pull/85+[#91]: https://github.com/nirum-lang/nirum/issues/91+[#92]: https://github.com/nirum-lang/nirum/issues/92+[#93]: https://github.com/nirum-lang/nirum/issues/93+[#99]: https://github.com/nirum-lang/nirum/pull/99+[#97]: https://github.com/nirum-lang/nirum/issues/97+[#100]: https://github.com/nirum-lang/nirum/issues/100+[#102]: https://github.com/nirum-lang/nirum/issues/102+[#104]: https://github.com/nirum-lang/nirum/pull/104+[#105]: https://github.com/nirum-lang/nirum/pull/105+[#106]: https://github.com/nirum-lang/nirum/pull/106+[#108]: https://github.com/nirum-lang/nirum/pull/108+[#111]: https://github.com/nirum-lang/nirum/pull/111+[#113]: https://github.com/nirum-lang/nirum/pull/113+[#114]: https://github.com/nirum-lang/nirum/pull/114+[#116]: https://github.com/nirum-lang/nirum/pull/116+[#117]: https://github.com/nirum-lang/nirum/pull/117+[#118]: https://github.com/nirum-lang/nirum/issues/118+[#119]: https://github.com/nirum-lang/nirum/pull/119+[#121]: https://github.com/nirum-lang/nirum/pull/121+[#123]: https://github.com/nirum-lang/nirum/pull/123+[#128]: https://github.com/nirum-lang/nirum/pull/128+[#125]: https://github.com/nirum-lang/nirum/issues/125+[#127]: https://github.com/nirum-lang/nirum/pull/127+[#131]: https://github.com/nirum-lang/nirum/pull/131+[#138]: https://github.com/nirum-lang/nirum/issues/138+[#141]: https://github.com/nirum-lang/nirum/pull/141+[#146]: https://github.com/nirum-lang/nirum/pull/146+[#149]: https://github.com/nirum-lang/nirum/pull/149+[#152]: https://github.com/nirum-lang/nirum/pull/152+[#153]: https://github.com/nirum-lang/nirum/issues/153+[#154]: https://github.com/nirum-lang/nirum/pull/154+[#155]: https://github.com/nirum-lang/nirum/pull/155+[#160]: https://github.com/nirum-lang/nirum/issues/160+[#165]: https://github.com/nirum-lang/nirum/pull/165+[#167]: https://github.com/nirum-lang/nirum/pull/167+[#168]: https://github.com/nirum-lang/nirum/issues/168+[#170]: https://github.com/nirum-lang/nirum/pull/170+[#174]: https://github.com/nirum-lang/nirum/pull/174+[#178]: https://github.com/nirum-lang/nirum/issues/178+[#179]: https://github.com/nirum-lang/nirum/issues/179+[#180]: https://github.com/nirum-lang/nirum/pull/180+[#183]: https://github.com/nirum-lang/nirum/pull/183+[#184]: https://github.com/nirum-lang/nirum/issues/184+[#185]: https://github.com/nirum-lang/nirum/issues/185+[#188]: https://github.com/nirum-lang/nirum/pull/188+[#189]: https://github.com/nirum-lang/nirum/pull/189+[#190]: https://github.com/nirum-lang/nirum/pull/190+[#192]: https://github.com/nirum-lang/nirum/pull/192+[#193]: https://github.com/nirum-lang/nirum/pull/193+[#194]: https://github.com/nirum-lang/nirum/pull/194+[#197]: https://github.com/nirum-lang/nirum/pull/197+[#199]: https://github.com/nirum-lang/nirum/pull/199+[#201]: https://github.com/nirum-lang/nirum/pull/201+[#202]: https://github.com/nirum-lang/nirum/pull/202+[#203]: https://github.com/nirum-lang/nirum/pull/203+[#204]: https://github.com/nirum-lang/nirum/pull/204+[#216]: https://github.com/nirum-lang/nirum/issues/216+[#218]: https://github.com/nirum-lang/nirum/issues/218+[#222]: https://github.com/nirum-lang/nirum/pull/222+[#223]: https://github.com/nirum-lang/nirum/pull/223+[#224]: https://github.com/nirum-lang/nirum/pull/224+[nirum-python #22]: https://github.com/nirum-lang/nirum-python/issues/22+[nirum-python #34]: https://github.com/nirum-lang/nirum-python/issues/34+[nirum-python #49]: https://github.com/nirum-lang/nirum-python/issues/49+[nirum-python #79]: https://github.com/nirum-lang/nirum-python/issues/79+[nirum-python #88]: https://github.com/nirum-lang/nirum-python/pull/88+[nirum-python #92]: https://github.com/nirum-lang/nirum-python/pull/92 [python-exception]: https://docs.python.org/3/library/exceptions.html#Exception [targets.python]: ./target/python.md [python-name-error]: https://docs.python.org/3/library/exceptions.html#NameError@@ -589,15 +611,15 @@ - Fixed a parser bug which had referred to a wrong line/column position on syntax error message when a trailing semicolon is missing. [[#64]] -[#40]: https://github.com/spoqa/nirum/issues/40-[#53]: https://github.com/spoqa/nirum/pull/53-[#57]: https://github.com/spoqa/nirum/pull/57-[#64]: https://github.com/spoqa/nirum/pull/64-[#65]: https://github.com/spoqa/nirum/issues/65-[#69]: https://github.com/spoqa/nirum/issues/69-[#71]: https://github.com/spoqa/nirum/pull/71-[#73]: https://github.com/spoqa/nirum/pull/73-[#81]: https://github.com/spoqa/nirum/pull/81+[#40]: https://github.com/nirum-lang/nirum/issues/40+[#53]: https://github.com/nirum-lang/nirum/pull/53+[#57]: https://github.com/nirum-lang/nirum/pull/57+[#64]: https://github.com/nirum-lang/nirum/pull/64+[#65]: https://github.com/nirum-lang/nirum/issues/65+[#69]: https://github.com/nirum-lang/nirum/issues/69+[#71]: https://github.com/nirum-lang/nirum/pull/71+[#73]: https://github.com/nirum-lang/nirum/pull/73+[#81]: https://github.com/nirum-lang/nirum/pull/81 ### Python target @@ -608,11 +630,11 @@ - Fixed a bug that a Python class generated from a parameterless tag had been broken. [[#55], [#66]] -[#52]: https://github.com/spoqa/nirum/pull/52-[#75]: https://github.com/spoqa/nirum/issues/75-[#76]: https://github.com/spoqa/nirum/pull/76-[#66]: https://github.com/spoqa/nirum/pull/66-[#55]: https://github.com/spoqa/nirum/issues/55+[#52]: https://github.com/nirum-lang/nirum/pull/52+[#75]: https://github.com/nirum-lang/nirum/issues/75+[#76]: https://github.com/nirum-lang/nirum/pull/76+[#66]: https://github.com/nirum-lang/nirum/pull/66+[#55]: https://github.com/nirum-lang/nirum/issues/55 ### Et cetera @@ -620,7 +642,7 @@ [spoqa/nirum](https://hub.docker.com/r/spoqa/nirum/). [[#48] by Minyoung Jeong] -[#48]: https://github.com/spoqa/nirum/pull/48+[#48]: https://github.com/nirum-lang/nirum/pull/48
README.md view
@@ -9,18 +9,18 @@ [![Total lines of code][loc]][repo] [![Gitter][chat-svg]][chat] -[release-svg]: https://img.shields.io/github/release/spoqa/nirum/all.svg-[releases]: https://github.com/spoqa/nirum/releases-[docker]: https://hub.docker.com/r/spoqa/nirum/-[docker-svg]: https://img.shields.io/docker/automated/spoqa/nirum.svg-[ci-svg]: https://travis-ci.org/spoqa/nirum.svg?branch=master-[ci]: https://travis-ci.org/spoqa/nirum+[release-svg]: https://img.shields.io/github/release/nirum-lang/nirum/all.svg+[releases]: https://github.com/nirum-lang/nirum/releases+[docker]: https://hub.docker.com/r/nirumlang/nirum/+[docker-svg]: https://img.shields.io/docker/automated/nirumlang/nirum.svg+[ci-svg]: https://travis-ci.com/nirum-lang/nirum.svg?branch=master+[ci]: https://travis-ci.com/nirum-lang/nirum [ciw-svg]: https://ci.appveyor.com/api/projects/status/jf9bsrnalcb1xrp0?svg=true [ciw]: https://ci.appveyor.com/project/dahlia/nirum-k5n5y-[cov-svg]: https://codecov.io/gh/spoqa/nirum/branch/master/graph/badge.svg-[cov]: https://codecov.io/gh/spoqa/nirum-[loc]: https://tokei.rs/b1/github/spoqa/nirum-[repo]: https://github.com/spoqa/nirum+[cov-svg]: https://codecov.io/gh/nirum-lang/nirum/branch/master/graph/badge.svg+[cov]: https://codecov.io/gh/nirum-lang/nirum+[loc]: https://tokei.rs/b1/github/nirum-lang/nirum+[repo]: https://github.com/nirum-lang/nirum [chat-svg]: https://badges.gitter.im/spoqa/nirum.svg [chat]: https://gitter.im/spoqa/nirum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge @@ -60,8 +60,8 @@ [released tags][docker-tags]. *Note that `latest` is for a nightly build which is unstable (see below).* -[latest-release]: https://github.com/spoqa/nirum/releases/latest-[docker-tags]: https://hub.docker.com/r/spoqa/nirum/tags/+[latest-release]: https://github.com/nirum-lang/nirum/releases/latest+[docker-tags]: https://hub.docker.com/r/nirumlang/nirum/tags/ ### Nightly builds@@ -73,7 +73,7 @@ - [macOS (x86_64)](https://nightly-builds.nirum.org/travis-builds/nirum-darwin-x86_64) - [Windows (x64)](https://ci.appveyor.com/api/projects/dahlia/nirum-k5n5y/artifacts/nirum-win-x64.exe?job=Platform%3A%20x64&branch=master) - [Windows (x86)](https://ci.appveyor.com/api/projects/dahlia/nirum-k5n5y/artifacts/nirum-win-x86.exe?job=Platform%3A%20x86&branch=master)-- [Docker (`spoqa/nirum:latest`)][docker]+- [Docker (`nirumlang/nirum:latest`)][docker] Although we call it "nightly build," technically it is not built every night, but done every merge commit.@@ -93,7 +93,7 @@ Nirum: The IDL compiler and RPC/distributed object framework Usage: nirum [-v|--version] (-o|--output-dir DIR) (-t|--target TARGET) DIR- Nirum compiler 0.4.1+ Nirum compiler 0.4.2 Available options: -h,--help Show this help text@@ -132,28 +132,29 @@ ### Language runtimes - - [nirum-python](https://github.com/spoqa/nirum-python): The official Python- runtime library for Nirum.- - [nirum-python-http](https://github.com/spoqa/nirum-python-http):+ - [nirum-python](https://github.com/nirum-lang/nirum-python): The official+ Python runtime library for Nirum.+ - [nirum-python-http](https://github.com/nirum-lang/nirum-python-http): Nirum HTTP transport for Python.- - [nirum-python-wsgi](https://github.com/spoqa/nirum-python-wsgi):+ - [nirum-python-wsgi](https://github.com/nirum-lang/nirum-python-wsgi): Adapt Nirum services to WSGI apps. ### Editor supports - - [nirum.tmbundle](https://github.com/spoqa/nirum.tmbundle): TextMate bundle- for Nirum. Also can be used by IntelliJ IDEA (or any other JetBrain's- IDEs, e.g., PyCharm, WebStorm) through [TextMate bundles support].- - [nirum.vim](https://github.com/spoqa/nirum.vim): Nirum syntax highlighter for- Vim/Neovim.- - [sublime-nirum](https://github.com/spoqa/sublime-nirum): Nirum package for- Sublime Text 3.+ - [nirum.tmbundle](https://github.com/nirum-lang/nirum.tmbundle): TextMate+ bundle for Nirum.+ Also can be used by IntelliJ IDEA (or any other JetBrain's IDEs, e.g.,+ PyCharm, WebStorm) through [TextMate bundles support].+ - [nirum.vim](https://github.com/nirum-lang/nirum.vim): Nirum syntax+ highlighter for Vim/Neovim.+ - [sublime-nirum](https://github.com/nirum-lang/sublime-nirum): Nirum package+ for Sublime Text 3. - [nirum-syntax-highlighting](https://marketplace.visualstudio.com/items?itemName=Nirum.nirum-syntax-highlighting) for VS Code: Nirum syntax highlighter for VS Code. [related-projects]: https://github.com/search?q=topic:nirum+fork:false [github-topic]: https://github.com/blog/2309-introducing-topics-[TextMate bundles support]: https://github.com/spoqa/nirum.tmbundle#installation-intellij-idea-pycharm-etc+[TextMate bundles support]: https://github.com/nirum-lang/nirum.tmbundle#installation-intellij-idea-pycharm-etc Etymology
nirum.cabal view
@@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 68f1b33c406234a48717fa6ecdf0ce98bce610db2348e3b448b3579016479f2b+-- hash: 5f111a8eea54d08aac4e2c80499e06c720220a0675b48cc03b2d3dd80dfbb54d name: nirum-version: 0.4.1+version: 0.4.2 synopsis: IDL compiler and RPC/distributed object framework for microservices description: Nirum is an IDL compiler and RPC/distributed object framework for microservices, built on top of the modern Web server technologies such as RESTful HTTP and JSON.@@ -13,8 +13,8 @@ See also README.md for more details. category: Language stability: alpha-homepage: http://nirum.org/-bug-reports: https://github.com/spoqa/nirum/issues+homepage: https://nirum.org/+bug-reports: https://github.com/nirum-lang/nirum/issues author: Nirum team maintainer: Nirum team copyright: (c) 2016–2018 Nirum team@@ -28,7 +28,7 @@ source-repository head type: git- location: git@github.com/spoqa/nirum.git+ location: git://github.com/nirum-lang/nirum.git flag static description: Static link@@ -91,7 +91,7 @@ , heterocephalus >=1.0.5 && <1.1.0 , htoml >=1.0.0.0 && <1.1.0.0 , interpolatedstring-perl6 >=1.0.0 && <1.1.0- , megaparsec >=6.3 && <6.4+ , megaparsec >=6.4 && <6.5 , mtl >=2.2.1 && <3 , optparse-applicative >=0.14 && <0.15 , parsec@@ -126,7 +126,7 @@ , filepath >=1.4 && <1.5 , htoml >=1.0.0.0 && <1.1.0.0 , interpolatedstring-perl6 >=1.0.0 && <1.1.0- , megaparsec >=6.3 && <6.4+ , megaparsec >=6.4 && <6.5 , mtl >=2.2.1 && <3 , nirum , parsec@@ -161,10 +161,10 @@ , directory >=1.2.5 && <1.4 , email-validate >=2.0.0 && <3.0.0 , filepath >=1.4 && <1.5- , hlint >=2.0.9 && <2.1+ , hlint >=2.1.6 && <2.2 , htoml >=1.0.0.0 && <1.1.0.0 , interpolatedstring-perl6 >=1.0.0 && <1.1.0- , megaparsec >=6.3 && <6.4+ , megaparsec >=6.4 && <6.5 , mtl >=2.2.1 && <3 , parsec , pretty >=1.1.3 && <2@@ -229,7 +229,7 @@ , htoml >=1.0.0.0 && <1.1.0.0 , hxt >=9.3.1.16 && <9.4.0.0 , interpolatedstring-perl6 >=1.0.0 && <1.1.0- , megaparsec >=6.3 && <6.4+ , megaparsec >=6.4 && <6.5 , mtl >=2.2.1 && <3 , nirum , parsec@@ -265,7 +265,7 @@ , filepath >=1.4 && <1.5 , htoml >=1.0.0.0 && <1.1.0.0 , interpolatedstring-perl6 >=1.0.0 && <1.1.0- , megaparsec >=6.3 && <6.4+ , megaparsec >=6.4 && <6.5 , mtl >=2.2.1 && <3 , parsec , pretty >=1.1.3 && <2
src/Nirum/Cli.hs view
@@ -10,7 +10,7 @@ import qualified Data.Map.Strict as M import qualified Data.Set as S import qualified Data.Text as T-import Control.Concurrent.STM (atomically, newTVar, readTVar, TVar, writeTVar)+import Control.Concurrent.STM import Data.Monoid ((<>)) import qualified Options.Applicative as OPT import System.Directory (createDirectoryIfMissing)@@ -198,12 +198,12 @@ reactiveBuild options@AppOptions { building = building' , changed = changed' } = do- changed'' <- atomically $ readTVar changed'+ changed'' <- readTVarIO changed' when changed'' $ do atomically $ writeTVar changed' False build options atomically $ writeTVar building' False- changedDuringBuild <- atomically $ readTVar changed'+ changedDuringBuild <- readTVarIO changed' when changedDuringBuild $ reactiveBuild options tryDie :: AppOptions -> String -> IO ()
src/Nirum/Package/Metadata.hs view
@@ -63,6 +63,7 @@ import Data.Text.Encoding (encodeUtf8) import qualified Data.Text.IO as TIO import System.FilePath ((</>))+import System.IO import Text.Email.Parser (EmailAddress) import qualified Text.Email.Validate as EV import Text.InterpolatedString.Perl6 (qq)@@ -213,7 +214,9 @@ readMetadata :: Target t => FilePath -> IO (Either MetadataError (Metadata t)) readMetadata metadataPath' = do- tomlText <- TIO.readFile metadataPath'+ h <- openFile metadataPath' ReadMode+ hSetEncoding h utf8+ tomlText <- TIO.hGetContents h return $ parseMetadata metadataPath' tomlText metadataPath :: FilePath -> FilePath
src/Nirum/Parser.hs view
@@ -184,9 +184,8 @@ Just _ -> do v <- manyTill charLiteral (char '"') return $ AI.Text $ T.pack v- Nothing -> do- v <- integer- return $ Integer v+ Nothing ->+ Integer <$> integer annotationArgument :: Parser (Identifier, AnnotationArgument) annotationArgument = do
src/Nirum/Targets/Docs.hs view
@@ -155,7 +155,7 @@ module' :: BoundModule Docs -> Html module' docsModule =- layout pkg depth (ModulePage docsModulePath) title $ [shamlet|+ layout pkg depth (ModulePage docsModulePath) title [shamlet| $maybe tit <- headingTitle <h1> <dfn><code>#{path}</code>@@ -313,7 +313,7 @@ |] typeDecl _ _ TD.Import {} = error ("It shouldn't happen; please report it to Nirum's bug tracker:\n" ++- "https://github.com/spoqa/nirum/issues")+ "https://github.com/nirum-lang/nirum/issues") nameText :: Name -> T.Text nameText = toNormalizedText . facialName
src/Nirum/Targets/Python.hs view
@@ -445,7 +445,7 @@ fields' pyVer <- getPythonVersion defaultErrorHandler <- defaultDeserializerErrorHandler- return $ [compileText|+ return [compileText| class #{className}(#{parentClass}): #{compileDocstringWithFields " " d (map fcField fieldCodes)} __slots__ = (@@ -1483,7 +1483,7 @@ compileModuleBody src@Source { sourceModule = boundModule } = do let types' = boundTypes boundModule typeCodes <- mapM (compileTypeDeclaration src) $ toList types'- return $ [compileText|+ return [compileText| %{forall typeCode <- typeCodes} #{typeCode} %{endforall}@@ -1511,7 +1511,7 @@ M.assocs (thirdPartyImports context) let globalDefs = globalDefinitions context code <- result- return $ (deps, optDeps,) $+ return $ (deps, optDeps,) [compileText|# -*- coding: utf-8 -*- #{compileDocstring "" $ sourceModule source} %{ forall (alias, import') <- M.assocs (standardImports context) }
src/Nirum/Targets/Python/CodeGen.hs view
@@ -216,7 +216,7 @@ pyVer getPythonVersion :: CodeGen PythonVersion-getPythonVersion = fmap pythonVersion Control.Monad.State.get+getPythonVersion = Control.Monad.State.gets pythonVersion renameModulePath :: RenameMap -> ModulePath -> ModulePath renameModulePath renameMap path' =
test/Nirum/VersionSpec.hs view
@@ -17,7 +17,7 @@ version `shouldSatisfy` SV.isDevelopment it "is the proper version" $ -- is it a necessary test?- version `shouldBe` SV.version 0 4 1 [] []+ version `shouldBe` SV.version 0 4 2 [] [] describe "versionText" $ do it "is equivalent to version" $ versionText `shouldBe` SV.toText version