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

src/Pugs/Eval.hs

@@ -64 +64 @@
         { envContext = CxtVoid
         , envLexical = mkPad []
+        , envImplicit= Map.empty
         , envLValue  = False
         , envGlobal  = glob
@@ -309 +310 @@
 
 reducePad :: Scope -> Pad -> Exp -> Eval Val
+reducePad SEnv lex@(MkPad lex') exp = do
+    local (\e -> e{ envImplicit = Map.map (const ()) lex' `Map.union` envImplicit e }) $
+        reducePad SMy lex exp
 reducePad SMy lex exp = do
     -- heuristics: if we are repeating ourselves, generate a new TVar.
@@ -987 +991 @@
         }
     fixEnv :: Env -> Env
-    fixEnv env
-        | typ >= SubBlock = env
-        | otherwise       = env
-            { envCaller = Just env
-            , envDepth = envDepth env + 1 }
+    fixEnv | typ >= SubBlock = id
+           | otherwise       = envEnterCaller
     doBind :: [PadMutator] -> [(Param, Exp)] -> Eval ([PadMutator], [ApplyArg])
     doBind syms [] = return (syms, [])