Changeset 15396 for src/Pugs/Prim.hs

Timestamp:

03/01/07 16:45:02 (21 months ago)

Author:

audreyt

Message:

* Pugs.AST.Internals - Remove circularity to Pugs.Meta

by moving toVV into Pugs.Prim. This means Pugs.Meta.*
edits won't trigger lengthy recompilation again.

Files:

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

src/Pugs/Prim.hs

@@ -35 +35 @@
 import Pugs.Embed
 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
@@ -686 +688 @@
     str     <- fromVal =<< fetch "is"
     return str
-op1 "vv" = toVV'
+op1 "vv" = \v -> case v of
+    VV{}        -> return v
+    VUndef      -> return . VV . Val.val $ ()
+    VBool x     -> return . VV . Val.val $ ((cast x) :: Val.PureBit)
+    VInt x      -> return . VV . Val.val $ ((cast x) :: Val.PureInt)
+    VNum x      -> return . VV . Val.val $ ((cast x) :: Val.PureNum)
+    VRat x      -> return . VV . Val.val $ ((cast x) :: Val.PureNum)
+    VStr x      -> return . VV . Val.val $ ((cast x) :: Val.PureStr)
+    _           -> fail $ "don't know how to toVV: " ++ show v
+
 op1 other   = \_ -> fail ("Unimplemented unaryOp: " ++ other)