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

Timestamp:

12/13/05 20:35:53 (3 years ago)

Author:

gaal

Message:

* Make %*INC more useful. Keys are now Perlish names, not relative paths

to filesystem resources. Values are (for now) a simple hash with
reasonable memebers (the relative and absolute paths); this will
eventually evolve to a Module description object of some sort. This
change needs to be specced.

Files:

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

src/Pugs/Prim/Eval.hs

@@ -30 +30 @@
 opRequire :: Bool -> Val -> Eval Val
 opRequire dumpEnv v = do
-    file        <- fromVal v
+    mod         <- fromVal v
     incs        <- fromVal =<< readVar "@*INC"
     glob        <- askGlobal
     seen        <- findSymRef "%*INC" glob
     loaded      <- existsFromRef seen v
+    let file    = (concat $ intersperse "/" $ split "::" mod) ++ ".pm"
     pathName    <- requireInc incs file (errMsg file incs)
     if loaded then opEval style pathName "" else do
-        -- %*INC{file} = pathname
+        -- %*INC{mod} = { relname => file, pathname => pathName }
         evalExp $ Syn "="
-            [ Syn "{}"
-                [ Var "%*INC", Val . VStr $ decodeUTF8 file ]
-                , Val . VStr $ decodeUTF8 pathName
+            [ Syn "{}"             -- subscript
+                [ Var "%*INC", Val . VStr $ decodeUTF8 mod ]
+                , Syn "\\{}"       -- hashref
+                    [ Syn "," [ mkStrPair "pathname" (decodeUTF8 pathName)
+                              , mkStrPair "relname"  (decodeUTF8 file) ]
+                    ]
             ]
         str         <- liftIO $ readFile pathName
@@ -51 +55 @@
                                            else EvalResultLastValue)}
     errMsg file incs = "Can't locate " ++ file ++ " in @*INC (@*INC contains: " ++ unwords incs ++ ")."
+    mkStrPair :: String -> String -> Exp
+    mkStrPair key val = App (Var "&infix:=>") Nothing (map (Val . VStr) [key, val])
 
 requireInc :: (MonadIO m) => [FilePath] -> FilePath -> String -> m String