Changeset 5498

Timestamp:

07/12/05 15:50:08 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

7501

Message:

* export.t -- putting out the fire (I think)

Location:

src/Pugs

Files:

• Eval.hs (modified) (1 diff)
• Monads.hs (modified) (1 diff)

src/Pugs/Eval.hs

@@ -660 +660 @@
     when (str `elem` words "MY OUR OUTER CALLER") $ do
         fail $ "Cannot use " ++ str ++ " as a namespace"
-    writeVar "$*PACKAGE" val
-    enterPackage str $ evalExp body
+    tempVar "$*PACKAGE" val $ do
+        enterPackage str $ evalExp body
 
 reduceSyn "inline" [langExp, _] = do

src/Pugs/Monads.hs

@@ -275 +275 @@
 headVal (v:_) = return v
 
+tempVar :: String -> Val -> Eval a -> Eval a
+tempVar var val action = do
+    old <- readVar var
+    writeVar var val
+    rv  <- action
+    writeVar var old
+    return rv
+