Changeset 2409 for src/Main.hs

Timestamp:

04/27/05 21:13:27 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

3914

Message:

* repair interactive shell.

Files:

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

src/Main.hs

@@ -163 +163 @@
 doRunSingle :: IORef Env -> RunOptions -> String -> IO ()
 doRunSingle menv opts prog = (`catch` handler) $ do
-    exp <- parse >>= makeProper
-    env <- theEnv
-    result <- runImperatively env (evaluate exp)
+    exp     <- makeProper =<< parse
+    env     <- theEnv
+    rv      <- runImperatively env (evaluate exp)
+    result  <- case rv of
+        VControl (ControlEnv env') -> do
+            glob    <- readIORef $ envGlobal env'
+            ref     <- findSymRef "$*_" glob
+            val     <- runEval env' $ readRef ref
+            writeIORef menv env'
+            return val
+        _ -> return rv
     printer env result
     where
     parse = do
-        parseEnv <- emptyEnv []
-        runRule parseEnv (return . envBody) ruleProgram "<interactive>" (decodeUTF8 prog)
+        env <- readIORef menv
+        runRule env (return . envBody) ruleProgram "<interactive>" (decodeUTF8 prog)
     theEnv = do
         ref <- if runOptSeparately opts
@@ -188 +196 @@
         Val err@(VError _ _) -> fail $ pretty err
         Stmts stmts@((_,pos):_) | not (runOptSeparately opts) -> do
-            let withDump = stmts ++ [(Syn "dump" [], pos)]
+            let withDump = stmts ++ [(Syn "env" [], pos)]
             return $ Stmts withDump
         _ | not (runOptSeparately opts) -> do
             let pos = SourcePos "<interactive>" 0 0
-            return $ Stmts [(exp, pos), (Syn "dump" [], pos)]
+            return $ Stmts [(exp, pos), (Syn "env" [], pos)]
         _ -> return exp
     handler err = if not (isUserError err) then ioError err else do