summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/users_guide/7.12.1-notes.xml7
-rw-r--r--docs/users_guide/glasgow_exts.xml4
2 files changed, 8 insertions, 3 deletions
diff --git a/docs/users_guide/7.12.1-notes.xml b/docs/users_guide/7.12.1-notes.xml
index 4dbb0b20cd..9a87588858 100644
--- a/docs/users_guide/7.12.1-notes.xml
+++ b/docs/users_guide/7.12.1-notes.xml
@@ -105,7 +105,12 @@
<itemizedlist>
<listitem>
<para>
- TODO FIXME.
+ The <literal>TemplateHaskell</literal> now no longer automatically
+ errors when used with a stage 1 compiler (i.e. GHC without
+ interpreter support); in particular, plain
+ Haskell quotes (not quasi-quotes) can now be compiled without erroring.
+ Splices and quasi-quotes continue to only be supported by a
+ stage 2 compiler.
</para>
</listitem>
</itemizedlist>
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index 20204ca164..303833a291 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -9571,8 +9571,8 @@ Typed expression splices and quotations are supported.)
<listitem><para>
If you are building GHC from source, you need at least a stage-2 bootstrap compiler to
- run Template Haskell. A stage-1 compiler will reject the TH constructs. Reason: TH
- compiles and runs a program, and then looks at the result. So it's important that
+ run Template Haskell splices and quasi-quotes. A stage-1 compiler will only accept regular quotes of Haskell. Reason: TH splices and quasi-quotes
+ compile and run a program, and then looks at the result. So it's important that
the program it compiles produces results whose representations are identical to
those of the compiler itself.
</para></listitem>