[commit: ghc] wip/type-app: Only thing left is the typechecker (3cb8e91)

[git at git.haskell.org]

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

On branch  : wip/type-app
Link       : http://ghc.haskell.org/trac/ghc/changeset/3cb8e91dd576b6691a383ea81d24629ef885bbe3/ghc

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

commit 3cb8e91dd576b6691a383ea81d24629ef885bbe3
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Jun 27 12:50:20 2015 -0400

    Only thing left is the typechecker


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

3cb8e91dd576b6691a383ea81d24629ef885bbe3
 compiler/deSugar/DsExpr.hs    | 2 +-
 compiler/hsSyn/HsExpr.hs      | 2 +-
 compiler/typecheck/TcHsSyn.hs | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs
index a6cb98d..abc2eea 100644
--- a/compiler/deSugar/DsExpr.hs
+++ b/compiler/deSugar/DsExpr.hs
@@ -680,7 +680,7 @@ dsExpr (EWildPat      {})  = panic "dsExpr:EWildPat"
 dsExpr (EAsPat        {})  = panic "dsExpr:EAsPat"
 dsExpr (EViewPat      {})  = panic "dsExpr:EViewPat"
 dsExpr (ELazyPat      {})  = panic "dsExpr:ELazyPat"
-dsExpr (HsType        {})  = panic "dsExpr:HsType"
+dsExpr (HsType        {})  = panic "dsExpr:HsType" -- removed by typechecker
 dsExpr (HsDo          {})  = panic "dsExpr:HsDo"
 
 
diff --git a/compiler/hsSyn/HsExpr.hs b/compiler/hsSyn/HsExpr.hs
index b6b190c..9b6b6c6 100644
--- a/compiler/hsSyn/HsExpr.hs
+++ b/compiler/hsSyn/HsExpr.hs
@@ -725,7 +725,7 @@ ppr_expr (HsSCC _ (_,lbl) expr)
           pprParendExpr expr ]
 
 ppr_expr (HsWrap co_fn e) = pprHsWrapper (pprExpr e) co_fn
-ppr_expr (HsType id)      = ppr id
+ppr_expr (HsType ty)      = char '@' <> pprParendHsType (unLoc ty)
 
 ppr_expr (HsSpliceE s)         = pprSplice s
 ppr_expr (HsBracket b)         = pprHsBracket b