X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FMain.hs;h=ad8d1f44c76fa60400f58342fd650e9623133b08;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hp=e9c83430b89d9a2d7679213cfd9dc097e28f39b5;hpb=41cd72b3545c96c72816afb7b7627f3e744d9ab4;p=ghc-hetmet.git

diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs
index e9c8343..ad8d1f4 100644
--- a/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
@@ -1,4 +1,11 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -----------------------------------------------------------------------------
 --
 -- GHC Driver program
@@ -33,7 +40,7 @@ import Packages		( dumpPackages )
 import DriverPhases	( Phase(..), isSourceFilename, anyHsc,
 			  startPhase, isHaskellSrcFilename )
 import StaticFlags
-import DynFlags         ( defaultDynFlags )
+import DynFlags
 import BasicTypes	( failed )
 import ErrUtils		( putMsg )
 import FastString	( getFastStringTable, isZEncoded, hasZEncoding )
@@ -70,7 +77,7 @@ main =
   argv0 <- getArgs
 
   let
-        (minusB_args, argv1) = partition (prefixMatch "-B") argv0
+        (minusB_args, argv1) = partition ("-B" `isPrefixOf`) argv0
         mbMinusB | null minusB_args = Nothing
                  | otherwise = Just (drop 2 (last minusB_args))
 
@@ -85,11 +92,15 @@ main =
   -- to find out what version of GHC it's using before package.conf
   -- exists, so starting the session fails.
   case cli_mode of
-    ShowVersion     -> do showVersion
-                          exitWith ExitSuccess
-    ShowNumVersion  -> do putStrLn cProjectVersion
-                          exitWith ExitSuccess
-    _               -> return ()
+    ShowInfo                -> do showInfo
+                                  exitWith ExitSuccess
+    ShowSupportedLanguages  -> do showSupportedLanguages
+                                  exitWith ExitSuccess
+    ShowVersion             -> do showVersion
+                                  exitWith ExitSuccess
+    ShowNumVersion          -> do putStrLn cProjectVersion
+                                  exitWith ExitSuccess
+    _                       -> return ()
 
   -- start our GHC session
   session <- GHC.newSession mbMinusB
@@ -153,18 +164,22 @@ main =
 	---------------- Final sanity checking -----------
   checkOptions cli_mode dflags srcs objs
 
-	---------------- Do the business -----------
+  ---------------- Do the business -----------
+  let alreadyHandled = panic (show cli_mode ++
+                              " should already have been handled")
   case cli_mode of
-    ShowUsage       -> showGhcUsage dflags cli_mode
-    PrintLibdir     -> putStrLn (topDir dflags)
-    ShowVersion     -> panic "ShowVersion should already have been handled"
-    ShowNumVersion  -> panic "ShowNumVersion should already have been handled"
-    ShowInterface f -> doShowIface dflags f
-    DoMake          -> doMake session srcs
-    DoMkDependHS    -> doMkDependHS session (map fst srcs)
-    StopBefore p    -> oneShot dflags p srcs
-    DoInteractive   -> interactiveUI session srcs Nothing
-    DoEval expr     -> interactiveUI session srcs (Just expr)
+    ShowUsage              -> showGhcUsage dflags cli_mode
+    PrintLibdir            -> putStrLn (topDir dflags)
+    ShowSupportedLanguages -> alreadyHandled
+    ShowDocDir             -> showDocDir (topDir dflags)
+    ShowVersion            -> alreadyHandled
+    ShowNumVersion         -> alreadyHandled
+    ShowInterface f        -> doShowIface dflags f
+    DoMake                 -> doMake session srcs
+    DoMkDependHS           -> doMkDependHS session (map fst srcs)
+    StopBefore p           -> oneShot dflags p srcs
+    DoInteractive          -> interactiveUI session srcs Nothing
+    DoEval expr            -> interactiveUI session srcs (Just expr)
 
   dumpFinalStats dflags
   exitWith ExitSuccess
@@ -289,17 +304,20 @@ verifyOutputFiles dflags = do
 -- GHC modes of operation
 
 data CmdLineMode
