[project @ 2003-08-27 13:28:01 by panne]

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

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 075d9bf..074ba93 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.119 2003/08/11 08:53:39 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.121 2003/08/27 13:28:01 panne Exp $
 --
 -- Driver flags
 --
@@ -127,7 +127,7 @@ findArg :: [(String,OptKind)] -> String -> Maybe (String,OptKind)
 findArg spec arg
   = case [ (remove_spaces rest, k) 
         | (pat,k)   <- spec, 
-          Just rest <- [my_prefix_match pat arg],
+          Just rest <- [maybePrefixMatch pat arg],
           arg_ok k rest arg ] 
     of
        []      -> Nothing
@@ -156,9 +156,8 @@ static_flags =
   ,  ( "-help"          , NoArg showGhcUsage)
   ,  ( "-print-libdir"   , NoArg (do getTopDir >>= putStrLn
                                     exitWith ExitSuccess))  
-  ,  ( "-version"       , NoArg (do putStrLn (cProjectName
-                                     ++ ", version " ++ cProjectVersion)
-                                    exitWith ExitSuccess))
+  ,  ( "V"              , NoArg showVersion)
+  ,  ( "-version"       , NoArg showVersion)
   ,  ( "-numeric-version", NoArg (do putStrLn cProjectVersion
                                     exitWith ExitSuccess))
 
@@ -647,3 +646,8 @@ setVerbosity n
   | otherwise     = throwDyn (UsageError "can't parse verbosity flag (-v<n>)")
 
 addCmdlineHCInclude a = updDynFlags (\s -> s{cmdlineHcIncludes =  a : cmdlineHcIncludes s})
+
+showVersion :: IO ()
+showVersion = do
+  putStrLn (cProjectName ++ ", version " ++ cProjectVersion)
+  exitWith ExitSuccess