diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-11-07 11:50:36 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-07 13:13:16 -0500 |
| commit | 93b4820607aed1ab633e836084c5e39f5e631f87 (patch) | |
| tree | cd1b51c1ff088e9ff25747875bd12e963ae1ec40 /compiler/rename/RnSplice.hs | |
| parent | c1bc923b08860101d0b74795ff42f6022c7fec0b (diff) | |
| download | haskell-93b4820607aed1ab633e836084c5e39f5e631f87.tar.gz | |
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.
Diffstat (limited to 'compiler/rename/RnSplice.hs')
| -rw-r--r-- | compiler/rename/RnSplice.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/rename/RnSplice.hs b/compiler/rename/RnSplice.hs index c681f1f42d..36b1eda140 100644 --- a/compiler/rename/RnSplice.hs +++ b/compiler/rename/RnSplice.hs @@ -18,6 +18,7 @@ import NameSet import HsSyn import RdrName import TcRnMonad +import Kind import RnEnv import RnUtils ( HsDocContext(..), newLocalBndrRn ) @@ -520,13 +521,13 @@ References: -} ---------------------- -rnSpliceType :: HsSplice GhcPs -> RnM (HsType GhcRn, FreeVars) -rnSpliceType splice +rnSpliceType :: HsSplice GhcPs -> PostTc GhcRn Kind + -> RnM (HsType GhcRn, FreeVars) +rnSpliceType splice k = rnSpliceGen run_type_splice pend_type_splice splice where pend_type_splice rn_splice - = ( makePending UntypedTypeSplice rn_splice - , HsSpliceTy noExt rn_splice) + = (makePending UntypedTypeSplice rn_splice, HsSpliceTy rn_splice k) run_type_splice rn_splice = do { traceRn "rnSpliceType: untyped type splice" empty @@ -536,7 +537,7 @@ rnSpliceType splice ; checkNoErrs $ rnLHsType doc hs_ty2 } -- checkNoErrs: see Note [Renamer errors] -- See Note [Delaying modFinalizers in untyped splices]. - ; return ( HsParTy noExt $ HsSpliceTy noExt + ; return ( HsParTy $ flip HsSpliceTy k . HsSpliced (ThModFinalizers mod_finalizers) . HsSplicedTy <$> hs_ty3 @@ -593,15 +594,14 @@ rnSplicePat splice = rnSpliceGen run_pat_splice pend_pat_splice splice where pend_pat_splice rn_splice - = (makePending UntypedPatSplice rn_splice - , Right (SplicePat noExt rn_splice)) + = (makePending UntypedPatSplice rn_splice, Right (SplicePat rn_splice)) run_pat_splice rn_splice = do { traceRn "rnSplicePat: untyped pattern splice" empty ; (pat, mod_finalizers) <- runRnSplice UntypedPatSplice runMetaP ppr rn_splice -- See Note [Delaying modFinalizers in untyped splices]. - ; return ( Left $ ParPat noExt $ (SplicePat noExt) + ; return ( Left $ ParPat $ SplicePat . HsSpliced (ThModFinalizers mod_finalizers) . HsSplicedPat <$> pat |