Skip to content

Update to PureScript v0.15.0 #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- name: Set up a PureScript toolchain
uses: purescript-contrib/setup-purescript@main
with:
purescript: "unstable"
purs-tidy: "latest"

- name: Cache PureScript dependencies
Expand All @@ -35,8 +36,17 @@ jobs:
- name: Install dev dependencies
run: spago -x spago-dev.dhall install

- name: Run tests
run: spago -x spago-dev.dhall test --no-install
# - name: Run tests
# run: spago -x spago-dev.dhall test --no-install

- name: Check formatting
run: purs-tidy check src test bench

- name: Verify Bower & Pulp
run: |
npm install bower [email protected]
npx bower install
npx pulp build -- --censor-lib --strict
if [ -d "test" ]; then
npx pulp test
fi
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Notable changes to this project are documented in this file. The format is based
## [Unreleased]

Breaking changes:
- Update project and deps to PureScript v0.15.0 (#160 by @JordanMartinez)
- Drop deprecated `MonadZero` instance (#160 by @JordanMartinez)

New features:

Expand Down
75 changes: 39 additions & 36 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
{
"name": "purescript-parsing",
"license": [
"BSD-2-Clause"
],
"repository": {
"type": "git",
"url": "https://github.com/purescript-contrib/purescript-parsing.git"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"output"
],
"dependencies": {
"purescript-arrays": "^v6.0.1",
"purescript-control": "^v5.0.0",
"purescript-either": "^v5.0.0",
"purescript-foldable-traversable": "^v5.0.1",
"purescript-identity": "^v5.0.0",
"purescript-integers": "^v5.0.0",
"purescript-lists": "^v6.0.1",
"purescript-math": "^v3.0.0",
"purescript-maybe": "^v5.0.0",
"purescript-newtype": "^v4.0.0",
"purescript-numbers": "^v8.0.0",
"purescript-prelude": "^v5.0.1",
"purescript-record": "^v3.0.0",
"purescript-strings": "^v5.0.0",
"purescript-tailrec": "^v5.0.1",
"purescript-transformers": "^v5.1.0",
"purescript-tuples": "^v6.0.1",
"purescript-unfoldable": "^v5.0.0",
"purescript-unicode": "^v5.0.0",
"purescript-unsafe-coerce": "^v5.0.0"
}
"name": "purescript-parsing",
"license": [
"BSD-2-Clause"
],
"repository": {
"type": "git",
"url": "https://github.com/purescript-contrib/purescript-parsing.git"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"output"
],
"dependencies": {
"purescript-arrays": "master",
"purescript-control": "master",
"purescript-either": "master",
"purescript-foldable-traversable": "master",
"purescript-identity": "master",
"purescript-integers": "master",
"purescript-lists": "master",
"purescript-math": "master",
"purescript-maybe": "master",
"purescript-newtype": "master",
"purescript-numbers": "master",
"purescript-prelude": "master",
"purescript-record": "master",
"purescript-strings": "master",
"purescript-tailrec": "master",
"purescript-transformers": "master",
"purescript-tuples": "master",
"purescript-unfoldable": "master",
"purescript-unicode": "main",
"purescript-unsafe-coerce": "master"
},
"devDependencies": {
"purescript-assert": "master"
}
}
2 changes: 1 addition & 1 deletion packages.dhall
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall

in upstream
6 changes: 2 additions & 4 deletions src/Text/Parsing/Parser.purs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Control.Monad.Except (class MonadError, ExceptT(..), mapExceptT, runExcep
import Control.Monad.Rec.Class (class MonadRec)
import Control.Monad.State (class MonadState, StateT(..), evalStateT, gets, mapStateT, modify_, runStateT)
import Control.Monad.Trans.Class (class MonadTrans, lift)
import Control.MonadPlus (class Alternative, class MonadPlus, class MonadZero, class Plus)
import Control.MonadPlus (class Alternative, class MonadPlus, class Plus)
import Data.Either (Either(..))
import Data.Identity (Identity)
import Data.Newtype (class Newtype, over, unwrap)
Expand Down Expand Up @@ -139,7 +139,7 @@ derive newtype instance monadErrorParserT :: Monad m => MonadError ParseError (P
-- |
-- | If we read a file from disk and run this `fileParser` on it and the
-- | `string "<html>"` parser succeeds, then we know that the first branch
-- | is the correct branch, so we want to commit to the first branch.
-- | is the correct branch, so we want to commit to the first branch.
-- | Even if the `parseTheRestOfTheHtml` parser fails
-- | we don’t want to try the second branch.
-- |
Expand All @@ -164,8 +164,6 @@ instance plusParserT :: Monad m => Plus (ParserT s m) where

instance alternativeParserT :: Monad m => Alternative (ParserT s m)

instance monadZeroParserT :: Monad m => MonadZero (ParserT s m)

instance monadPlusParserT :: Monad m => MonadPlus (ParserT s m)

instance monadTransParserT :: MonadTrans (ParserT s) where
Expand Down