Changeset 12522 for src/Pugs/Prim/Numeric.hs

Timestamp:

08/20/06 17:05:14 (2 years ago)

Author:

audreyt

Message:

* op2Numeric: slightly clean up syntax; no functional changes.

Files:

• src/Pugs/Prim/Numeric.hs (modified) (1 diff)

src/Pugs/Prim/Numeric.hs

@@ -14 +14 @@
 op2Numeric :: (forall a. (Num a) => a -> a -> a) -> Val -> Val -> Eval Val
 op2Numeric f x y
+    | VInt x' <- x, VInt y' <- y  = return $ VInt $ f x' y'
+    | VRat x' <- x, VRat y' <- y  = return $ VRat $ f x' y'
+    | VRat x' <- x, VInt y' <- y  = return $ VRat $ f x' (y' % 1)
+    | VInt x' <- x, VRat y' <- y  = return $ VRat $ f (x' % 1) y'
     | VUndef <- x = op2Numeric f (VInt 0) y
     | VUndef <- y = op2Numeric f x (VInt 0)
     | VType{} <- x = op2Numeric f (VInt 0) y
     | VType{} <- y = op2Numeric f x (VInt 0)
-    | (VInt x', VInt y') <- (x, y)  = return $ VInt $ f x' y'
-    | (VRat x', VInt y') <- (x, y)  = return $ VRat $ f x' (y' % 1)
-    | (VInt x', VRat y') <- (x, y)  = return $ VRat $ f (x' % 1) y'
-    | (VRat x', VRat y') <- (x, y)  = return $ VRat $ f x' y'
     | VRef r <- x = do
         x' <- readRef r