X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverFlags.hs;h=378265e31e672789a5afa743887181e2858e7070;hb=d28ba8c800901bea01f70c4719278c2a364cf9fc;hp=4c110c0b4e21cc5950a8ff1da487ada392fc61d8;hpb=1a4238bccc8be8a71f8ebec15f25d8edf8d084ad;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 4c110c0..378265e 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.110 2003/01/09 11:39:20 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.116 2003/06/23 10:35:17 simonpj Exp $
 --
 -- Driver flags
 --
@@ -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) )
@@ -314,14 +315,11 @@ static_flags =
   ,  ( "fno-asm-mangling"  , NoArg (writeIORef v_Do_asm_mangling False) )
 
   ,  ( "fmax-simplifier-iterations", 
-		Prefix (writeIORef v_MaxSimplifierIterations . read) )
+		PrefixPred (all isDigit) (writeIORef v_MaxSimplifierIterations . read) )
 
   ,  ( "frule-check", 
 		SepArg (\s -> writeIORef v_RuleCheck (Just s)) )
 
-  ,  ( "fusagesp"	   , NoArg (do writeIORef v_UsageSPInf True
-				       add v_Opt_C "-fusagesp-on") )
-
   ,  ( "fexcess-precision" , NoArg (do writeIORef v_Excess_precision True
 				       add v_Opt_C "-fexcess-precision"))
 
@@ -359,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_HOST_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) )
@@ -397,7 +384,6 @@ dynamic_flags = [
   ,  ( "ddump-tc",           	 NoArg (setDynFlag Opt_D_dump_tc) )
   ,  ( "ddump-types",        	 NoArg (setDynFlag Opt_D_dump_types) )
   ,  ( "ddump-rules",        	 NoArg (setDynFlag Opt_D_dump_rules) )
-  ,  ( "ddump-usagesp",      	 NoArg (setDynFlag Opt_D_dump_usagesp) )
   ,  ( "ddump-cse",          	 NoArg (setDynFlag Opt_D_dump_cse) )
   ,  ( "ddump-worker-wrapper",   NoArg (setDynFlag Opt_D_dump_worker_wrapper) )
   ,  ( "dshow-passes",           NoArg (setVerbosity "2") )
@@ -417,7 +403,6 @@ dynamic_flags = [
   ,  ( "ddump-vect",         	 NoArg (setDynFlag Opt_D_dump_vect) )
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting) )
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting) )
-  ,  ( "dusagesp-lint",        	 NoArg (setDynFlag Opt_DoUSPLinting) )
 
 	------ Machine dependant (-m<blah>) stuff ---------------------------
 
@@ -536,6 +521,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