summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2015-05-09 09:43:18 -0700
committerEdward Z. Yang <ezyang@cs.stanford.edu>2015-05-09 09:45:38 -0700
commit5c459eefcb17ff97beebdc08ccfca21bd8fa5201 (patch)
tree0f00a773b18d64627938bc3dd3b4a85c80b99c1c /docs
parent3c70ae032e4361b203dfcf22b0a424e8838a5037 (diff)
downloadhaskell-5c459eefcb17ff97beebdc08ccfca21bd8fa5201.tar.gz
Revert stage 1 template-haskell. This is a combination of 5 commits.
Revert "Quick fix: drop base bound on template-haskell." This reverts commit 3c70ae032e4361b203dfcf22b0a424e8838a5037. Revert "Always do polymorphic typed quote check, c.f. #10384" This reverts commit 9a43b2c1f78b3cf684646af64b9b67dc8079f58f. Revert "RnSplice's staging test should be applied for quotes in stage1." This reverts commit eb0ed4030374af542c0a459480d32c8d4525e48d. Revert "Split off quotes/ from th/ for tests that can be done on stage1 compiler." This reverts commit 21c72e7d38c96ac80d31addf67ae4b3c7a6c3bbb. Revert "Support stage 1 Template Haskell (non-quasi) quotes, fixes #10382." This reverts commit 28257cae77023f2ccc4cc1c0cd1fbbd329947a00.
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, 3 insertions, 8 deletions
diff --git a/docs/users_guide/7.12.1-notes.xml b/docs/users_guide/7.12.1-notes.xml
index 9a87588858..4dbb0b20cd 100644
--- a/docs/users_guide/7.12.1-notes.xml
+++ b/docs/users_guide/7.12.1-notes.xml
@@ -105,12 +105,7 @@
<itemizedlist>
<listitem>
<para>
- 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.
+ TODO FIXME.
</para>
</listitem>
</itemizedlist>
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index 303833a291..20204ca164 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 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
+ 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
the program it compiles produces results whose representations are identical to
those of the compiler itself.
</para></listitem>