Changeset 5387

Timestamp:

07/11/05 04:12:53 (3 years ago)

Author:

putter

svk:copy_cache_prev:

7349

Message:

Finished haskell versions of floor,ceiling,round,truncate. mugwump++. Given the new r5385 Prelude.pm versions, I dropped them in Pugs::Internals. These two need to be syncronized with Emit/PIR.hs.

Location:

src/Pugs

Files:

• Prim.hs (modified) (3 diffs)
• Prim/Numeric.hs (modified) (2 diffs)

src/Pugs/Prim.hs

@@ -138 +138 @@
 op1 "+"    = op1Numeric id
 op1 "abs"  = op1Numeric abs
--- op1 "floor" = op1Cast $ op1Roundy floor
--- op1 "truncate" = op1Cast $ op1Roundy truncate
--- op1 "ceiling" = op1Cast $ op1Roundy ceiling
--- op1 "round" =  op1Cast $ op1Roundy round
+op1 "Pugs::Internals::truncate" = op1Round truncate
+op1 "Pugs::Internals::round"    = op1Round round
+op1 "Pugs::Internals::floor"    = op1Round floor
+op1 "Pugs::Internals::ceiling"  = op1Round ceiling
 op1 "cos"  = op1Floating cos
 op1 "sin"  = op1Floating sin
@@ -583 +583 @@
     fmap castV (liftIO $ fun val)
 
-{-
-op1Roundy func x
-    | VInt x' <- x
-    = return x'
-    | VRat x' <- x
-    = return . VInt $ func x'
-    | otherwise = 0
--}
-
 returnList :: [Val] -> Eval Val
 returnList vals = ifListContext
@@ -1357 +1348 @@
 \\n   Num       spre    +       safe   (Num)\
 \\n   Num       pre     abs     safe   (?Num=$_)\
-\\n   Int       pre     truncate safe   (?Num=$_)\
-\\n   Int       pre     round   safe   (?Num=$_)\
-\\n   Int       pre     floor   safe   (?Num=$_)\
-\\n   Int       pre     ceiling safe   (?Num=$_)\
+\\n   Int       pre     Pugs::Internals::truncate safe   (?Num=$_)\
+\\n   Int       pre     Pugs::Internals::round    safe   (?Num=$_)\
+\\n   Int       pre     Pugs::Internals::floor    safe   (?Num=$_)\
+\\n   Int       pre     Pugs::Internals::ceiling  safe   (?Num=$_)\
 \\n   Num       pre     atan    safe   (Num)\
 \\n   Num       pre     atan    safe   (Num, Num)\

src/Pugs/Prim/Numeric.hs

@@ -3 +3 @@
 
 module Pugs.Prim.Numeric (
-    op2Numeric, op1Floating, op1Numeric,
+    op2Numeric, op1Floating, op1Round, op1Numeric,
     op2Exp, op2Divide, op2Modulus,
 ) where
@@ -36 +36 @@
     foo <- fromVal v
     return $ VNum $ f foo
+
+op1Round :: (Double -> Integer) -> Val -> Eval Val
+op1Round f v = do
+    return $ VInt $ case v of
+       VInt i -> i
+       VRat r -> f ((fromRational r)::Double)
+       VNum n -> f n
+       _      -> 0
 
 op1Numeric :: (forall a. (Num a) => a -> a) -> Val -> Eval Val