Changeset 15434 for src/Pugs/Prim.hs

Timestamp:

03/04/07 14:28:40 (21 months ago)

Author:

audreyt

Message:

* Pugs.AST: Make oldVal boxable.
* Pugs.Prim: Move op1 "vv"'s implementation to the Value instance in Pugs.AST.

Files:

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

src/Pugs/Prim.hs

@@ -36 +36 @@
 import Pugs.Eval.Var
 import Pugs.Meta ()
-import qualified Pugs.Val as Val
 import qualified Data.Map as Map
 import qualified Data.Set as Set
@@ -688 +687 @@
     str     <- fromVal =<< fetch "is"
     return str
-op1 "vv" = \v -> case v of
-    VV{}        -> return v
-    VUndef      -> return . VV . mkVal $ ()
-    VBool x     -> return . VV . mkVal $ ((cast x) :: Val.PureBit)
-    VInt x      -> return . VV . mkVal $ ((cast x) :: Val.PureInt)
-    VNum x      -> return . VV . mkVal $ ((cast x) :: Val.PureNum)
-    VRat x      -> return . VV . mkVal $ ((cast x) :: Val.PureNum)
-    VStr x      -> return . VV . mkVal $ ((cast x) :: Val.PureStr)
-    _           -> fail $ "don't know how to toVV: " ++ show v
+op1 "vv" = op1Cast VV
 
 op1 other   = \_ -> fail ("Unimplemented unaryOp: " ++ other)