-  = ShowUsage			-- ghc -?
-  | PrintLibdir			-- ghc --print-libdir
-  | ShowVersion			-- ghc -V/--version
-  | ShowNumVersion		-- ghc --numeric-version
-  | ShowInterface String	-- ghc --show-iface
-  | DoMkDependHS		-- ghc -M
-  | StopBefore Phase		-- ghc -E | -C | -S
-				-- StopBefore StopLn is the default
-  | DoMake			-- ghc --make
-  | DoInteractive		-- ghc --interactive
-  | DoEval String		-- ghc -e
+  = ShowUsage               -- ghc -?
+  | PrintLibdir             -- ghc --print-libdir
+  | ShowDocDir              -- ghc --print-docdir
+  | ShowInfo                -- ghc --info
+  | ShowSupportedLanguages  -- ghc --supported-languages
+  | ShowVersion             -- ghc -V/--version
+  | ShowNumVersion          -- ghc --numeric-version
+  | ShowInterface String    -- ghc --show-iface
+  | DoMkDependHS            -- ghc -M
+  | StopBefore Phase        -- ghc -E | -C | -S
+                            -- StopBefore StopLn is the default
+  | DoMake                  -- ghc --make
+  | DoInteractive           -- ghc --interactive
+  | DoEval String           -- ghc -e
   deriving (Show)
 
 isInteractiveMode, isInterpretiveMode     :: CmdLineMode -> Bool
@@ -348,12 +366,15 @@ type ModeM a = CmdLineP (CmdLineMode, String, [String]) a
 mode_flags :: [(String, OptKind (CmdLineP (CmdLineMode, String, [String])))]
 mode_flags =
   [  ------- help / version ----------------------------------------------
-     ( "?"    		 , PassFlag (setMode ShowUsage))
-  ,  ( "-help"	 	 , PassFlag (setMode ShowUsage))
-  ,  ( "-print-libdir"   , PassFlag (setMode PrintLibdir))
-  ,  ( "V"	 	 , PassFlag (setMode ShowVersion))
-  ,  ( "-version"	 , PassFlag (setMode ShowVersion))
-  ,  ( "-numeric-version", PassFlag (setMode ShowNumVersion))
+     ( "?"                   , PassFlag (setMode ShowUsage))
+  ,  ( "-help"               , PassFlag (setMode ShowUsage))
+  ,  ( "-print-libdir"       , PassFlag (setMode PrintLibdir))
+  ,  ( "-print-docdir"       , PassFlag (setMode ShowDocDir))
+  ,  ( "V"                   , PassFlag (setMode ShowVersion))
+  ,  ( "-version"            , PassFlag (setMode ShowVersion))
+  ,  ( "-numeric-version"    , PassFlag (setMode ShowNumVersion))
+  ,  ( "-info"               , PassFlag (setMode ShowInfo))
+  ,  ( "-supported-languages", PassFlag (setMode ShowSupportedLanguages))
 
       ------- interfaces ----------------------------------------------------
   ,  ( "-show-iface"     , HasArg (\f -> setMode (ShowInterface f)
@@ -442,6 +463,24 @@ showBanner cli_mode dflags = do
        hPutStr stderr " booted by GHC version "
        hPutStrLn stderr cBooterVersion
 
+-- We print out a Read-friendly string, but a prettier one than the
+-- Show instance gives us
+showInfo :: IO ()
+showInfo = do
+    let sq x = " [" ++ x ++ "\n ]"
+    putStrLn $ sq $ concat $ intersperse "\n ," $ map show compilerInfo
+    exitWith ExitSuccess
+
+showSupportedLanguages :: IO ()
+showSupportedLanguages = do mapM_ putStrLn supportedLanguages
+                            exitWith ExitSuccess
+
+showDocDir :: FilePath -> IO ()
+showDocDir topdir = putStrLn docDir
+    where docDir = if cRelocatableBuild
+                   then topdir ++ "/doc"
+                   else cDocDir
+
 showVersion :: IO ()
 showVersion = do
   putStrLn (cProjectName ++ ", version " ++ cProjectVersion)