Skip to content

Update to PureScript v0.15.0 #29

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
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
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"env": { "browser": true, "commonjs": true },
"env": { "browser": true },
"extends": "eslint:recommended",
"parserOptions": { "ecmaVersion": 5 },
"parserOptions": { "ecmaVersion": 6, "sourceType": "module" },
"rules": {
"block-scoped-var": "error",
"consistent-return": "error",
Expand Down
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 PureScript toolchain
uses: purescript-contrib/setup-purescript@main
with:
purescript: "unstable"
purs-tidy: "latest"

- name: Cache PureScript dependencies
Expand Down Expand Up @@ -49,8 +50,17 @@ jobs:
- name: Build the project
run: npm run build

- name: Run tests
run: npm run test
# - name: Run tests
# run: npm run test

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

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

Breaking changes:
- Migrate FFI to ES modules (#29 by @JordanMartinez)

New features:

Expand Down
20 changes: 10 additions & 10 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"tests"
],
"dependencies": {
"purescript-aff": "^6.0.0",
"purescript-effect": "^3.0.0",
"purescript-either": "^5.0.0",
"purescript-exceptions": "^5.0.0",
"purescript-functions": "^5.0.0",
"purescript-maybe": "^5.0.0"
"purescript-aff": "main",
"purescript-effect": "master",
"purescript-either": "master",
"purescript-exceptions": "master",
"purescript-functions": "master",
"purescript-maybe": "master"
},
"devDependencies": {
"purescript-assert": "^5.0.0",
"purescript-console": "^5.0.0",
"purescript-refs": "^5.0.0",
"purescript-transformers": "^5.0.0"
"purescript-assert": "master",
"purescript-console": "master",
"purescript-refs": "master",
"purescript-transformers": "master"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
},
"devDependencies": {
"eslint": "^7.6.0",
"purescript-psa": "^0.8.0"
"purescript-psa": "^0.8.2"
}
}
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
1 change: 0 additions & 1 deletion spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
, "functions"
, "maybe"
, "prelude"
, "psci-support"
, "refs"
]
, packages = ./packages.dhall
Expand Down
42 changes: 20 additions & 22 deletions src/Effect/AVar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
"use strict";

var AVar = function () {

function MutableQueue () {
Expand Down Expand Up @@ -210,57 +208,57 @@ var AVar = function () {
return AVar;
}();

exports.empty = function () {
export function empty() {
return new AVar(AVar.EMPTY);
};
}

exports._newVar = function (value) {
export function _newVar(value) {
return function () {
return new AVar(value);
};
};
}

exports._killVar = function (util, error, avar) {
export function _killVar(util, error, avar) {
return function () {
if (avar.error === null) {
avar.error = error;
avar.value = AVar.EMPTY;
AVar.drainVar(util, avar);
}
};
};
}

exports._putVar = function (util, value, avar, cb) {
export function _putVar(util, value, avar, cb) {
return function () {
var cell = AVar.putLast(avar.puts, { cb: cb, value: value });
AVar.drainVar(util, avar);
return function () {
AVar.deleteCell(cell);
};
};
};
}

exports._takeVar = function (util, avar, cb) {
export function _takeVar(util, avar, cb) {
return function () {
var cell = AVar.putLast(avar.takes, cb);
AVar.drainVar(util, avar);
return function () {
AVar.deleteCell(cell);
};
};
};
}

exports._readVar = function (util, avar, cb) {
export function _readVar(util, avar, cb) {
return function () {
var cell = AVar.putLast(avar.reads, cb);
AVar.drainVar(util, avar);
return function () {
AVar.deleteCell(cell);
};
};
};
}

exports._tryPutVar = function (util, value, avar) {
export function _tryPutVar(util, value, avar) {
return function () {
if (avar.value === AVar.EMPTY && avar.error === null) {
avar.value = value;
Expand All @@ -270,9 +268,9 @@ exports._tryPutVar = function (util, value, avar) {
return false;
}
};
};
}

exports._tryTakeVar = function (util, avar) {
export function _tryTakeVar(util, avar) {
return function () {
var value = avar.value;
if (value === AVar.EMPTY) {
Expand All @@ -283,19 +281,19 @@ exports._tryTakeVar = function (util, avar) {
return util.just(value);
}
};
};
}

exports._tryReadVar = function (util, avar) {
export function _tryReadVar(util, avar) {
return function () {
if (avar.value === AVar.EMPTY) {
return util.nothing;
} else {
return util.just(avar.value);
}
};
};
}

exports._status = function (util, avar) {
export function _status(util, avar) {
return function () {
if (avar.error) {
return util.killed(avar.error);
Expand All @@ -305,5 +303,5 @@ exports._status = function (util, avar) {
}
return util.filled(avar.value);
};
};
}