[project @ 2000-12-07 08:22:53 by simonpj]

[ghc-hetmet.git] / ghc / compiler / main / Main.hs

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 13ec18f..a7adcdd 100644 (file)
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -W -fno-warn-incomplete-patterns #-}
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.31 2000/11/21 16:31:51 sewardj Exp $
+-- $Id: Main.hs,v 1.35 2000/11/24 17:09:52 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -15,11 +15,18 @@ module Main (main) where
 
 #include "HsVersions.h"
 
-import CompManager
-import Interpreter
+
 #ifdef GHCI
+import Interpreter
 import InteractiveUI
 #endif
+
+#ifndef mingw32_TARGET_OS
+import Dynamic
+import Posix
+#endif
+
+import CompManager
 import DriverPipeline
 import DriverState
 import DriverFlags
@@ -28,21 +35,18 @@ import DriverUtil
 import Panic
 import DriverPhases    ( Phase(..) )
 import CmdLineOpts     ( HscLang(..), DynFlags(..), v_Static_hsc_opts )
-import Module          ( mkModuleName )
 import TmpFiles
 import Finder          ( initFinder )
 import CmStaticInfo
 import Config
 import Util
 
+
+
 import Concurrent
-#ifndef mingw32_TARGET_OS
-import Posix
-#endif
 import Directory
 import IOExts
 import Exception
-import Dynamic
 
 import IO
 import Monad
@@ -298,10 +302,10 @@ beginInteractive = throwDyn (OtherError "not build for interactive use")
 #else
 beginInteractive mods
   = do state <- cmInit Interactive
-       case mods of
-          []    -> return ()
-          [mod] -> do cmLoadModule state mod; return ()
-          _     -> throwDyn (UsageError 
-                               "only one module allowed with --interactive")
-       interactiveUI state
+       let mod = case mods of
+               []    -> Nothing
+               [mod] -> Just mod
+               _     -> throwDyn (UsageError 
+                                   "only one module allowed with --interactive")
+       interactiveUI state mod
 #endif