Arrange that -fth is no longer implied by -fglasgow-exts

Messages involving Template Haskell are deeply puzzling
if you don't know about TH, so it seems better to make
-fth an explicit flag.  It is no longer switched on
by -fglasgow-exts.

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 78acb98..aa2a400 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1007,7 +1007,6 @@ fFlags = [
 glasgowExtsFlags = [ 
   Opt_GlasgowExts, 
   Opt_FFI, 
 glasgowExtsFlags = [ 
   Opt_GlasgowExts, 
   Opt_FFI, 

-  Opt_TH, 

   Opt_ImplicitParams, 
   Opt_ScopedTypeVariables,
   Opt_BangPatterns ]
   Opt_ImplicitParams, 
   Opt_ScopedTypeVariables,
   Opt_BangPatterns ]

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index e288da2..e6e22fe 100644 (file)
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -628,7 +628,7 @@
            <row>
              <entry><option>-fth</option></entry>
              <entry>Enable Template Haskell. 
            <row>
              <entry><option>-fth</option></entry>
              <entry>Enable Template Haskell. 

-               Implied by <option>-fglasgow-exts</option>.</entry>
+               No longer implied by <option>-fglasgow-exts</option>.</entry>

              <entry>dynamic</entry>
              <entry><option>-fno-th</option></entry>
            </row>
              <entry>dynamic</entry>
              <entry><option>-fno-th</option></entry>
            </row>

diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index c1dca22..9a9cd38 100644 (file)
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -244,7 +244,8 @@ documentation</ulink> describes all the libraries that come with GHC.
        <term><option>-fth</option></term>
        <listitem>
          <para>Enables Template Haskell (see <xref
        <term><option>-fth</option></term>
        <listitem>
          <para>Enables Template Haskell (see <xref

-         linkend="template-haskell"/>).  Currently also implied by
+         linkend="template-haskell"/>).  This flag must
+         be given explicitly; it is no longer implied by

          <option>-fglasgow-exts</option>.</para>
 
          <para>Syntax stolen: <literal>[|</literal>,
          <option>-fglasgow-exts</option>.</para>
 
          <para>Syntax stolen: <literal>[|</literal>,

@@ -4086,9 +4087,8 @@ Tim Sheard is going to expand it.)
       constructions.  You need to use the flag
       <option>-fth</option><indexterm><primary><option>-fth</option></primary>
       </indexterm>to switch these syntactic extensions on
       constructions.  You need to use the flag
       <option>-fth</option><indexterm><primary><option>-fth</option></primary>
       </indexterm>to switch these syntactic extensions on

-      (<option>-fth</option> is currently implied by
-      <option>-fglasgow-exts</option>, but you are encouraged to
-      specify it explicitly).</para>
+      (<option>-fth</option> is no longer implied by
+      <option>-fglasgow-exts</option>).</para>

 
        <itemizedlist>
              <listitem><para>
 
        <itemizedlist>
              <listitem><para>