X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=0a361a478fb5fdaf6abf8181aeb31190222355d8;hb=1717c5831d71bfa63f9d098a2a709feb2d8fbcc9;hp=2a46d0ea3848211eee48ad3644a5e0632ca6b9f2;hpb=bec18cb3a1dcbc70b0257a367091c9a5948da6f6;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 2a46d0e..0a361a4 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS -fno-warn-missing-fields #-}
 -----------------------------------------------------------------------------
 --
 -- Dynamic flags
@@ -63,6 +64,7 @@ import Config
 import CmdLineParser
 import Constants	( mAX_CONTEXT_REDUCTION_DEPTH )
 import Panic		( panic, GhcException(..) )
+import UniqFM           ( UniqFM )
 import Util		( notNull, splitLongestPrefix, normalisePath )
 import Maybes		( fromJust, orElse )
 import SrcLoc           ( SrcSpan )
@@ -72,7 +74,10 @@ import EXCEPTION	( throwDyn )
 import Monad		( when )
 #ifdef mingw32_TARGET_OS
 import Data.List	( isPrefixOf )
+#else
+import Util		( split )
 #endif
+
 import Char		( isDigit, isUpper )
 import Outputable
 import System.IO        ( hPutStrLn, stderr )
@@ -151,10 +156,11 @@ data DynFlag
    | Opt_AllowIncoherentInstances
    | Opt_MonomorphismRestriction
    | Opt_MonoPatBinds
+   | Opt_ExtendedDefaultRules		-- Use GHC's extended rules for defaulting
    | Opt_GlasgowExts
    | Opt_FFI
-   | Opt_PArr			       -- syntactic support for parallel arrays
-   | Opt_Arrows			       -- Arrow-notation syntax
+   | Opt_PArr				-- Syntactic support for parallel arrays
+   | Opt_Arrows				-- Arrow-notation syntax
    | Opt_TH
    | Opt_ImplicitParams
    | Opt_Generics
@@ -242,6 +248,9 @@ data DynFlags = DynFlags {
   cmdlineFrameworks	:: [String],	-- ditto
   tmpDir		:: String,	-- no trailing '/'
   
+  ghcUsagePath          :: FilePath,    -- Filled in by SysTools
+  ghciUsagePath         :: FilePath,    -- ditto
+
   -- options for particular phases
   opt_L			:: [String],
   opt_P			:: [String],
@@ -263,16 +272,23 @@ data DynFlags = DynFlags {
   pgm_a			:: (String,[Option]),
   pgm_l			:: (String,[Option]),
   pgm_dll		:: (String,[Option]),
+  pgm_T                 :: String,
+  pgm_sysman            :: String,
 
-  --  ** Package flags
+  --  Package flags
   extraPkgConfs		:: [FilePath],
+  topDir                :: FilePath,    -- filled in by SysTools
+  systemPackageConfig   :: FilePath,    -- ditto
 	-- The -package-conf flags given on the command line, in the order
 	-- they appeared.
 
   packageFlags		:: [PackageFlag],
 	-- The -package and -hide-package flags from the command-line
 
-  --  ** Package state
+  -- Package state
+  -- NB. do not modify this field, it is calculated by 
+  -- Packages.initPackages and Packages.updatePackages.
+  pkgDatabase           :: Maybe (UniqFM InstalledPackageInfo),
   pkgState		:: PackageState,
 
   -- hsc dynamic flags
@@ -318,6 +334,7 @@ data PackageFlag
   = ExposePackage  String
   | HidePackage    String
   | IgnorePackage  String
+  deriving Eq
 
 defaultHscTarget
   | cGhcWithNativeCodeGen == "YES" 	=  HscAsm
@@ -355,10 +372,6 @@ defaultDynFlags =
 	ctxtStkDepth		= mAX_CONTEXT_REDUCTION_DEPTH,
 
 	thisPackage		= mainPackageId,
-	
-	wayNames		= panic "ways",
-	buildTag		= panic "buildTag",
-	rtsBuildTag		= panic "rtsBuildTag",
 
 	objectDir		= Nothing,
 	hiDir			= Nothing,
@@ -386,19 +399,10 @@ defaultDynFlags =
 	opt_dll			= [],
 	opt_dep			= [],
 	
-	pgm_L			= panic "pgm_L",
-	pgm_P			= panic "pgm_P",
-	pgm_F			= panic "pgm_F",
-	pgm_c			= panic "pgm_c",
-	pgm_m			= panic "pgm_m",
-	pgm_s			= panic "pgm_s",
-	pgm_a			= panic "pgm_a",
-	pgm_l			= panic "pgm_l",
-	pgm_dll			= panic "pgm_mkdll",
-	
 	extraPkgConfs		= [],
 	packageFlags		= [],
-	pkgState		= panic "pkgState",
+        pkgDatabase             = Nothing,
+        pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
 	
 	flags = [ 
     	    Opt_RecompChecking,
@@ -1012,6 +1016,7 @@ fFlags = [
   ( "bang-patterns",	  		Opt_BangPatterns ),
   ( "monomorphism-restriction",		Opt_MonomorphismRestriction ),
   ( "mono-pat-binds",			Opt_MonoPatBinds ),
+  ( "extended-default-rules",		Opt_ExtendedDefaultRules ),
   ( "implicit-params",			Opt_ImplicitParams ),
   ( "allow-overlapping-instances", 	Opt_AllowOverlappingInstances ),
   ( "allow-undecidable-instances", 	Opt_AllowUndecidableInstances ),
@@ -1037,8 +1042,7 @@ glasgowExtsFlags = [
   Opt_GlasgowExts, 
   Opt_FFI, 
   Opt_ImplicitParams, 
-  Opt_ScopedTypeVariables,
-  Opt_BangPatterns ]
+  Opt_ScopedTypeVariables ]
 
 isFFlag f = f `elem` (map fst fFlags)
 getFFlag f = fromJust (lookup f fFlags)