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

src/Pugs/Eval/Var.hs

@@ -38 +38 @@
         case maybeCaller of
             Just env -> local (const env) $ do
-                findVarRef (sig ++ name')
+                rv <- findVarRef (sig ++ name')
+                return rv
             Nothing -> retError "cannot access CALLER:: in top level" name
     | Just (package, name') <- breakOnGlue "::" name
@@ -47 +48 @@
                 findVarRef (sig ++ name')
             Nothing -> retError "cannot access OUTER:: in top level" name
+    | (sig:'+':name') <- name = findVarRef (sig:("CALLER::"++name'))
     | (_:'?':_) <- name = do
         rv  <- getMagical name
@@ -489 +491 @@
 
 isQualified :: String -> Maybe (String, String)
-isQualified name | Just (post, pre) <- breakOnGlue "::" (reverse name) =
+isQualified name
+    | Just (post, pre) <- breakOnGlue "::" (reverse name) =
     let (sigil, pkg) = span (not . isAlphaNum) preName
         name'       = possiblyFixOperatorName (sigil ++ postName)
         preName     = reverse pre
         postName    = reverse post
-    in Just (pkg, name')
+    in case takeWhile isAlphaNum pkg of
+        "OUTER"     -> Nothing
+        "CALLER"    -> Nothing
+        _           -> Just (pkg, name')
 isQualified _ = Nothing
 
@@ -500 +506 @@
 toQualified name@(_:'*':_) = return name
 toQualified name@(_:'?':_) = return name
+toQualified name@(_:'+':_) = return name
 toQualified name@(_:"!") = return name
 toQualified name@(_:"/") = return name