X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverFlags.hs;h=337cad7e0600daaad4eec0f0e02bdab634157f6e;hb=7cbba64b65967d947f5b028c80c0e2320376aabd;hp=22e416a312f6239e277741242e0a64a84f1023be;hpb=ef271579634228a7a5586baa61977e1db9a53aec;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 22e416a..337cad7 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.115 2003/05/27 12:40:19 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.124 2003/09/10 16:44:05 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"
 				) )
 
@@ -423,6 +424,9 @@ dynamic_flags = [
   ,  ( "fvia-C",	NoArg (setLang HscC) )
   ,  ( "filx",		NoArg (setLang HscILX) )
 
+  ,  ( "fglasgow-exts",    NoArg (mapM_ setDynFlag   glasgowExtsFlags) )
+  ,  ( "fno-glasgow-exts", NoArg (mapM_ unSetDynFlag glasgowExtsFlags) )
+
 	-- "active negatives"
   ,  ( "fno-implicit-prelude",  NoArg (setDynFlag Opt_NoImplicitPrelude) )
   ,  ( "fno-monomorphism-restriction",	
@@ -450,17 +454,21 @@ fFlags = [
   ( "warn-unused-imports",       	Opt_WarnUnusedImports ),
   ( "warn-unused-matches",       	Opt_WarnUnusedMatches ),
   ( "warn-deprecations",         	Opt_WarnDeprecations ),
-  ( "glasgow-exts", 		 	Opt_GlasgowExts ),
   ( "fi",				Opt_FFI ),  -- support `-ffi'...
   ( "ffi",				Opt_FFI ),  -- ...and also `-fffi'
   ( "with",				Opt_With ), -- with keyword
+  ( "arrows",				Opt_Arrows ), -- arrow syntax
   ( "parr",				Opt_PArr ),
+  ( "th",				Opt_TH ),
+  ( "implicit-params",			Opt_ImplicitParams ),
   ( "allow-overlapping-instances", 	Opt_AllowOverlappingInstances ),
   ( "allow-undecidable-instances", 	Opt_AllowUndecidableInstances ),
   ( "allow-incoherent-instances", 	Opt_AllowIncoherentInstances ),
   ( "generics",  			Opt_Generics )
   ]
 
+glasgowExtsFlags = [ Opt_GlasgowExts, Opt_FFI, Opt_TH, Opt_ImplicitParams ]
+
 isFFlag f = f `elem` (map fst fFlags)
 getFFlag f = fromJust (lookup f fFlags)
 
@@ -520,6 +528,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
 
@@ -584,6 +607,9 @@ machdepCCOpts
    | prefixMatch "ia64"    cTARGETPLATFORM  
 	= return ( [], ["-fomit-frame-pointer", "-G0"] )
 
+   | prefixMatch "x86_64"  cTARGETPLATFORM
+	= return ( [], ["-fomit-frame-pointer"] )
+
    | prefixMatch "mips"    cTARGETPLATFORM
 	= return ( ["-static"], [] )
 
@@ -630,3 +656,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