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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ec436fefbc3e35fc2e558184b4b0b98cec78eeb6

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

commit ec436fefbc3e35fc2e558184b4b0b98cec78eeb6
Author: Simon Peyton Jones <[email protected]>
Date:   Tue Oct 4 11:47:44 2011 +0100

    Remove unnecessary references to -fglagow-exts
    replacing them by the appropriate flag.
    
    Suggested by Trac #5526.

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

 docs/users_guide/flags.xml        |    2 +-
 docs/users_guide/ghci.xml         |   11 ++++++-----
 docs/users_guide/glasgow_exts.xml |   14 +++++---------
 docs/users_guide/runghc.xml       |    4 ++--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index ab52a99..8043834 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -650,7 +650,7 @@
          <tbody>
            <row>
              <entry><option>-fglasgow-exts</option></entry>
-             <entry>Enable most language extensions</entry>
+             <entry>Enable most language extensions; see <xref 
linkend="options-language"/> for exactly which ones.</entry>
              <entry>dynamic</entry>
              <entry><option>-fno-glasgow-exts</option></entry>
            </row>
diff --git a/docs/users_guide/ghci.xml b/docs/users_guide/ghci.xml
index 4be3d15..d0a8233 100644
--- a/docs/users_guide/ghci.xml
+++ b/docs/users_guide/ghci.xml
@@ -2830,10 +2830,10 @@ bar
 
       <para>Normal GHC command-line options may also be set using
       <literal>:set</literal>.  For example, to turn on
-      <option>-fglasgow-exts</option>, you would say:</para>
+      <option>-fwarn-missing-signatures</option>, you would say:</para>
 
 <screen>
-Prelude> :set -fglasgow-exts
+Prelude> :set -fwarn-missing-signatures
 </screen>
 
       <para>Any GHC command-line option that is designated as
@@ -2844,7 +2844,7 @@ Prelude> :set -fglasgow-exts
       
<indexterm><primary>dynamic</primary><secondary>options</secondary></indexterm>
 
 <screen>
-Prelude> :set -fno-glasgow-exts
+Prelude> :set -fno-warn-incomplete-patterns -XNoMultiParamTypeClasses
 </screen>
 
       <para><xref linkend="flag-reference"/> lists the reverse for each
@@ -2890,13 +2890,14 @@ Prelude> :set -fno-glasgow-exts
     defining useful macros.  Placing a <filename>.ghci</filename> file
     in a directory with a Haskell project is a useful way to set
     certain project-wide options so you don't have to type them
-    every time you start GHCi: eg. if your project uses GHC extensions
+    every time you start GHCi: eg. if your project uses multi-parameter 
+    type classes, scoped type variables,
     and CPP, and has source files in three subdirectories A, B and C,
     you might put the following lines in
     <filename>.ghci</filename>:</para>
 
 <screen>
-:set -fglasgow-exts -cpp
+:set -XMultiParamTypeClasses -XScopedTypeVariables -cpp
 :set -iA:B:C
 </screen>
 
diff --git a/docs/users_guide/glasgow_exts.xml 
b/docs/users_guide/glasgow_exts.xml
index ed18e9c..bcb74a8 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -206,8 +206,8 @@ since <literal>b</literal> has type <literal>Int#</literal>.
 </title>
 
 <para>
-Unboxed tuples aren't really exported by <literal>GHC.Exts</literal>,
-they're available by default with <option>-fglasgow-exts</option>.  An
+Unboxed tuples aren't really exported by <literal>GHC.Exts</literal>;
+they are a syntactic extension enabled by the language flag 
<option>-XUnboxedTuples</option>.  An
 unboxed tuple looks like this:
 </para>
 
@@ -954,8 +954,7 @@ class Monad m => MonadFix m where
 Here are some other important points in using the recursive-do notation:
 <itemizedlist>
 <listitem><para>
-It is enabled with the flag <literal>-XDoRec</literal>, which is in turn 
implied by
-<literal>-fglasgow-exts</literal>.
+It is enabled with the flag <literal>-XDoRec</literal>.
 </para></listitem>
 
 <listitem><para>
@@ -2096,8 +2095,8 @@ The following syntax is stolen:
 <sect2 id="nullary-types">
 <title>Data types with no constructors</title>
 
-<para>With the <option>-fglasgow-exts</option> flag, GHC lets you declare
-a data type with no constructors.  For example:</para>
+<para>With the <option>-XEmptyDataDecls</option> flag (or equivalent LANGUAGE 
pragma), 
+GHC lets you declare a data type with no constructors.  For example:</para>
 
 <programlisting>
   data S      -- S :: *
@@ -3504,9 +3503,6 @@ 
url="http://research.microsoft.com/~simonpj/Papers/type-class-design-space/";>Typ
 classes: exploring the design space</ulink> (Simon Peyton Jones, Mark
 Jones, Erik Meijer).
 </para>
-<para>
-All the extensions are enabled by the <option>-fglasgow-exts</option> flag.
-</para>
 
 <sect3>
 <title>Multi-parameter type classes</title>
diff --git a/docs/users_guide/runghc.xml b/docs/users_guide/runghc.xml
index 4dc1068..0681f00 100644
--- a/docs/users_guide/runghc.xml
+++ b/docs/users_guide/runghc.xml
@@ -26,8 +26,8 @@ runghc [runghc flags] [GHC flags] module [program args]
     <literal>[program args]</literal> and
     <literal>module</literal> are, but you can use a
     <literal>--</literal> flag if it doesn't get it right. For example,
-    <literal>runghc -- -fglasgow-exts Foo</literal> means runghc
-    won't try to use <literal>glasgow-exts</literal> as the path to GHC,
+    <literal>runghc -- -fwarn-unused-bindings Foo</literal> means runghc
+    won't try to use <literal>warn-unused-bindings</literal> as the path to 
GHC,
     but instead will pass the flag to GHC. If a GHC flag doesn't start
     with a dash then you need to prefix it with
     <literal>--ghc-arg=</literal> or runghc will think that it is the



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to