Changeset 5466 for src/Pugs/Prim/Eval.hs

Timestamp:

07/12/05 08:42:04 (3 years ago)

Author:

gaal

svk:copy_cache_prev:

7349

Message:

* require Bar; require Bar only loads Bar once

Files:

• src/Pugs/Prim/Eval.hs (modified) (2 diffs)

src/Pugs/Prim/Eval.hs

@@ -16 +16 @@
 import Pugs.Config
 import Pugs.Run.Args
+import Pugs.Prim.Keyed
 
 data EvalError = EvalErrorFatal
@@ -33 +34 @@
     file        <- fromVal v
     incs        <- fromVal =<< readVar "@*INC"
-    pathName    <- requireInc incs file (errMsg file incs)
-    -- %*INC{file} = pathname
-    evalExp $ Syn "="
-        [ Syn "{}"
-            [ Var "%*INC", Val . VStr $ decodeUTF8 file ]
-            , Val . VStr $ decodeUTF8 pathName
-        ]
-    str         <- liftIO $ readFile pathName
-    opEval style pathName (decodeUTF8 str)
+    glob        <- askGlobal
+    seen        <- findSymRef "%*INC" glob
+    loaded      <- existsFromRef seen v
+    if (loaded) then (return $ VInt 1) else do -- XXX: SPECME: what do we return here?
+        pathName <- requireInc incs file (errMsg file incs)
+        -- %*INC{file} = pathname
+        evalExp $ Syn "="
+            [ Syn "{}"
+                [ Var "%*INC", Val . VStr $ decodeUTF8 file ]
+                , Val . VStr $ decodeUTF8 pathName
+            ]
+        str         <- liftIO $ readFile pathName
+        opEval style pathName (decodeUTF8 str)
     where
     style = MkEvalStyle