Keep using -precise instead of -decimals

Author: paulyoung

bower.json

@@ -24,12 +24,12 @@
   "dependencies": {
     "purescript-const": "^4.0.0",
     "purescript-datetime": "^4.0.0",
-    "purescript-decimals": "^4.0.0",
     "purescript-functors": "^3.0.0",
     "purescript-lists": "^5.0.0",
     "purescript-ordered-collections": "^1.0.0",
     "purescript-parsing": "^5.0.1",
     "purescript-partial": "^2.0.0",
+    "purescript-precise": "purescript-contrib/purescript-precise#45ed556854d314b41097837bdbced744bc11818b",
     "purescript-prelude": "^4.0.1",
     "purescript-strings": "^4.0.0",
     "purescript-strongcheck": "^4.1.1",

package.json

@@ -5,9 +5,6 @@
     "build": "pulp build -- --censor-lib --strict",
     "test": "pulp test"
   },
-  "dependencies": {
-    "decimal.js": "7.1.1"
-  },
   "devDependencies": {
     "pulp": "^12.3.0",
     "purescript": "^0.12.0",

src/Text/Markdown/SlamDown/Parser/Inline.purs

@@ -15,11 +15,11 @@ import Data.Bifunctor (lmap)
 import Data.Char.Unicode (isAlphaNum)
 import Data.Const (Const(..))
 import Data.DateTime as DT
-import Data.Decimal as D
 import Data.Either (Either(..))
 import Data.Enum (toEnum)
 import Data.Foldable (elem)
 import Data.Functor.Compose (Compose(..))
+import Data.HugeNum as HN
 import Data.Int as Int
 import Data.List as L
 import Data.Maybe as M
@@ -94,7 +94,7 @@ hash = void $ PS.string "#"
 type TextParserKit
   = { plainText ∷ P.Parser String String
     , natural ∷ P.Parser String Int
-    , decimal ∷ P.Parser String D.Decimal
+    , decimal ∷ P.Parser String HN.HugeNum
     , numericPrefix ∷ P.Parser String Unit
     }
 
@@ -486,7 +486,7 @@ parseTextBox isPlainText eta template =
           M.Nothing →
             pure M.Nothing
 
-      D.fromString (ms <> "." <> M.fromMaybe "" ns)
+      HN.fromString (ms <> "." <> M.fromMaybe "" ns)
         # M.maybe (P.fail "Failed parsing decimal") pure
 
     parsePlainTextValue =

src/Text/Markdown/SlamDown/Pretty.purs

@@ -7,9 +7,9 @@ import Prelude
 
 import Data.Array as A
 import Data.DateTime as DT
-import Data.Decimal as D
 import Data.Foldable (fold, elem)
 import Data.Functor.Compose (Compose)
+import Data.HugeNum as HN
 import Data.Identity (Identity(..))
 import Data.List as L
 import Data.Maybe as M
@@ -117,8 +117,8 @@ prettyPrintTextBoxValue t =
   case t of
     SD.PlainText (Identity def) → def
     SD.Numeric (Identity def) →
-      let s = D.toString def in
-      M.fromMaybe s $ S.stripSuffix (S.Pattern ".") $ D.toString def
+      let s = HN.toString def in
+      M.fromMaybe s $ S.stripSuffix (S.Pattern ".") $ HN.toString def
     SD.Date (Identity def) → prettyPrintDate def
     SD.Time prec (Identity def) → prettyPrintTime prec def
     SD.DateTime prec (Identity def) → prettyPrintDateTime prec def
@@ -175,7 +175,7 @@ prettyPrintTextBox t =
     prettyPrintDefault =
       case _ of
         SD.PlainText def → prettyPrintExpr identity identity def
-        SD.Numeric def → prettyPrintExpr identity D.toString def
+        SD.Numeric def → prettyPrintExpr identity HN.toString def
         SD.Date def → prettyPrintExpr identity prettyPrintDate def
         SD.Time prec def → prettyPrintExpr identity (prettyPrintTime prec) def
         SD.DateTime prec def → prettyPrintExpr identity (prettyPrintDateTime prec) def

src/Text/Markdown/SlamDown/Syntax/TextBox.purs

@@ -8,8 +8,8 @@ module Text.Markdown.SlamDown.Syntax.TextBox
 import Prelude
 
 import Data.DateTime as DT
-import Data.Decimal as D
 import Data.Eq (class Eq1)
+import Data.HugeNum as HN
 import Data.Identity (Identity(..))
 import Data.Newtype (unwrap)
 import Data.Ord (class Ord1)
@@ -41,7 +41,7 @@ instance coarbitraryTimePrecision ∷ SCA.Coarbitrary TimePrecision where
 
 data TextBox f
   = PlainText (f String)
-  | Numeric (f D.Decimal)
+  | Numeric (f HN.HugeNum)
   | Date (f DT.Date)
   | Time TimePrecision (f DT.Time)
   | DateTime TimePrecision (f DT.DateTime)
@@ -62,23 +62,23 @@ traverseTextBox eta = case _ of
   Time prec def → Time prec <$> eta def
   DateTime prec def → DateTime prec <$> eta def
 
-instance showTextBox ∷ (Functor f, Show (f String), Show (f D.Decimal), Show (f DT.Time), Show (f DT.Date), Show (f DT.DateTime)) ⇒ Show (TextBox f) where
+instance showTextBox ∷ (Functor f, Show (f String), Show (f HN.HugeNum), Show (f DT.Time), Show (f DT.Date), Show (f DT.DateTime)) ⇒ Show (TextBox f) where
   show = case _ of
     PlainText def → "(PlainText " <> show def <> ")"
     Numeric def → "(Numeric " <> show def <> ")"
     Date def → "(Date " <> show def <> ")"
     Time prec def → "(Time " <> show prec <> " " <> show def <> ")"
     DateTime prec def → "(DateTime " <> show prec <> " " <> show def <> ")"
 
-derive instance eqTextBox ∷ (Functor f, Eq (f String), Eq (f D.Decimal), Eq (f DT.Time), Eq (f DT.Date), Eq (f DT.DateTime), Eq1 f) ⇒ Eq (TextBox f)
-derive instance ordTextBox ∷ (Functor f, Ord (f String), Ord (f D.Decimal), Ord (f DT.Time), Ord (f DT.Date), Ord (f DT.DateTime), Ord1 f) ⇒ Ord (TextBox f)
+derive instance eqTextBox ∷ (Functor f, Eq (f String), Eq (f HN.HugeNum), Eq (f DT.Time), Eq (f DT.Date), Eq (f DT.DateTime), Eq1 f) ⇒ Eq (TextBox f)
+derive instance ordTextBox ∷ (Functor f, Ord (f String), Ord (f HN.HugeNum), Ord (f DT.Time), Ord (f DT.Date), Ord (f DT.DateTime), Ord1 f) ⇒ Ord (TextBox f)
 
 instance arbitraryTextBox ∷ (Functor f, SCA.Arbitrary (f String), SCA.Arbitrary (f Number), SCA.Arbitrary (f ADT.ArbTime), SCA.Arbitrary (f ADT.ArbDate), SCA.Arbitrary (f ADT.ArbDateTime)) ⇒ SCA.Arbitrary (TextBox f) where
   arbitrary = do
     i ← Gen.chooseInt 0 5
     case i of
       0 → PlainText <$> SCA.arbitrary
-      1 → Numeric <<< map D.fromNumber <$> SCA.arbitrary
+      1 → Numeric <<< map HN.fromNumber <$> SCA.arbitrary
       2 → Date <<< map ADT.runArbDate <$> SCA.arbitrary
       3 → Time <$> SCA.arbitrary <*> (map (eraseMillis <<< ADT.runArbTime) <$> SCA.arbitrary)
       4 → DateTime <$> SCA.arbitrary <*> (map (DT.modifyTime eraseMillis <<< ADT.runArbDateTime) <$> SCA.arbitrary)
@@ -88,7 +88,7 @@ instance coarbitraryTextBox ∷ (Functor f, SCA.Coarbitrary (f String), SCA.Coar
   coarbitrary =
     case _ of
       PlainText d -> SCA.coarbitrary d
-      Numeric d -> SCA.coarbitrary $ D.toNumber <$> d
+      Numeric d -> SCA.coarbitrary $ HN.toNumber <$> d
       Date d -> SCA.coarbitrary (ADT.ArbDate <$> d)
       Time prec d -> do
         _ ← SCA.coarbitrary prec

test/src/Test/Main.purs

@@ -7,9 +7,9 @@ import Control.Monad.Trampoline as Trampoline
 import Data.Array as A
 import Data.Char as CH
 import Data.DateTime as DT
-import Data.Decimal as D
 import Data.Either (Either(..), isLeft)
 import Data.Enum (toEnum)
+import Data.HugeNum as HN
 import Data.Identity as ID
 import Data.List as L
 import Data.Maybe as M
@@ -234,7 +234,7 @@ static = do
             , textBox: \_ t →
                 case t of
                   SD.PlainText _ → pure $ SD.PlainText $ pure "Evaluated plain text!"
-                  SD.Numeric _ → pure $ SD.Numeric $ pure $ D.fromNumber 42.0
+                  SD.Numeric _ → pure $ SD.Numeric $ pure $ HN.fromNumber 42.0
                   SD.Date _ → pure $ SD.Date $ pure $ unsafeDate 1992 7 30
                   SD.Time (prec@SD.Minutes) _ → pure $ SD.Time prec $ pure $ unsafeTime 4 52 0
                   SD.Time (prec@SD.Seconds) _ → pure $ SD.Time prec $ pure $ unsafeTime 4 52 10