Changeset 3443 for src/Pugs/Eval.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/Eval.hs (modified) (5 diffs)

src/Pugs/Eval.hs

@@ -78 +78 @@
             , envEval    = evaluate
             , envCaller  = Nothing
+            , envOuter   = Nothing
             , envDepth   = 0
             , envID      = uniq
@@ -191 +192 @@
         maybeCaller <- asks envCaller
         case maybeCaller of
-            Just caller -> local (const caller) $ do
+            Just env -> local (const env) $ do
                 findVarRef (sig ++ name')
             Nothing -> retError "cannot access CALLER:: in top level" name
+    | Just (package, name') <- breakOnGlue "::" name
+    , Just (sig, "") <- breakOnGlue "OUTER" package = do
+        maybeOuter <- asks envOuter
+        case maybeOuter of
+            Just env -> local (const env) $ do
+                findVarRef (sig ++ name')
+            Nothing -> retError "cannot access OUTER:: in top level" name
     | ('$':'?':_) <- name = do
         rv  <- getMagical name
@@ -349 +357 @@
         let [exp] = exps
         (VCode sub) <- enterEvalContext (cxtItem "Code") exp
-        lex <- asks envLexical
-        retVal $ VCode sub{ subPad = lex }
+        env <- ask
+        retVal $ VCode sub{ subEnv = Just env }
     "if" -> doCond id 
     "unless" -> doCond not
@@ -370 +378 @@
                 genSymCC "&next" $ \symNext -> do
                     genSymPrim "&redo" (const $ runBody vs sub') $ \symRedo -> do
-                        apply sub'{ subPad = symRedo . symNext $ subPad sub' } [] $
+                        apply (updateSubPad sub' (symRedo . symNext)) [] $
                             map (Val . VRef . MkRef) these
                 runBody rest sub'
@@ -376 +384 @@
             let munge sub | subParams sub == [defaultArrayParam] =
                     munge sub{ subParams = [defaultScalarParam] }
-                munge sub = sub{ subPad = symLast $ subPad sub }
+                munge sub = updateSubPad sub symLast
             runBody elms $ munge sub
     "loop" -> do