Changeset 14275 for src/Pugs/Eval.hs

Timestamp:

10/12/06 02:11:27 (2 years ago)

Author:

audreyt

Message:

* Make the Pugs shell use the shiny new ControlContinuation?.

Files:

• src/Pugs/Eval.hs (modified) (3 diffs)

src/Pugs/Eval.hs

@@ -148 +148 @@
             trapVal val (return val)
         Nothing -> do
-            val <- local (\e -> e{ envBody = exp }) (reduce exp)
+            val <- reduce exp
             trapVal val (return val)
 
@@ -309 +309 @@
             _  -> enterContext cxtVoid
     val <- withCxt (reduce this)
-    let writeEnv = do
+    trapVal val $ case rest of
+        Syn "continuation" []   -> callCC $ \cc -> do
             env <- ask
-            writeVar (cast "$*_") val
-            return . VControl $ ControlEnv env
-    trapVal val $ case rest of
-        Ann _ (Syn "env" [])    -> writeEnv
-        Syn "env" []            -> writeEnv
+            return . VControl $ ControlContinuation env val cc
         _                       -> reduce rest
 
@@ -404 +401 @@
     retItem $ castV (key, val)
 
-reduceSyn "env" [] = do
+reduceSyn "continuation" [] = callCC $ \cc -> do
     env <- ask
-    -- writeVar "$*_" val
-    return . VControl $ ControlEnv env
+    return . VControl $ ControlContinuation env undef cc
 
 reduceSyn "block" [exp]