X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=9becbb464f59174eb909817ff8f0d0706c59f569;hb=40739684494d88dde2efad64f15be2acbcc884a2;hp=bf456c97af75ef7600f3b05576e50be16eba9c73;hpb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index bf456c9..9becbb4 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -29,6 +29,7 @@ module DynFlags (
 	GhcLink(..), isNoLink,
 	PackageFlag(..),
 	Option(..),
+        fFlags, xFlags,
 
 	-- Configuration of the core-to-core and stg-to-stg phases
 	CoreToDo(..),
@@ -243,7 +244,6 @@ data DynFlag
    | Opt_OmitInterfacePragmas
    | Opt_DoLambdaEtaExpansion
    | Opt_IgnoreAsserts
-   | Opt_IgnoreBreakpoints
    | Opt_DoEtaReduction
    | Opt_CaseMerge
    | Opt_UnboxStrictFields
@@ -267,6 +267,7 @@ data DynFlag
    | Opt_HideAllPackages
    | Opt_PrintBindResult
    | Opt_Haddock
+   | Opt_HaddockOptions
    | Opt_Hpc_No_Auto
    | Opt_BreakOnException
    | Opt_BreakOnError
@@ -390,7 +391,9 @@ data DynFlags = DynFlags {
   flags      		:: [DynFlag],
   
   -- message output
-  log_action            :: Severity -> SrcSpan -> PprStyle -> Message -> IO ()
+  log_action            :: Severity -> SrcSpan -> PprStyle -> Message -> IO (),
+
+  haddockOptions :: Maybe String
  }
 
 data HscTarget
@@ -519,27 +522,26 @@ defaultDynFlags =
 	packageFlags		= [],
         pkgDatabase             = Nothing,
         pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
-	flags = [ 
-    	    Opt_ReadUserPackageConf,
-    
-	    Opt_MonoPatBinds, 	-- Experimentally, I'm making this non-standard
-				-- behaviour the default, to see if anyone notices
-				-- SLPJ July 06
+  haddockOptions = Nothing,
+        flags = [
+            Opt_ReadUserPackageConf,
 
-    	    Opt_ImplicitPrelude,
-    	    Opt_MonomorphismRestriction,
+            Opt_MonoPatBinds,   -- Experimentally, I'm making this non-standard
+                                -- behaviour the default, to see if anyone notices
+                                -- SLPJ July 06
+
+            Opt_ImplicitPrelude,
+            Opt_MonomorphismRestriction,
+
+            Opt_DoAsmMangling,
 
-    	    Opt_DoAsmMangling,
-    
             Opt_GenManifest,
-            Opt_EmbedManifest,
-
-	    -- on by default:
-	    Opt_PrintBindResult ]
-	    ++ [f | (ns,f) <- optLevelFlags, 0 `elem` ns]
-	    	    -- The default -O0 options
-	    ++ standardWarnings,
-               
+            Opt_EmbedManifest
+            ]
+            ++ [f | (ns,f) <- optLevelFlags, 0 `elem` ns]
+                    -- The default -O0 options
+            ++ standardWarnings,
+
         log_action = \severity srcSpan style msg -> 
                         case severity of
                           SevInfo  -> hPutStrLn stderr (show (msg style))
@@ -617,6 +619,8 @@ addOptwindres f d = d{ opt_windres = f : opt_windres d}
 
 addCmdlineFramework f d = d{ cmdlineFrameworks = f : cmdlineFrameworks d}
 
+addHaddockOpts f d = d{ haddockOptions = Just f}
+
 -- -----------------------------------------------------------------------------
 -- Command-line options
 
@@ -931,10 +935,13 @@ allFlags :: [String]
 allFlags = map ('-':) $
            [ name | (name, optkind) <- dynamic_flags, ok optkind ] ++
            map ("fno-"++) flags ++
-           map ("f"++) flags
+           map ("f"++) flags ++
+           map ("X"++) xs ++
+           map ("XNo"++) xs
     where ok (PrefixPred _ _) = False
           ok _ = True
           flags = map fst fFlags
+          xs = map fst xFlags
 
 dynamic_flags :: [(String, OptKind DynP)]
 dynamic_flags = [
@@ -1011,6 +1018,7 @@ dynamic_flags = [
   ,  ( "no-hs-main"     , NoArg (setDynFlag Opt_NoHsMain))
   ,  ( "main-is"   	, SepArg setMainIs )
   ,  ( "haddock"	, NoArg (setDynFlag Opt_Haddock) )
+  ,  ( "haddock-opts"   , HasArg (upd . addHaddockOpts))
   ,  ( "hpcdir"		, SepArg setOptHpcDir )
 
 	------- recompilation checker (DEPRECATED, use -fforce-recomp) -----
@@ -1189,7 +1197,6 @@ fFlags = [
   ( "omit-interface-pragmas",           Opt_OmitInterfacePragmas ),
   ( "do-lambda-eta-expansion",          Opt_DoLambdaEtaExpansion ),
   ( "ignore-asserts",                   Opt_IgnoreAsserts ),
-  ( "ignore-breakpoints",               Opt_IgnoreBreakpoints),
   ( "do-eta-reduction",                 Opt_DoEtaReduction ),
   ( "case-merge",                       Opt_CaseMerge ),
   ( "unbox-strict-fields",              Opt_UnboxStrictFields ),