summaryrefslogtreecommitdiff
path: root/ghc/compiler/main/Main.hs
diff options
context:
space:
mode:
authorsimonmar <unknown>2000-11-16 11:39:37 +0000
committersimonmar <unknown>2000-11-16 11:39:37 +0000
commit292c077de7dbe98eb44911648f16e243b40db2ac (patch)
treebede294fb08cdc88ca0ddba402b3e873602ea4d6 /ghc/compiler/main/Main.hs
parent8894fd8508fc5ac3b793187c323e4732a73b4a24 (diff)
downloadhaskell-292c077de7dbe98eb44911648f16e243b40db2ac.tar.gz
[project @ 2000-11-16 11:39:36 by simonmar]
Current state of the interactive system; can load packages (in theory).
Diffstat (limited to 'ghc/compiler/main/Main.hs')
-rw-r--r--ghc/compiler/main/Main.hs30
1 files changed, 9 insertions, 21 deletions
diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 109af75d91..8283eb5a86 100644
--- 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.22 2000/11/15 10:49:54 sewardj Exp $
+-- $Id: Main.hs,v 1.23 2000/11/16 11:39:37 simonmar Exp $
--
-- GHC Driver program
--
@@ -16,6 +16,7 @@ module Main (main) where
#include "HsVersions.h"
import CompManager
+import InteractiveUI
import DriverPipeline
import DriverState
import DriverFlags
@@ -281,25 +282,12 @@ beginMake pkg_details mods
_ -> throwDyn (UsageError "only one module allowed with --make")
beginInteractive pkg_details mods
- = do case mods of
- [] -> return ()
- [mod] -> do state <- cmInit pkg_details Interactive
- cmLoadModule state (mkModuleName mod)
- return ()
- _ -> throwDyn (UsageError
+ = do state <- cmInit pkg_details Interactive
+ case mods of
+ [] -> return ()
+ [mod] -> do cmLoadModule state (mkModuleName mod); return ()
+ _ -> throwDyn (UsageError
"only one module allowed with --interactive")
- interactiveUI
-
-interactiveUI :: IO ()
-interactiveUI = do
- hPutStr stdout ghciWelcomeMsg
- throwDyn (OtherError "GHCi not implemented yet")
-
-ghciWelcomeMsg = "\
-\ _____ __ __ ____ ------------------------------------------------\n\
-\(| || || (| |) GHCi: GHC Interactive, version 5.00 \n\
-\|| __ ||___|| || () For Haskell 98. \n\
-\|| |) ||---|| || // http://www.haskell.org/ghc \n\
-\|| || || || || // Bug reports to: glasgow-haskell-bugs@haskell.org\n\
-\(|___|| || || (|__|) (| ________________________________________________\n"
+ interactiveUI state
+