Changeset 8705 for src/Pugs/Monads.hs

Timestamp:

01/16/06 18:57:28 (3 years ago)

Author:

audreyt

Message:

* Support for $+var as shorthand for $CALLER::var.
* CALLER now only sees lexical variables in the outer dynamic

scope declared with the "env" scope specifier.

Files:

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

src/Pugs/Monads.hs

@@ -16 +16 @@
     enterLex, enterContext, enterEvalContext, enterPackage, enterCaller,
     enterGiven, enterWhen, enterWhile, genSymPrim, genSymCC,
-    enterBlock, enterSub,
+    enterBlock, enterSub, envEnterCaller,
     evalVal, tempVar,
     
@@ -27 +27 @@
 import Pugs.Types
 import Control.Monad.RWS
+import qualified Data.Map as Map
 
 
@@ -89 +90 @@
 -}
 enterCaller :: Eval a -> Eval a
-enterCaller = local (\env -> env
+enterCaller = local envEnterCaller
+
+envEnterCaller :: Env -> Env
+envEnterCaller env = env
     { envCaller = Just env
-    , envDepth = envDepth env + 1 })
+        { envLexical = MkPad (lex `Map.intersection` envImplicit env)
+        }
+    , envDepth = envDepth env + 1
+    , envImplicit = Map.fromList [("$_", ())]
+    }
+    where
+    MkPad lex = envLexical env
 
 {-|
@@ -244 +254 @@
                 , envPackage = maybe (envPackage e) envPackage (subEnv sub)
                 , envLexical = combine [blockRec]
-                    (subPad sub `unionPads` envLexical env) }
+                    (subPad sub `unionPads` envLexical env)
+                , envImplicit= envImplicit e `Map.union` Map.fromList
+                    [ ("&?BLOCK", ()) ]
+                }
         | otherwise = do
             subRec <- sequence
@@ -255 +268 @@
                 , envPackage = maybe (envPackage e) envPackage (subEnv sub)
                 , envOuter   = maybe Nothing envOuter (subEnv sub)
+                , envImplicit= envImplicit e `Map.union` Map.fromList
+                    [ ("&?SUB", ()), ("$?SUBNAME", ()), ("&?CALLER_CONTINUATION", ()) ]
                 }
     ccSub :: (Val -> Eval Val) -> Env -> VCode