PureScript: fix MalTime mathematical operations

asarhaddon · Dec 17, 2021 · 4a3f6a1 · 4a3f6a1
1 parent 6ebb4d8
commit 4a3f6a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/impls/purs/src/Core.purs b/impls/purs/src/Core.purs
@@ -3,7 +3,7 @@ module Core (ns) where
 import Prelude
 
 import Data.DateTime.Instant (unInstant)
-import Data.Int (ceil)
+import Data.Int (ceil, toNumber)
 import Data.List (List(..), concat, drop, foldM, fromFoldable, length, reverse, (:))
 import Data.Map.Internal as Map
 import Data.Maybe (Maybe(..))
@@ -135,10 +135,12 @@ falseQ _                  = false
 
 -- Numeric functions
 
-numOp ∷  (Int → Int → Int) → MalFn
-numOp op ((MalInt n1) : (MalInt n2) : Nil) = pure $ MalInt $ op n1 n2
-numOp op (MalTime n1 : MalTime n2 : Nil)   = pure $ MalInt $ op (ceil n1) (ceil n2)
-numOp _ _                                  = throw "invalid operator"
+numOp ∷  (Number → Number → Number) → MalFn
+numOp op (MalInt n1 : MalInt n2 : Nil)   = pure $ MalInt $ ceil $ op (toNumber n1) (toNumber n2)
+numOp op (MalInt n1 : MalTime n2 : Nil)  = pure $ MalInt $ ceil $ op (toNumber n1) n2
+numOp op (MalTime n1 : MalInt n2 : Nil)  = pure $ MalInt $ ceil $ op n1 (toNumber n2)
+numOp op (MalTime n1 : MalTime n2 : Nil) = pure $ MalTime $ op n1 n2
+numOp _ _                                = throw "invalid operator"
 
 
 cmpOp ∷  (Int → Int → Boolean) → List MalExpr → Effect MalExpr
@@ -148,8 +150,9 @@ cmpOp _ _                                = throw "invalid operator"
 
 
 numberQ :: MalExpr -> Boolean
-numberQ (MalInt _) = true
-numberQ _          = false
+numberQ (MalInt _)  = true
+numberQ (MalTime _) = true
+numberQ _           = false
 
 
 

diff --git a/impls/purs/src/Types.purs b/impls/purs/src/Types.purs
@@ -44,6 +44,7 @@ instance Eq MalExpr where
   eq MalNil MalNil                     = true
   eq (MalBoolean a) (MalBoolean b)     = a == b
   eq (MalInt a) (MalInt b)             = a == b
+  eq (MalTime a) (MalTime b)           = a == b
   eq (MalString a) (MalString b)       = a == b
   eq (MalKeyword a) (MalKeyword b)     = a == b
   eq (MalSymbol a) (MalSymbol b)       = a == b