[commit: ghc] master: Remove some cruft from StaticFlagParser (90f0a9c)

Ian Lynagh igloo at earth.li
Wed Jun 20 19:05:11 CEST 2012


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/90f0a9c244a0f50eb14c3fc65c2a221f71c25b0a

>---------------------------------------------------------------

commit 90f0a9c244a0f50eb14c3fc65c2a221f71c25b0a
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Jun 20 15:10:12 2012 +0100

    Remove some cruft from StaticFlagParser
    
    Also, -read-dot-ghci is now gone. We now have -no-ignore-dot-ghci
    instead.

>---------------------------------------------------------------

 compiler/main/StaticFlagParser.hs |   11 +----------
 docs/users_guide/flags.xml        |    6 ------
 docs/users_guide/ghci.xml         |   11 -----------
 3 files changed, 1 insertions(+), 27 deletions(-)

diff --git a/compiler/main/StaticFlagParser.hs b/compiler/main/StaticFlagParser.hs
index 07eb214..6b425f3 100644
--- a/compiler/main/StaticFlagParser.hs
+++ b/compiler/main/StaticFlagParser.hs
@@ -103,12 +103,8 @@ static_flags :: [Flag IO]
 -- flags further down the list with the same prefix.
 
 static_flags = [
-        ------- GHCi -------------------------------------------------------
-    Flag "ignore-dot-ghci" (PassFlag addOpt)
-  , Flag "read-dot-ghci"   (NoArg (removeOpt "-ignore-dot-ghci"))
-
         ------- ways --------------------------------------------------------
-  , Flag "prof"           (NoArg (addWay WayProf))
+    Flag "prof"           (NoArg (addWay WayProf))
   , Flag "eventlog"       (NoArg (addWay WayEventLog))
   , Flag "parallel"       (NoArg (addWay WayPar))
   , Flag "gransim"        (NoArg (addWay WayGran))
@@ -123,9 +119,6 @@ static_flags = [
 
         ------ Debugging ----------------------------------------------------
   , Flag "dppr-debug"                  (PassFlag addOpt)
-  , Flag "dppr-cols"                   (AnySuffix addOpt)
-  , Flag "dppr-user-length"            (AnySuffix addOpt)
-  , Flag "dppr-case-as-let"            (PassFlag addOpt)
   , Flag "dsuppress-all"               (PassFlag addOpt)
   , Flag "dsuppress-uniques"           (PassFlag addOpt)
   , Flag "dsuppress-coercions"         (PassFlag addOpt)
@@ -135,7 +128,6 @@ static_flags = [
   , Flag "dsuppress-var-kinds"         (PassFlag addOpt)
   , Flag "dsuppress-type-signatures"   (PassFlag addOpt)
   , Flag "dopt-fuel"                   (AnySuffix addOpt)
-  , Flag "dtrace-level"                (AnySuffix addOpt)
   , Flag "dno-debug-output"            (PassFlag addOpt)
   , Flag "dstub-dead-values"           (PassFlag addOpt)
       -- rest of the debugging flags are dynamic
@@ -178,7 +170,6 @@ isStaticFlag f =
     "fscc-profiling",
     "fdicts-strict",
     "fspec-inline-join-points",
-    "firrefutable-tuples",
     "fparallel",
     "fgransim",
     "fno-hi-version-check",
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 650bf8f..3b4f36d 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -499,12 +499,6 @@
             <entry>-</entry>
           </row>
           <row>
-            <entry><option>-read-dot-ghci</option></entry>
-            <entry>Enable reading of <filename>.ghci</filename> files</entry>
-            <entry>static</entry>
-            <entry>-</entry>
-          </row>
-          <row>
             <entry><option>-fbreak-on-exception</option></entry>
             <entry><link linkend="ghci-debugger-exceptions">Break on any exception thrown</link></entry>
             <entry>dynamic</entry>
diff --git a/docs/users_guide/ghci.xml b/docs/users_guide/ghci.xml
index 87ba79d..3d629db 100644
--- a/docs/users_guide/ghci.xml
+++ b/docs/users_guide/ghci.xml
@@ -3125,17 +3125,6 @@ warning settings:
       </varlistentry>
       <varlistentry>
 	<term>
-          <option>-read-dot-ghci</option>
-          <indexterm><primary><option>-read-dot-ghci</option></primary></indexterm>
-        </term>
-	<listitem>
-	  <para>Read <filename>./.ghci</filename> and the other
-          startup files (see above).  This is normally the
-	  default, but the <option>-read-dot-ghci</option> option may
-	  be used to override a previous
-	  <option>-ignore-dot-ghci</option> option.</para>
-	</listitem>
-	<term>
          <option>-ghci-script</option>
          <indexterm><primary><option>-ghci-script</option></primary></indexterm>
     </term>





More information about the Cvs-ghc mailing list