[commit: ghc] master: Revert "WIP on combining Step 1 and 3 of Trees That Grow" (93b4820)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/93b4820607aed1ab633e836084c5e39f5e631f87/ghc

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

commit 93b4820607aed1ab633e836084c5e39f5e631f87
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 7 11:50:36 2017 -0500

    Revert "WIP on combining Step 1 and 3 of Trees That Grow"
    
    This reverts commit 0ff152c9e633accca48815e26e59d1af1fe44ceb.
    
    Sadly this broke when bootstrapping with 8.0.2 due to #14396.
    
    Reverts haddock submodule.


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

93b4820607aed1ab633e836084c5e39f5e631f87
 compiler/deSugar/Check.hs                          |  53 ++-
 compiler/deSugar/DsArrows.hs                       |  30 +-
 compiler/deSugar/DsExpr.hs                         |   2 +-
 compiler/deSugar/DsMeta.hs                         | 108 +++--
 compiler/deSugar/DsUtils.hs                        |  63 ++-
 compiler/deSugar/Match.hs                          |  72 ++--
 compiler/deSugar/MatchLit.hs                       |  27 +-
 compiler/hsSyn/Convert.hs                          | 162 ++++---
 compiler/hsSyn/HsBinds.hs                          | 150 ++-----
 compiler/hsSyn/HsDecls.hs                          | 154 ++++---
 compiler/hsSyn/HsExpr.hs                           | 246 +++++------
 compiler/hsSyn/HsExpr.hs-boot                      |  46 +-
 compiler/hsSyn/HsExtension.hs                      | 328 ++++----------
 compiler/hsSyn/HsLit.hs                            |  71 +--
 compiler/hsSyn/HsPat.hs                            | 303 +++++--------
 compiler/hsSyn/HsPat.hs-boot                       |   6 +-
 compiler/hsSyn/HsSyn.hs                            |   5 +-
 compiler/hsSyn/HsTypes.hs                          | 478 ++++++++-------------
 compiler/hsSyn/HsUtils.hs                          | 186 ++++----
 compiler/hsSyn/PlaceHolder.hs                      |   9 +-
 compiler/main/HscStats.hs                          |   2 +-
 compiler/main/InteractiveEval.hs                   |   3 +-
 compiler/parser/Parser.y                           |  99 +++--
 compiler/parser/RdrHsSyn.hs                        | 103 +++--
 compiler/rename/RnBinds.hs                         |  10 +-
 compiler/rename/RnExpr.hs                          |  46 +-
 compiler/rename/RnFixity.hs                        |   5 +-
 compiler/rename/RnNames.hs                         |  20 +-
 compiler/rename/RnPat.hs                           |  93 ++--
 compiler/rename/RnSource.hs                        |  12 +-
 compiler/rename/RnSplice.hs                        |  16 +-
 compiler/rename/RnSplice.hs-boot                   |   4 +-
 compiler/rename/RnTypes.hs                         | 283 ++++++------
 compiler/typecheck/Inst.hs                         |  16 +-
 compiler/typecheck/TcAnnotations.hs                |   3 +-
 compiler/typecheck/TcBinds.hs                      |   5 +-
 compiler/typecheck/TcDeriv.hs                      |   2 +-
 compiler/typecheck/TcEnv.hs                        |   6 +-
 compiler/typecheck/TcExpr.hs                       |  43 +-
 compiler/typecheck/TcGenDeriv.hs                   |  15 +-
 compiler/typecheck/TcGenFunctor.hs                 |   1 -
 compiler/typecheck/TcHsSyn.hs                      | 124 +++---
 compiler/typecheck/TcHsType.hs                     |  79 ++--
 compiler/typecheck/TcInstDcls.hs                   |   3 +-
 compiler/typecheck/TcPat.hs                        |  78 ++--
 compiler/typecheck/TcPatSyn.hs                     | 124 +++---
 compiler/typecheck/TcRnDriver.hs                   |  18 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  12 +-
 compiler/typecheck/TcTyDecls.hs                    |   5 +-
 ghc/GHCi/UI/Info.hs                                |   4 +-
 .../parser/should_compile/DumpParsedAst.stderr     |  33 +-
 .../parser/should_compile/DumpRenamedAst.stderr    | 139 ++----
 .../tests/parser/should_compile/T14189.stderr      |  13 +-
 testsuite/tests/perf/haddock/all.T                 |   3 +-
 testsuite/tests/quasiquotation/T7918.hs            |   4 +-
 utils/ghctags/Main.hs                              |  23 +-
 utils/haddock                                      |   2 +-
 57 files changed, 1616 insertions(+), 2334 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 93b4820607aed1ab633e836084c5e39f5e631f87