X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FCmdLineOpts.lhs;h=2d4b4e9d78b05484271986419736bdfc5f2d7ac4;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=6942408563bd0c9424794a122d9e1eb09436c9af;hpb=ef5b4b146aa172d8ac10f39b5eb3d7a0f948d8f1;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs
index 6942408..2d4b4e9 100644
--- a/ghc/compiler/main/CmdLineOpts.lhs
+++ b/ghc/compiler/main/CmdLineOpts.lhs
@@ -10,7 +10,7 @@ module CmdLineOpts (
 	SimplifierSwitch(..), 
 	SimplifierMode(..), FloatOutSwitches(..),
 
-	HscLang(..),
+	HscTarget(..),
 	DynFlag(..),	-- needed non-abstractly by DriverFlags
 	DynFlags(..),
 	PackageFlag(..),
@@ -25,7 +25,7 @@ module CmdLineOpts (
 	dopt_set, dopt_unset,		-- DynFlags -> DynFlag -> DynFlags
 	dopt_CoreToDo,			-- DynFlags -> [CoreToDo]
 	dopt_StgToDo,			-- DynFlags -> [StgToDo]
-	dopt_HscLang,			-- DynFlags -> HscLang
+	dopt_HscTarget,			-- DynFlags -> HscTarget
 	dopt_OutName,			-- DynFlags -> String
 	getOpts,			-- (DynFlags -> [a]) -> IO [a]
 	getVerbFlag,
@@ -90,6 +90,7 @@ module CmdLineOpts (
 #include "HsVersions.h"
 
 import {-# SOURCE #-} Packages (PackageState)
+import DriverPhases	( HscTarget(..) )
 import Constants	-- Default values for some flags
 import Util
 import FastString	( FastString, mkFastString )
@@ -260,12 +261,13 @@ data DynFlag
    | Opt_WarnUnusedMatches
    | Opt_WarnDeprecations
    | Opt_WarnDodgyImports
+   | Opt_WarnOrphans
 
    -- language opts
    | Opt_AllowOverlappingInstances
    | Opt_AllowUndecidableInstances
    | Opt_AllowIncoherentInstances
-   | Opt_NoMonomorphismRestriction
+   | Opt_MonomorphismRestriction
    | Opt_GlasgowExts
    | Opt_FFI
    | Opt_PArr			       -- syntactic support for parallel arrays
@@ -273,7 +275,8 @@ data DynFlag
    | Opt_TH
    | Opt_ImplicitParams
    | Opt_Generics
-   | Opt_NoImplicitPrelude 
+   | Opt_ImplicitPrelude 
+   | Opt_ScopedTypeVariables
 
    -- optimisation opts
    | Opt_Strictness
@@ -292,7 +295,7 @@ data DynFlag
 data DynFlags = DynFlags {
   coreToDo   		:: Maybe [CoreToDo], -- reserved for use with -Ofile
   stgToDo    		:: [StgToDo],
-  hscLang    		:: HscLang,
+  hscTarget    		:: HscTarget,
   hscOutName 		:: String,  	-- name of the output file
   hscStubHOutName	:: String,  	-- name of the .stub_h output file
   hscStubCOutName	:: String,  	-- name of the .stub_c output file
@@ -303,6 +306,7 @@ data DynFlags = DynFlags {
   ruleCheck		:: Maybe String,
   cppFlag    		:: Bool,	-- preprocess with cpp?
   ppFlag                :: Bool,        -- preprocess with a Haskell Pp?
+  recompFlag		:: Bool,	-- True <=> recompilation checker is on
   stolen_x86_regs	:: Int,		
   cmdlineHcIncludes	:: [String],	-- -#includes
   importPaths		:: [FilePath],
@@ -343,25 +347,15 @@ data PackageFlag
   | HidePackage    String
   | IgnorePackage  String
 
-data HscLang
-  = HscC
-  | HscAsm
-  | HscJava
-  | HscILX
-  | HscInterpreted
-  | HscNothing
-    deriving (Eq, Show)
-
-defaultHscLang
-  | cGhcWithNativeCodeGen == "YES" && 
-	(prefixMatch "i386" cTARGETPLATFORM ||
-	 prefixMatch "sparc" cTARGETPLATFORM ||
-	 prefixMatch "powerpc" cTARGETPLATFORM)   =  HscAsm
-  | otherwise					=  HscC
+defaultHscTarget
+#if defined(i386_TARGET_ARCH) || defined(sparc_TARGET_ARCH) || defined(powerpc_TARGET_ARCH)
+  | cGhcWithNativeCodeGen == "YES" 	=  HscAsm
+#endif
+  | otherwise				=  HscC
 
 defaultDynFlags = DynFlags {
   coreToDo = Nothing, stgToDo = [], 
-  hscLang = defaultHscLang, 
+  hscTarget = defaultHscTarget, 
   hscOutName = "", 
   hscStubHOutName = "", hscStubCOutName = "",
   extCoreName = "",
@@ -371,6 +365,7 @@ defaultDynFlags = DynFlags {
   ruleCheck		= Nothing,
   cppFlag		= False,
   ppFlag                = False,
+  recompFlag		= True,
   stolen_x86_regs	= 4,
   cmdlineHcIncludes	= [],
   importPaths		= ["."],
@@ -391,6 +386,8 @@ defaultDynFlags = DynFlags {
   pkgState		= error "pkgState",
 
   flags = [ 
+	    Opt_ImplicitPrelude,
+	    Opt_MonomorphismRestriction,
 	    Opt_Generics,
 			-- Generating the helper-functions for
 			-- generics is now on by default
@@ -436,8 +433,8 @@ dopt_StgToDo = stgToDo
 dopt_OutName :: DynFlags -> String
 dopt_OutName = hscOutName
 
-dopt_HscLang :: DynFlags -> HscLang
-dopt_HscLang = hscLang
+dopt_HscTarget :: DynFlags -> HscTarget
+dopt_HscTarget = hscTarget
 
 dopt_set :: DynFlags -> DynFlag -> DynFlags
 dopt_set dfs f = dfs{ flags = f : flags dfs }
@@ -458,7 +455,7 @@ getVerbFlag dflags
 
 updOptLevel n dfs
   = if (n >= 1)
-     then dfs2{ hscLang = HscC, optLevel = n } -- turn on -fvia-C with -O
+     then dfs2{ hscTarget = HscC, optLevel = n } -- turn on -fvia-C with -O
      else dfs2{ optLevel = n }
   where
    dfs1 = foldr (flip dopt_unset) dfs  remove_dopts
@@ -646,7 +643,8 @@ minusWallOpts
       [	Opt_WarnTypeDefaults,
 	Opt_WarnNameShadowing,
 	Opt_WarnMissingSigs,
-	Opt_WarnHiShadows
+	Opt_WarnHiShadows,
+	Opt_WarnOrphans
       ]
 \end{code}
 
@@ -735,7 +733,6 @@ opt_SccProfilingOn		= lookUp  FSLIT("-fscc-profiling")
 opt_DoTickyProfiling		= lookUp  FSLIT("-fticky-ticky")
 
 -- language opts
-opt_AllStrict			= lookUp  FSLIT("-fall-strict")
 opt_DictsStrict			= lookUp  FSLIT("-fdicts-strict")
 opt_IrrefutableTuples		= lookUp  FSLIT("-firrefutable-tuples")
 opt_MaxContextReductionDepth	= lookup_def_int "-fcontext-stack" mAX_CONTEXT_REDUCTION_DEPTH
@@ -856,10 +853,4 @@ startsWith []     str = Just str
 startsWith (c:cs) (s:ss)
   = if c /= s then Nothing else startsWith cs ss
 startsWith  _	  []  = Nothing
-
-endsWith  :: String -> String -> Maybe String
-endsWith cs ss
-  = case (startsWith (reverse cs) (reverse ss)) of
-      Nothing -> Nothing
-      Just rs -> Just (reverse rs)
 \end{code}