[commit: ghc] master: Revert stage 1 template-haskell. This is a combination of 5 commits. (5c459ee)

git at git.haskell.org git at git.haskell.org
Sat May 9 16:44:48 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5c459eefcb17ff97beebdc08ccfca21bd8fa5201/ghc

>---------------------------------------------------------------

commit 5c459eefcb17ff97beebdc08ccfca21bd8fa5201
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sat May 9 09:43:18 2015 -0700

    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.


>---------------------------------------------------------------

5c459eefcb17ff97beebdc08ccfca21bd8fa5201
 compiler/deSugar/DsExpr.hs                         |   8 +
 compiler/ghc.cabal.in                              |   4 +-
 compiler/main/DynFlags.hs                          |  27 +-
 compiler/main/HscMain.hs                           |   4 +-
 compiler/rename/RnSplice.hs                        | 308 +++++++++++----------
 compiler/typecheck/TcExpr.hs                       |  10 +
 compiler/typecheck/TcSplice.hs                     | 173 ++++++------
 docs/users_guide/7.12.1-notes.xml                  |   7 +-
 docs/users_guide/glasgow_exts.xml                  |   4 +-
 ghc.mk                                             |   2 +-
 libraries/template-haskell/template-haskell.cabal  |   2 +-
 mk/warnings.mk                                     |   1 -
 testsuite/tests/quotes/.gitignore                  |   4 -
 testsuite/tests/quotes/Makefile                    |   3 -
 testsuite/tests/quotes/T10384.hs                   |   3 -
 testsuite/tests/quotes/T10384.stderr               |   6 -
 testsuite/tests/quotes/T8455.hs                    |   5 -
 testsuite/tests/quotes/TH_localname.hs             |   3 -
 testsuite/tests/quotes/TH_localname.stderr         |  22 --
 testsuite/tests/quotes/all.T                       |  31 ---
 testsuite/tests/{quotes => th}/T2632.hs            |   2 +
 testsuite/tests/{quotes => th}/T2931.hs            |   1 +
 testsuite/tests/{quotes => th}/T3572.hs            |   0
 testsuite/tests/{quotes => th}/T3572.stdout        |   0
 testsuite/tests/{quotes => th}/T4056.hs            |   2 +-
 testsuite/tests/{quotes => th}/T4169.hs            |   2 +
 testsuite/tests/{quotes => th}/T4170.hs            |   1 +
 testsuite/tests/{quotes => th}/T5721.hs            |   2 +-
 testsuite/tests/{quotes => th}/T6062.hs            |   1 +
 testsuite/tests/th/T8455.hs                        |   5 +
 testsuite/tests/{quotes => th}/T8633.hs            |   0
 testsuite/tests/{quotes => th}/T8759a.hs           |   2 +-
 testsuite/tests/{quotes => th}/T8759a.stderr       |   0
 testsuite/tests/{quotes => th}/T9824.hs            |   1 +
 .../tests/{quotes => th}/TH_abstractFamily.hs      |   0
 .../tests/{quotes => th}/TH_abstractFamily.stderr  |   0
 testsuite/tests/{quotes => th}/TH_bracket1.hs      |   0
 testsuite/tests/{quotes => th}/TH_bracket2.hs      |   0
 testsuite/tests/{quotes => th}/TH_bracket3.hs      |   0
 testsuite/tests/{quotes => th}/TH_ppr1.hs          |   0
 testsuite/tests/{quotes => th}/TH_ppr1.stdout      |   0
 testsuite/tests/{quotes => th}/TH_reifyType1.hs    |   0
 testsuite/tests/{quotes => th}/TH_reifyType2.hs    |   0
 testsuite/tests/{quotes => th}/TH_repE1.hs         |   0
 testsuite/tests/{quotes => th}/TH_repE3.hs         |   0
 testsuite/tests/{quotes => th}/TH_scope.hs         |   0
 .../tests/{quotes => th}/TH_spliceViewPat/A.hs     |   0
 .../tests/{quotes => th}/TH_spliceViewPat/Main.hs  |   0
 .../tests/{quotes => th}/TH_spliceViewPat/Makefile |   0
 .../TH_spliceViewPat/TH_spliceViewPat.stdout       |   0
 .../tests/{quotes => th}/TH_spliceViewPat/test.T   |   5 +
 testsuite/tests/{quotes => th}/TH_tf2.hs           |   0
 testsuite/tests/th/all.T                           |  31 ++-
 53 files changed, 341 insertions(+), 341 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5c459eefcb17ff97beebdc08ccfca21bd8fa5201


More information about the ghc-commits mailing list