Changeset 3443 for src/Pugs/Monads.hs

Timestamp:

05/19/05 17:57:17 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5016

Message:

* We have OUTER:: scope now.
* Closure (VCode) now captures over the entire Env, instead

of just the envLexical slot. This is currently only used to

restore the original OUTER

scope when calling a subroutine, but once we switch to oleg's CC_2CPST for Eval monad, this will get us rubyish coroutines (and serialised subcontinuations) for free.

Files:

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

src/Pugs/Monads.hs

@@ -147 +147 @@
     env <- ask
     exitRec <- genSubs env "&?BLOCK_EXIT" $ escSub esc
-    enterLex exitRec action
+    local (\e -> e{ envOuter = Just env }) $ enterLex exitRec action
     where
     escSub esc env = mkPrim
@@ -176 +176 @@
             blockRec <- genSym "&?BLOCK" (codeRef (orig sub))
             return $ \e -> e
-                { envLexical = combine [blockRec]
+                { envOuter = Just env
+                , envLexical = combine [blockRec]
                     (subPad sub `unionPads` envLexical env) }
         | otherwise = do
@@ -185 +186 @@
             callerRec <- genSubs env "&?CALLER_CONTINUATION" (ccSub cc)
             return $ \e -> e
-                { envLexical = combine (concat [subRec, callerRec]) (subPad sub) }
+                { envLexical = combine (concat [subRec, callerRec]) (subPad sub)
+                , envOuter   = maybe Nothing envOuter (subEnv sub)
+                }
     ccSub cc env = mkPrim
         { subName = "CALLER_CONTINUATION"