Changeset 8800

Timestamp:

01/27/06 13:35:58 (3 years ago)

Author:

audreyt

Message:

* nnunley caught that 0**NaN should be NaN, not 0.

Files:

• src/Pugs/Prim/Numeric.hs (modified) (2 diffs)
• t/builtins/math/NaN.t (modified) (2 diffs)

src/Pugs/Prim/Numeric.hs

@@ -56 +56 @@
 op2Exp x y = do
     num1 <- fromVal =<< fromVal' x
+    if isNaN num1 then return (VNum (0/0)) else do
     if num1 == (1 :: VNum) then return (VInt 1) else do
     num2 <- fromVal =<< fromVal' y
+    if isNaN num2 then return (VNum (0/0)) else do
     if num2 == (0 :: VNum) then return (VInt 1) else do
     case reverse $ show (num2 :: VNum) of
@@ -66 +68 @@
                 else op2Num ((**) :: VNum -> VNum -> VNum) x y
         _ -> op2Num ((**) :: VNum -> VNum -> VNum) x y
+    where
+    _NaN = 0/0
 
 op2Divide :: Val -> Val -> Eval Val

t/builtins/math/NaN.t

@@ -4 +4 @@
 use Test;
 
-plan 5;
+plan 6;
 
 # Undeterminate Math results
@@ -13 +13 @@
 is Inf / Inf, NaN, "Inf / Inf";
 is Inf - Inf, NaN, "Inf - Inf";
+is NaN ** 0,  NaN, "NaN ** 0";
 
 # XXX - the semantics below are unspecified.