summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonpj@microsoft.com <unknown>2006-04-26 18:21:14 +0000
committersimonpj@microsoft.com <unknown>2006-04-26 18:21:14 +0000
commit70dd3e6b74d368f2df585c18d86426373e7e89e5 (patch)
treeafafaedea4d0faba27fe7bdaf452b80f7cdd5cbf
parent3d33e8fd1553dc6376870de9107e9a6ff282f80a (diff)
downloadhaskell-70dd3e6b74d368f2df585c18d86426373e7e89e5.tar.gz
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.
-rw-r--r--compiler/main/DynFlags.hs1
-rw-r--r--docs/users_guide/flags.xml2
-rw-r--r--docs/users_guide/glasgow_exts.xml8
3 files changed, 5 insertions, 6 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 78acb98375..aa2a400d04 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1007,7 +1007,6 @@ fFlags = [
glasgowExtsFlags = [
Opt_GlasgowExts,
Opt_FFI,
- Opt_TH,
Opt_ImplicitParams,
Opt_ScopedTypeVariables,
Opt_BangPatterns ]
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index e288da2fb2..e6e22fe3e7 100644
--- 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.
- 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>
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index c1dca222a9..9a9cd38f1d 100644
--- 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
- 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>,
@@ -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
- (<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>