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

Timestamp:

02/06/07 21:41:12 (22 months ago)

Author:

audreyt

Message:

* Implement ** for imaginary numbers. The check for **0 isn't

quite right yet (makes **1i considered 0 also) -- fixes welcome!

Files:

• src/Pugs/Prim/Numeric.hs (modified) (2 diffs)

src/Pugs/Prim/Numeric.hs

@@ -37 +37 @@
         y' <- fromVal y
         return . castV $ f x' y'
+
+op2Floating :: (forall a. (Floating a) => a -> a -> a) -> Val -> Val -> Eval Val
+op2Floating f x y
+    | VUndef <- x = op2Floating f (VInt 0) y
+    | VUndef <- y = op2Floating f x (VInt 0)
+    | VType{} <- x = op2Floating f (VInt 0) y
+    | VType{} <- y = op2Floating f x (VInt 0)
+    | VRef r <- x = do
+        x' <- readRef r
+        op2Floating f x' y
+    | VRef r <- y = do
+        y' <- readRef r
+        op2Floating f x y'
+    | VComplex x' <- x = do
+        y'  <- fromVal y
+        return . VComplex $ f x' y'
+    | VComplex y' <- y = do
+        x'  <- fromVal x
+        return . VComplex $ f x' y'
+    | otherwise = do
+        x' <- fromVal x
+        y' <- fromVal y
+        return . VNum $ f x' y'
 
 op2Numeric :: (forall a. (Num a) => a -> a -> a) -> Val -> Val -> Eval Val
@@ -103 +126 @@
             if isDigit . head $ show (num1 :: VNum)
                 then op2Rat ((^^) :: VRat -> VInt -> VRat) x y
-                else op2Num (**) x y
-        _ -> op2Num (**) x y
+                else op2Floating (**) x y
+        _ -> op2Floating (**) x y
 
 op2Divide :: Val -> Val -> Eval Val