[project @ 2000-11-13 12:43:20 by sewardj]

[ghc-hetmet.git] / ghc / compiler / main / CmdLineOpts.lhs

diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs
index a678e34..a1012cd 100644 (file)
--- a/ghc/compiler/main/CmdLineOpts.lhs
+++ b/ghc/compiler/main/CmdLineOpts.lhs
@@ -21,6 +21,7 @@ module CmdLineOpts (
        isStaticHscFlag,
 
        opt_PprStyle_NoPrags,
+       opt_PprStyle_RawTypes,
        opt_PprUserLength,
        opt_PprStyle_Debug,
 
@@ -85,7 +86,6 @@ module CmdLineOpts (
        opt_IgnoreAsserts,
        opt_IgnoreIfacePragmas,
         opt_NoHiCheck,
-       opt_NoImplicitPrelude,
        opt_OmitBlackHoling,
        opt_OmitInterfacePragmas,
        opt_NoPruneTyDecls,
@@ -100,7 +100,6 @@ module CmdLineOpts (
 import Array   ( array, (//) )
 import GlaExts
 import IOExts  ( IORef, readIORef )
-import Argv
 import Constants       -- Default values for some flags
 import Util
 import FastTypes
@@ -274,6 +273,7 @@ data DynFlag
    | Opt_AllowUndecidableInstances
    | Opt_GlasgowExts
    | Opt_Generics
+   | Opt_NoImplicitPrelude 
 
    -- misc
    | Opt_ReportCompile
@@ -342,10 +342,6 @@ lookup_def_int sw def = case (lookup_str sw) of
                            Nothing -> def              -- Use default
                            Just xx -> read xx
 
-lookup_def_char sw def = case (lookup_str sw) of
-                           Just (xx:_) -> xx
-                           _           -> def          -- Use default
-
 lookup_def_float sw def = case (lookup_str sw) of
                            Nothing -> def              -- Use default
                            Just xx -> read xx
@@ -378,6 +374,7 @@ unpacked_opts =
 -- debugging opts
 opt_PprStyle_NoPrags           = lookUp  SLIT("-dppr-noprags")
 opt_PprStyle_Debug             = lookUp  SLIT("-dppr-debug")
+opt_PprStyle_RawTypes          = lookUp  SLIT("-dppr-rawtypes")
 opt_PprUserLength              = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name
 
 -- profiling opts
@@ -423,7 +420,6 @@ opt_HistorySize                     = lookup_def_int "-fhistory-size" 20
 opt_IgnoreAsserts               = lookUp  SLIT("-fignore-asserts")
 opt_IgnoreIfacePragmas         = lookUp  SLIT("-fignore-interface-pragmas")
 opt_NoHiCheck                   = lookUp  SLIT("-fno-hi-version-check")
-opt_NoImplicitPrelude          = lookUp  SLIT("-fno-implicit-prelude")
 opt_OmitBlackHoling            = lookUp  SLIT("-dno-black-holing")
 opt_OmitInterfacePragmas       = lookUp  SLIT("-fomit-interface-pragmas")
 
@@ -465,58 +461,57 @@ opt_Verbose                       = lookUp SLIT("-v")
 \begin{code}
 isStaticHscFlag f =
   f `elem` [
-       "-fauto-sccs-on-all-toplevs",
-       "-fauto-sccs-on-exported-toplevs",
-       "-fauto-sccs-on-individual-cafs",
-       "-fauto-sccs-on-dicts",
-       "-fscc-profiling",
-       "-fticky-ticky",
-       "-fall-strict",
-       "-fdicts-strict",
-       "-fgenerics",
-       "-firrefutable-tuples",
-       "-fnumbers-strict",
-       "-fparallel",
-       "-fsmp",
-       "-fsemi-tagging",
-       "-ffoldr-build-on",
-       "-flet-no-escape",
-       "-funfold-casms-in-hi-file",
-       "-fusagesp-on",
-       "-funbox-strict-fields",
-       "-femit-extern-decls",
-       "-fglobalise-toplev-names",
-       "-fgransim",
-       "-fignore-asserts",
-       "-fignore-interface-pragmas",
-       "-fno-hi-version-check",
-       "-fno-implicit-prelude",
-       "-dno-black-holing",
-       "-fomit-interface-pragmas",
-       "-fno-pre-inlining",
-       "-fdo-eta-reduction",
-       "-fdo-lambda-eta-expansion",
-       "-fcase-of-case",
-       "-fcase-merge",
-       "-fpedantic-bottoms",
-       "-fexcess-precision",
-       "-funfolding-update-in-place",
-       "-freport-compile",
-       "-fno-prune-decls",
-       "-fno-prune-tydecls",
-       "-static",
-       "-funregisterised",
-       "-v" ]
+       "fauto-sccs-on-all-toplevs",
+       "fauto-sccs-on-exported-toplevs",
+       "fauto-sccs-on-individual-cafs",
+       "fauto-sccs-on-dicts",
+       "fscc-profiling",
+       "fticky-ticky",
+       "fall-strict",
+       "fdicts-strict",
+       "firrefutable-tuples",
+       "fnumbers-strict",
+       "fparallel",
+       "fsmp",
+       "fsemi-tagging",
+       "ffoldr-build-on",
+       "flet-no-escape",
+       "funfold-casms-in-hi-file",
+       "fusagesp-on",
+       "funbox-strict-fields",
+       "femit-extern-decls",
+       "fglobalise-toplev-names",
+       "fgransim",
+       "fignore-asserts",
+       "fignore-interface-pragmas",
+       "fno-hi-version-check",
+       "fno-implicit-prelude",
+       "dno-black-holing",
+       "fomit-interface-pragmas",
+       "fno-pre-inlining",
+       "fdo-eta-reduction",
+       "fdo-lambda-eta-expansion",
+       "fcase-of-case",
+       "fcase-merge",
+       "fpedantic-bottoms",
+       "fexcess-precision",
+       "funfolding-update-in-place",
+       "freport-compile",
+       "fno-prune-decls",
+       "fno-prune-tydecls",
+       "static",
+       "funregisterised",
+       "v" ]
   || any (flip prefixMatch f) [
-       "-fcontext-stack",
-       "-fliberate-case-threshold",
-       "-fhi-version=",
-       "-fhistory-size",
-       "-funfolding-interface-threshold",
-       "-funfolding-creation-threshold",
-       "-funfolding-use-threshold",
-       "-funfolding-fun-discount",
-       "-funfolding-keeness-factor"
+       "fcontext-stack",
+       "fliberate-case-threshold",
+       "fhi-version=",
+       "fhistory-size",
+       "funfolding-interface-threshold",
+       "funfolding-creation-threshold",
+       "funfolding-use-threshold",
+       "funfolding-fun-discount",
+       "funfolding-keeness-factor"
      ]
 \end{code}
 
@@ -607,11 +602,6 @@ isAmongSimpl on_switches           -- Switches mentioned later occur *earlier*
                            || sw `is_elem` ss
 \end{code}
 
-Default settings for simplifier switches
-
-\begin{code}
-defaultSimplSwitches = [MaxSimplifierIterations        1]
-\end{code}
 
 %************************************************************************
 %*                                                                     *