Changeset 4792 for src/Main.hs

Timestamp:

06/18/05 14:50:32 (4 years ago)

Author:

iblech

svk:copy_cache_prev:

6529

Message:

Main, Pugs.Run -- Display a "Loading Prelude... [some seconds] done." message
while loading the Prelude in interactive Pugs. Please bikeshed at will
(add/remove newlines/dots, etc.).

Files:

• src/Main.hs (modified) (6 diffs)

src/Main.hs

@@ -125 +125 @@
 repLoop = do
     initializeShell
-    env <- liftSTM . newTVar . (\e -> e{ envDebug = Nothing }) =<< tabulaRasa
+    env <- liftSTM . newTVar . (\e -> e{ envDebug = Nothing }) =<< tabulaRasa "<interactive>"
     fix $ \loop -> do
         command <- getCommand
@@ -135 +135 @@
             CmdParseRaw prog  -> doParse show   "<interactive>" prog >> loop
             CmdHelp           -> printInteractiveHelp >> loop
-            CmdReset          -> tabulaRasa >>= (liftSTM . writeTVar env) >> loop
+            CmdReset          -> tabulaRasa "<interactive>" >>= (liftSTM . writeTVar env) >> loop
 
 {-|
@@ -144 +144 @@
 ('Tabula rasa' is Latin for 'a blank slate'.)
 -}
-tabulaRasa :: IO Env
-tabulaRasa = prepareEnv "<interactive>" []
+tabulaRasa :: String -> IO Env
+tabulaRasa name = prepareEnv name []
 
 doCheck :: FilePath -> String -> IO ()
@@ -183 +183 @@
 doParseWith :: (Env -> FilePath -> IO a) -> FilePath -> String -> IO a
 doParseWith f name prog = do
-    env <- tabulaRasa
+    env <- tabulaRasa name
     f' $ parseProgram env name $ decodeUTF8 prog
     where
@@ -193 +193 @@
 doParse :: (Exp -> String) -> FilePath -> String -> IO ()
 doParse prettyFunc name prog = do
-    env <- tabulaRasa
+    env <- tabulaRasa name
     case envBody $ parseProgram env name (decodeUTF8 prog) of
         (Val err@(VError _ _)) -> putStrLn $ pretty err
@@ -225 +225 @@
     theEnv = do
         ref <- if runOptSeparately opts
-                then (liftSTM . newTVar) =<< tabulaRasa
+                then (liftSTM . newTVar) =<< tabulaRasa "<interactive>"
                 else return menv
         debug <- if runOptDebug opts