From 9b3179ad07428d189e42a7a205aab9c7c4849d4a Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 29 Jun 2023 16:21:57 +0200 Subject: [PATCH] build: upgrade to PureScript 0.15 --- packages.dhall | 4 +- spago.dhall | 1 + src/Data/BigNumber.js | 157 +++++++++++++++++++--------------------- src/Data/BigNumber.purs | 3 +- 4 files changed, 79 insertions(+), 86 deletions(-) diff --git a/packages.dhall b/packages.dhall index f921381..e51557d 100644 --- a/packages.dhall +++ b/packages.dhall @@ -1,5 +1,5 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.5-20220224/packages.dhall - sha256:67cc3d4f0e8fb72bb1413ba94ddd72a3ceb0783eb725e3b22ad7568b3b581163 + https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20230105/packages.dhall + sha256:3e9fbc9ba03e9a1fcfd895f65e2d50ee2f5e86c4cd273f3d5c841b655a0e1bda in upstream diff --git a/spago.dhall b/spago.dhall index 3634b27..7f3c738 100644 --- a/spago.dhall +++ b/spago.dhall @@ -9,6 +9,7 @@ , "partial" , "prelude" , "tuples" + , "uint" ] , packages = ./packages.dhall , sources = [ "src/**/*.purs", "test/**/*.purs" ] diff --git a/src/Data/BigNumber.js b/src/Data/BigNumber.js index 403e5bb..36c6e25 100644 --- a/src/Data/BigNumber.js +++ b/src/Data/BigNumber.js @@ -1,8 +1,6 @@ -"use strict"; +import BigNumber from 'bignumber.js'; -var BigNumber = require('bignumber.js'); - -exports.parseBigNumberImpl = function parseBigNumberImpl (Left,Right,s) { +export function parseBigNumberImpl(Left, Right, s) { var x; try { x = new BigNumber(s); @@ -10,25 +8,21 @@ exports.parseBigNumberImpl = function parseBigNumberImpl (Left,Right,s) { return Left(e); } return Right(x); -}; - +} -exports.isBigNumber = function isBigNumber (x) { +export function isBigNumber(x) { return BigNumber.isBigNumber(x); -}; - +} -exports.randomBigNumber = function randomBigNumber () { +export function randomBigNumber() { return BigNumber.random(); -}; +} - -exports.absImpl = function absImpl (x) { +export function absImpl(x) { return x.abs(); -}; - +} -exports.compareBigNumberImpl = function compareBigNumberImpl (LT,EQ,GT,x,y) { +export function compareBigNumberImpl(LT, EQ, GT, x, y) { var r = x.comparedTo(y); if (r === -1) { return LT; @@ -37,137 +31,136 @@ exports.compareBigNumberImpl = function compareBigNumberImpl (LT,EQ,GT,x,y) { } else if (r === 1) { return GT; } -}; - +} -exports.decimalPlacesImpl = function decimalPlacesImpl (x,y) { +export function decimalPlacesImpl(x, y) { return x.decimalPlaces(y); -}; +} -exports.divBigNumberImpl = function divBigNumberImpl (x,y) { +export function divBigNumberImpl(x, y) { return x.div(y); -}; +} -exports.idivBigNumberImpl = function idivBigNumberImpl (x,y) { +export function idivBigNumberImpl(x, y) { return x.idiv(y); -}; +} -exports.powBigNumberImpl = function powBigNumberImpl (x,y) { +export function powBigNumberImpl(x, y) { return x.pow(y); -}; +} -exports.intValue = function intValue (x) { +export function intValue(x) { return x.integerValue(); -}; +} -exports.eqBigNumberImpl = function eqBigNumberImpl (x,y) { +export function eqBigNumberImpl(x, y) { return x.eq(y); -}; +} -exports.isFinite = function isFinite (x) { +export function isFinite(x) { return x.isFinite(); -}; +} -exports.gtBigNumberImpl = function gtBigNumberImpl (x,y) { +export function gtBigNumberImpl(x, y) { return x.gt(y); -}; +} -exports.gteBigNumberImpl = function gteBigNumberImpl (x,y) { +export function gteBigNumberImpl(x, y) { return x.gte(y); -}; +} -exports.isInteger = function isInteger (x) { +export function isInteger(x) { return x.isInteger(); -}; +} -exports.ltBigNumberImpl = function ltBigNumberImpl (x,y) { +export function ltBigNumberImpl(x, y) { return x.lt(y); -}; +} -exports.lteBigNumberImpl = function lteBigNumberImpl (x,y) { +export function lteBigNumberImpl(x, y) { return x.lte(y); -}; +} -exports.isNaN = function isNaN (x) { +export function isNaN(x) { return x.isNaN(); -}; +} -exports.isNegative = function isNegative (x) { +export function isNegative(x) { return x.isNegative(); -}; +} -exports.isPositive = function isPositive (x) { +export function isPositive(x) { return x.isPositive(); -}; +} -exports.isZero = function isZero (x) { +export function isZero(x) { return x.isZero(); -}; +} -exports.minusBigNumberImpl = function minusBigNumberImpl (x,y) { +export function minusBigNumberImpl(x, y) { return x.minus(y); -}; +} -exports.moduloBigNumberImpl = function moduloBigNumberImpl (x,y) { +export function moduloBigNumberImpl(x, y) { return x.modulo(y); -}; +} -exports.timesBigNumberImpl = function timesBigNumberImpl (x,y) { +export function timesBigNumberImpl(x, y) { return x.times(y); -}; +} -exports.negateImpl = function negateImpl (x) { +export function negateImpl(x) { return x.negated(); -}; +} -exports.plusBigNumberImpl = function plusBigNumberImpl (x,y) { +export function plusBigNumberImpl(x, y) { return x.plus(y); -}; +} -exports.precisionImpl = function precisionImpl (x,y) { +export function precisionImpl(x, y) { return x.precision(y); -}; +} -exports.shiftedByImpl = function shiftedByImpl (x,y) { +export function shiftedByImpl(x, y) { return x.shiftedBy(y); -}; +} -exports.toNumber = function toNumber (x) { +export function toNumber(x) { return x.toNumber(); -}; +} -exports.toString = function toString (x) { +export function toString(x) { return x.toString(); -}; +} -exports.toExponential = function toExponential (x) { +export function toExponential(x) { return x.toExponential(); -}; +} -exports.toFixed = function toFixed (x) { +export function toFixed(x) { return x.toFixed(); -}; +} -exports.toFormat = function toFormat (x) { +export function toFormat(x) { return x.toFormat(); -}; +} -exports.toFractionImpl = function (tuple) { +export function toFractionImpl(tuple) { return function toFractionImpl (x, maximum_denominator) { var fraction = x.toFraction(maximum_denominator); return tuple(fraction[0])(fraction[1]); }; -}; +} -exports.valueOf = function valueOf (x) { +export function valueOf(x) { return x.valueOf(); -}; +} -exports.sqrt = function sqrt (x) { +export function sqrt(x) { return x.sqrt(); -}; +} -exports.fromNumber = function fromNumber(x) { +export function fromNumber(x) { return new BigNumber(x); -}; +} diff --git a/src/Data/BigNumber.purs b/src/Data/BigNumber.purs index bc7ba7b..42337bc 100644 --- a/src/Data/BigNumber.purs +++ b/src/Data/BigNumber.purs @@ -10,8 +10,7 @@ module Data.BigNumber import Prelude import Data.Int as Int import Data.UInt as UInt -import Data.UInt -import Data.Number +import Data.UInt (UInt) import Data.Either (Either (..)) import Data.Tuple (Tuple (..)) import Data.Function.Uncurried (Fn3, runFn3, Fn2, runFn2, Fn5, runFn5)