diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-02-10 14:09:12 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-02-10 14:11:39 +0000 |
| commit | f46360ed7139ff25741b381647b0a0b6d1000d84 (patch) | |
| tree | 0d44fa5344253999c86a6603055e97d57b809f2e /testsuite/tests/th/T5358.stderr | |
| parent | 78833ca6305f0875add94351592e141c032cd088 (diff) | |
| download | haskell-f46360ed7139ff25741b381647b0a0b6d1000d84.tar.gz | |
Refactor the handling of quasi-quotes
As Trac #10047 points out, a quasi-quotation [n|...blah...|] is supposed
to behave exactly like $(n "...blah..."). But it doesn't! This was outright
wrong: quasiquotes were being run even inside brackets.
Now that TH supports both typed and untyped splices, a quasi-quote is properly
regarded as a particular syntax for an untyped splice. But apart from that
they should be treated the same. So this patch refactors the handling of
quasiquotes to do just that.
The changes touch quite a lot of files, but mostly in a routine way.
The biggest changes by far are in RnSplice, and more minor changes in
TcSplice. These are the places where there was real work to be done.
Everything else is routine knock-on changes.
* No more QuasiQuote forms in declarations, expressions, types, etc.
So we get rid of these data constructors
* HsBinds.QuasiQuoteD
* HsExpr.HsSpliceE
* HsPat.QuasiQuotePat
* HsType.HsQuasiQuoteTy
* We get rid of the HsQuasiQuote type altogether
* Instead, we augment the HsExpr.HsSplice type to have three
consructors, for the three types of splice:
* HsTypedSplice
* HsUntypedSplice
* HsQuasiQuote
There are some related changes in the data types in HsExpr near HsSplice.
Specifically: PendingRnSplice, PendingTcSplice, UntypedSpliceFlavour.
* In Hooks, we combine rnQuasiQuoteHook and rnRnSpliceHook into one.
A smaller, clearer interface.
* We have to update the Haddock submodule, to accommodate the hsSyn changes
Diffstat (limited to 'testsuite/tests/th/T5358.stderr')
| -rw-r--r-- | testsuite/tests/th/T5358.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/th/T5358.stderr b/testsuite/tests/th/T5358.stderr index 395510e43e..f47a9fd390 100644 --- a/testsuite/tests/th/T5358.stderr +++ b/testsuite/tests/th/T5358.stderr @@ -1,9 +1,9 @@ -T5358.hs:14:15: +T5358.hs:14:12: Exception when trying to run compile-time code: runTest called error: forall (t_0 :: *) . t_0 -> GHC.Types.Bool Code: do { VarI _ t _ _ <- reify (mkName "prop_x1"); ($) error ((++) "runTest called error: " pprint t) } - In the splice: + In the untyped splice: $(do { VarI _ t _ _ <- reify (mkName "prop_x1"); error $ ("runTest called error: " ++ pprint t) }) |