X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverFlags.hs;h=1189f10af69bc3f30e35a79df853dcb6a89fbe89;hb=e98cf284e1181d6cd67ec90b8d1c4f06eca7bc81;hp=a015de2328bbda4d507dde4436dbbc6fe66b4d62;hpb=e440a5e262dfa09fa02e4d69192948278e734387;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index a015de2..1189f10 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.113 2003/02/21 13:26:58 simonpj Exp $
+-- $Id: DriverFlags.hs,v 1.123 2003/09/04 11:08:47 simonmar 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))
 
@@ -179,6 +178,7 @@ static_flags =
   ,  ( "-make"		, PassFlag (setMode DoMake))
   ,  ( "-interactive"	, PassFlag (setMode DoInteractive))
   ,  ( "-mk-dll"	, PassFlag (setMode DoMkDLL))
+  ,  ( "e"              , HasArg   (\s -> setMode (DoEval s) "-e"))
 
 	-- -fno-code says to stop after Hsc but don't generate any code.
   ,  ( "fno-code"	, PassFlag (\f -> do setMode (StopBefore HCc) f
@@ -225,6 +225,7 @@ static_flags =
 	------- Miscellaneous -----------------------------------------------
   ,  ( "no-link-chk"    , NoArg (return ()) ) -- ignored for backwards compat
   ,  ( "no-hs-main"     , NoArg (writeIORef v_NoHsMain True) )
+  ,  ( "main-is"   	, SepArg setMainIs )
 
 	------- Output Redirection ------------------------------------------
   ,  ( "odir"		, HasArg (writeIORef v_Output_dir  . Just) )
@@ -251,7 +252,7 @@ static_flags =
 				    then do writeIORef v_Split_object_files True
 					    add v_Opt_C "-fglobalise-toplev-names"
 				    else hPutStrLn stderr
-					    "warning: don't know how to  split \
+					    "warning: don't know how to  split \ 
 					    \object files on this architecture"
 				) )
 
@@ -356,19 +357,8 @@ dynamic_flags = [
 #endif
 
 	------ HsCpp opts ---------------------------------------------------
-	-- With a C compiler whose system() doesn't use a UNIX shell (i.e.
-	-- mingwin gcc), -D and -U args must *not* be quoted, as the quotes
-	-- will be interpreted as part of the arguments, and not stripped;
-	-- on all other systems, quoting is necessary, to avoid interpretation
-	-- of shell metacharacters in the arguments (e.g. green-card's
-	-- -DBEGIN_GHC_ONLY='}-' trick).
-#ifndef mingw32_TARGET_OS
-  ,  ( "D",		Prefix (\s -> addOpt_P ("-D'"++s++"'") ) )
-  ,  ( "U",		Prefix (\s -> addOpt_P ("-U'"++s++"'") ) )
-#else
-  ,  ( "D",		Prefix (\s -> addOpt_P ("-D"++s) ) )
-  ,  ( "U",		Prefix (\s -> addOpt_P ("-U"++s) ) )
-#endif
+  ,  ( "D",		AnySuffix addOpt_P )
+  ,  ( "U",		AnySuffix addOpt_P )
 
 	------ Debugging ----------------------------------------------------
   ,  ( "dstg-stats",	NoArg (writeIORef v_StgStats True) )
@@ -465,6 +455,7 @@ fFlags = [
   ( "fi",				Opt_FFI ),  -- support `-ffi'...
   ( "ffi",				Opt_FFI ),  -- ...and also `-fffi'
   ( "with",				Opt_With ), -- with keyword
+  ( "arrows",				Opt_Arrows ), -- arrow syntax
   ( "parr",				Opt_PArr ),
   ( "allow-overlapping-instances", 	Opt_AllowOverlappingInstances ),
   ( "allow-undecidable-instances", 	Opt_AllowUndecidableInstances ),
@@ -531,6 +522,21 @@ buildStaticHscOpts = do
 
   return ( static : filtered_opts )
 
+setMainIs :: String -> IO ()
+setMainIs arg
+  | not (null main_mod)		-- The arg looked like "Foo.baz"
+  = do { writeIORef v_MainFunIs (Just main_fn) ;
+	 writeIORef v_MainModIs (Just main_mod) }
+
+  | isUpper (head main_fn)	-- The arg looked like "Foo"
+  = writeIORef v_MainModIs (Just main_fn)
+  
+  | otherwise			-- The arg looked like "baz"
+  = writeIORef v_MainFunIs (Just main_fn)
+  where
+    (main_mod, main_fn) = split_longest_prefix arg (== '.')
+  
+
 -----------------------------------------------------------------------------
 -- Via-C compilation stuff
 
@@ -595,6 +601,9 @@ machdepCCOpts
    | prefixMatch "ia64"    cTARGETPLATFORM  
 	= return ( [], ["-fomit-frame-pointer", "-G0"] )
 
+   | prefixMatch "x86_64"  cTARGETPLATFORM
+	= return ( [], ["-fomit-frame-pointer"] )
+
    | prefixMatch "mips"    cTARGETPLATFORM
 	= return ( ["-static"], [] )
 
@@ -641,3 +650,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