[Git][ghc/ghc][wip/az/epa-hslet-tokens] EPA: Remove EpAnn from last extension points HsType
Alan Zimmerman (@alanz)
gitlab at gitlab.haskell.org
Sun Dec 10 21:11:55 UTC 2023
Alan Zimmerman pushed to branch wip/az/epa-hslet-tokens at Glasgow Haskell Compiler / GHC
Commits:
e848e044 by Alan Zimmerman at 2023-12-10T21:10:46+00:00
EPA: Remove EpAnn from last extension points HsType
Also replace `EpAnn NoEpAnns` with `EpAnnCO`
- - - - -
24 changed files:
- compiler/GHC/Hs/Binds.hs
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Hs/Dump.hs
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Hs/Pat.hs
- compiler/GHC/Hs/Type.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Parser/Types.hs
- compiler/GHC/Rename/Bind.hs
- compiler/GHC/Tc/Gen/Match.hs
- compiler/GHC/Tc/Zonk/Type.hs
- testsuite/tests/ghc-api/exactprint/Test20239.stderr
- testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
- testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/DumpSemis.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
- testsuite/tests/parser/should_compile/T14189.stderr
- testsuite/tests/parser/should_compile/T15323.stderr
- testsuite/tests/parser/should_compile/T20452.stderr
- testsuite/tests/printer/T18791.stderr
- utils/check-exact/ExactPrint.hs
Changes:
=====================================
compiler/GHC/Hs/Binds.hs
=====================================
@@ -876,7 +876,7 @@ type instance Anno [LocatedN Id] = SrcSpan
type instance Anno (FixitySig (GhcPass p)) = SrcSpanAnnA
-type instance Anno StringLiteral = EpAnn NoEpAnns
+type instance Anno StringLiteral = EpAnnCO
type instance Anno (LocatedN RdrName) = SrcSpan
type instance Anno (LocatedN Name) = SrcSpan
type instance Anno (LocatedN Id) = SrcSpan
=====================================
compiler/GHC/Hs/Decls.hs
=====================================
@@ -1222,8 +1222,8 @@ instance NoAnn HsRuleAnn where
flattenRuleDecls :: [LRuleDecls (GhcPass p)] -> [LRuleDecl (GhcPass p)]
flattenRuleDecls decls = concatMap (rds_rules . unLoc) decls
-type instance XCRuleBndr (GhcPass _) = EpAnn [AddEpAnn]
-type instance XRuleBndrSig (GhcPass _) = EpAnn [AddEpAnn]
+type instance XCRuleBndr (GhcPass _) = [AddEpAnn]
+type instance XRuleBndrSig (GhcPass _) = [AddEpAnn]
type instance XXRuleBndr (GhcPass _) = DataConCantHappen
instance (OutputableBndrId p) => Outputable (RuleDecls (GhcPass p)) where
@@ -1341,7 +1341,7 @@ type instance XCRoleAnnotDecl GhcTc = NoExtField
type instance XXRoleAnnotDecl (GhcPass _) = DataConCantHappen
-type instance Anno (Maybe Role) = EpAnn NoEpAnns
+type instance Anno (Maybe Role) = EpAnnCO
instance OutputableBndr (IdP (GhcPass p))
=> Outputable (RoleAnnotDecl (GhcPass p)) where
@@ -1367,15 +1367,15 @@ type instance Anno (HsDecl (GhcPass _)) = SrcSpanAnnA
type instance Anno (SpliceDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (TyClDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (FunDep (GhcPass p)) = SrcSpanAnnA
-type instance Anno (FamilyResultSig (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (FamilyResultSig (GhcPass p)) = EpAnnCO
type instance Anno (FamilyDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno (InjectivityAnn (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (InjectivityAnn (GhcPass p)) = EpAnnCO
type instance Anno CType = SrcSpanAnnP
-type instance Anno (HsDerivingClause (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (HsDerivingClause (GhcPass p)) = EpAnnCO
type instance Anno (DerivClauseTys (GhcPass _)) = SrcSpanAnnC
type instance Anno (StandaloneKindSig (GhcPass p)) = SrcSpanAnnA
type instance Anno (ConDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno Bool = EpAnn NoEpAnns
+type instance Anno Bool = EpAnnCO
type instance Anno [LocatedA (ConDeclField (GhcPass _))] = SrcSpanAnnL
type instance Anno (FamEqn p (LocatedA (HsType p))) = SrcSpanAnnA
type instance Anno (TyFamInstDecl (GhcPass p)) = SrcSpanAnnA
@@ -1386,18 +1386,18 @@ type instance Anno (InstDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (DocDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (DerivDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno OverlapMode = SrcSpanAnnP
-type instance Anno (DerivStrategy (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (DerivStrategy (GhcPass p)) = EpAnnCO
type instance Anno (DefaultDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (ForeignDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (RuleDecls (GhcPass p)) = SrcSpanAnnA
type instance Anno (RuleDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno (SourceText, RuleName) = EpAnn NoEpAnns
-type instance Anno (RuleBndr (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (SourceText, RuleName) = EpAnnCO
+type instance Anno (RuleBndr (GhcPass p)) = EpAnnCO
type instance Anno (WarnDecls (GhcPass p)) = SrcSpanAnnA
type instance Anno (WarnDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (AnnDecl (GhcPass p)) = SrcSpanAnnA
type instance Anno (RoleAnnotDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno (Maybe Role) = EpAnn NoEpAnns
+type instance Anno (Maybe Role) = EpAnnCO
type instance Anno CCallConv = SrcSpan
type instance Anno Safety = SrcSpan
type instance Anno CExportSpec = SrcSpan
=====================================
compiler/GHC/Hs/Dump.hs
=====================================
@@ -57,6 +57,7 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0
showAstData' =
generic
`ext1Q` list
+ `extQ` list_addEpAnn
`extQ` string `extQ` fastString `extQ` srcSpan `extQ` realSrcSpan
`extQ` annotation
`extQ` annotationModule
@@ -101,26 +102,20 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0
bytestring :: B.ByteString -> SDoc
bytestring = text . normalize_newlines . show
+ list_addEpAnn :: [AddEpAnn] -> SDoc
+ list_addEpAnn ls = case ba of
+ BlankEpAnnotations -> parens
+ $ text "blanked:" <+> text "[AddEpAnn]"
+ NoBlankEpAnnotations -> list ls
+
list [] = brackets empty
- list [x] = hideOr x (brackets (showAstData' x))
- list (x1 : x2 : xs) = hideOr x1
- ((text "[" <> showAstData' x1)
- $$ go x2 xs)
+ list [x] = brackets (showAstData' x)
+ list (x1 : x2 : xs) = (text "[" <> showAstData' x1)
+ $$ go x2 xs
where
go y [] = text "," <> showAstData' y <> text "]"
go y1 (y2 : ys) = (text "," <> showAstData' y1) $$ go y2 ys
- hideOr :: forall a .(Data a, Typeable a) => a -> SDoc -> SDoc
- hideOr x f = if hide x
- then text "blanked:[AddEpAnn]"
- else f
-
- hide :: forall a .(Data a, Typeable a) => a -> Bool
- hide x = ba == BlankEpAnnotations && isAddEpAnn x
-
- isAddEpAnn :: forall a .(Data a, Typeable a) => a -> Bool
- isAddEpAnn x = (showConstr (toConstr x)) == "AddEpAnn"
-
-- Eliminate word-size dependence
lit :: HsLit GhcPs -> SDoc
lit (HsWordPrim s x) = numericLit "HsWord{64}Prim" x s
=====================================
compiler/GHC/Hs/Expr.hs
=====================================
@@ -2199,26 +2199,26 @@ type instance Anno (HsCmd (GhcPass p)) = SrcSpanAnnA
type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (HsCmd (GhcPass pr))))]
= SrcSpanAnnL
-type instance Anno (HsCmdTop (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (HsCmdTop (GhcPass p)) = EpAnnCO
type instance Anno [LocatedA (Match (GhcPass p) (LocatedA (HsExpr (GhcPass p))))] = SrcSpanAnnL
type instance Anno [LocatedA (Match (GhcPass p) (LocatedA (HsCmd (GhcPass p))))] = SrcSpanAnnL
type instance Anno (Match (GhcPass p) (LocatedA (HsExpr (GhcPass p)))) = SrcSpanAnnA
type instance Anno (Match (GhcPass p) (LocatedA (HsCmd (GhcPass p)))) = SrcSpanAnnA
-type instance Anno (GRHS (GhcPass p) (LocatedA (HsExpr (GhcPass p)))) = EpAnn NoEpAnns
-type instance Anno (GRHS (GhcPass p) (LocatedA (HsCmd (GhcPass p)))) = EpAnn NoEpAnns
+type instance Anno (GRHS (GhcPass p) (LocatedA (HsExpr (GhcPass p)))) = EpAnnCO
+type instance Anno (GRHS (GhcPass p) (LocatedA (HsCmd (GhcPass p)))) = EpAnnCO
type instance Anno (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (body (GhcPass pr)))) = SrcSpanAnnA
type instance Anno (HsUntypedSplice (GhcPass p)) = SrcSpanAnnA
type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (body (GhcPass pr))))] = SrcSpanAnnL
-type instance Anno (FieldLabelStrings (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (FieldLabelStrings (GhcPass p)) = EpAnnCO
type instance Anno FieldLabelString = SrcSpanAnnN
-type instance Anno FastString = EpAnn NoEpAnns
+type instance Anno FastString = EpAnnCO
-- Used in HsQuasiQuote and perhaps elsewhere
-type instance Anno (DotFieldOcc (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (DotFieldOcc (GhcPass p)) = EpAnnCO
instance (HasAnnotation (Anno a))
=> WrapXRec (GhcPass p) a where
=====================================
compiler/GHC/Hs/Pat.hs
=====================================
@@ -862,7 +862,7 @@ collectEvVarsPat pat =
-}
type instance Anno (Pat (GhcPass p)) = SrcSpanAnnA
-type instance Anno (HsOverLit (GhcPass p)) = EpAnn NoEpAnns
+type instance Anno (HsOverLit (GhcPass p)) = EpAnnCO
type instance Anno ConLike = SrcSpanAnnN
type instance Anno (HsFieldBind lhs rhs) = SrcSpanAnnA
type instance Anno RecFieldsDotDot = SrcSpan
=====================================
compiler/GHC/Hs/Type.hs
=====================================
@@ -305,8 +305,8 @@ mkEmptyWildCardBndrs x = HsWC { hswc_body = x
--------------------------------------------------
-type instance XUserTyVar (GhcPass _) = EpAnn [AddEpAnn]
-type instance XKindedTyVar (GhcPass _) = EpAnn [AddEpAnn]
+type instance XUserTyVar (GhcPass _) = [AddEpAnn]
+type instance XKindedTyVar (GhcPass _) = [AddEpAnn]
type instance XXTyVarBndr (GhcPass _) = DataConCantHappen
@@ -349,7 +349,7 @@ type instance XXBndrVis (GhcPass _) = DataConCantHappen
type instance XForAllTy (GhcPass _) = NoExtField
type instance XQualTy (GhcPass _) = NoExtField
-type instance XTyVar (GhcPass _) = EpAnn [AddEpAnn]
+type instance XTyVar (GhcPass _) = [AddEpAnn]
type instance XAppTy (GhcPass _) = NoExtField
type instance XFunTy (GhcPass _) = NoExtField
type instance XListTy (GhcPass _) = AnnParen
@@ -359,7 +359,7 @@ type instance XOpTy (GhcPass _) = [AddEpAnn]
type instance XParTy (GhcPass _) = AnnParen
type instance XIParamTy (GhcPass _) = [AddEpAnn]
type instance XStarTy (GhcPass _) = NoExtField
-type instance XKindSig (GhcPass _) = EpAnn [AddEpAnn]
+type instance XKindSig (GhcPass _) = [AddEpAnn]
type instance XAppKindTy GhcPs = EpToken "@"
type instance XAppKindTy GhcRn = NoExtField
@@ -1480,7 +1480,7 @@ type instance Anno (HsTyVarBndr _flag GhcRn) = SrcSpanAnnA
type instance Anno (HsTyVarBndr _flag GhcTc) = SrcSpanAnnA
type instance Anno (HsOuterTyVarBndrs _ (GhcPass _)) = SrcSpanAnnA
-type instance Anno HsIPName = EpAnn NoEpAnns
+type instance Anno HsIPName = EpAnnCO
type instance Anno (ConDeclField (GhcPass p)) = SrcSpanAnnA
type instance Anno (FieldOcc (GhcPass p)) = SrcSpanAnnA
=====================================
compiler/GHC/Parser.y
=====================================
@@ -1941,7 +1941,7 @@ rule_vars :: { [LRuleTyTmVar] }
rule_var :: { LRuleTyTmVar }
: varid { sL1a $1 (RuleTyTmVar noAnn $1 Nothing) }
- | '(' varid '::' ctype ')' {% acsA (\cs -> sLL $1 $> (RuleTyTmVar (EpAnn (glEE $1 $>) [mop $1,mu AnnDcolon $3,mcp $5] cs) $2 (Just $4))) }
+ | '(' varid '::' ctype ')' {% amsA' (sLL $1 $> (RuleTyTmVar [mop $1,mu AnnDcolon $3,mcp $5] $2 (Just $4))) }
{- Note [Parsing explicit foralls in Rules]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2120,8 +2120,8 @@ opt_tyconsig :: { ([AddEpAnn], Maybe (LocatedN RdrName)) }
-- See Note [forall-or-nothing rule] in GHC.Hs.Type.
sigktype :: { LHsSigType GhcPs }
: sigtype { $1 }
- | ctype '::' kind {% acsA (\cs -> sLL $1 $> $ mkHsImplicitSigType $
- sLLa $1 $> $ HsKindSig (EpAnn (glEE $1 $>) [mu AnnDcolon $2] cs) $1 $3) }
+ | ctype '::' kind {% amsA' (sLL $1 $> $ mkHsImplicitSigType $
+ sLLa $1 $> $ HsKindSig [mu AnnDcolon $2] $1 $3) }
-- Like ctype, but for types that obey the forall-or-nothing rule.
-- See Note [forall-or-nothing rule] in GHC.Hs.Type. To avoid duplicating the
@@ -2161,7 +2161,7 @@ forall_telescope :: { Located (HsForAllTelescope GhcPs) }
-- A ktype is a ctype, possibly with a kind annotation
ktype :: { LHsType GhcPs }
: ctype { $1 }
- | ctype '::' kind {% acsA (\cs -> sLL $1 $> $ HsKindSig (EpAnn (glEE $1 $>) [mu AnnDcolon $2] cs) $1 $3) }
+ | ctype '::' kind {% amsA' (sLL $1 $> $ HsKindSig [mu AnnDcolon $2] $1 $3) }
-- A ctype is a for-all type
ctype :: { LHsType GhcPs }
@@ -2257,9 +2257,9 @@ tyop :: { (LocatedN RdrName, PromotionFlag) }
; return (op, IsPromoted) } }
atype :: { LHsType GhcPs }
- : ntgtycon {% acsA (\cs -> sL1 $1 (HsTyVar (EpAnn (glR $1) [] cs) NotPromoted $1)) } -- Not including unit tuples
+ : ntgtycon {% amsA' (sL1 $1 (HsTyVar [] NotPromoted $1)) } -- Not including unit tuples
-- See Note [%shift: atype -> tyvar]
- | tyvar %shift {% acsA (\cs -> sL1 $1 (HsTyVar (EpAnn (glR $1) [] cs) NotPromoted $1)) } -- (See Note [Unit tuples])
+ | tyvar %shift {% amsA' (sL1 $1 (HsTyVar [] NotPromoted $1)) } -- (See Note [Unit tuples])
| '*' {% do { warnStarIsType (getLoc $1)
; return $ sL1a $1 (HsStarTy noExtField (isUnicode $1)) } }
@@ -2283,12 +2283,12 @@ atype :: { LHsType GhcPs }
| quasiquote { mapLocA (HsSpliceTy noExtField) $1 }
| splice_untyped { mapLocA (HsSpliceTy noExtField) $1 }
-- see Note [Promotion] for the followings
- | SIMPLEQUOTE qcon_nowiredlist {% acsA (\cs -> sLL $1 $> $ HsTyVar (EpAnn (glEE $1 $>) [mj AnnSimpleQuote $1,mjN AnnName $2] cs) IsPromoted $2) }
+ | SIMPLEQUOTE qcon_nowiredlist {% amsA' (sLL $1 $> $ HsTyVar [mj AnnSimpleQuote $1,mjN AnnName $2] IsPromoted $2) }
| SIMPLEQUOTE '(' ktype ',' comma_types1 ')'
{% do { h <- addTrailingCommaA $3 (gl $4)
; amsA' (sLL $1 $> $ HsExplicitTupleTy [mj AnnSimpleQuote $1,mop $2,mcp $6] (h : $5)) }}
| SIMPLEQUOTE '[' comma_types0 ']' {% amsA' (sLL $1 $> $ HsExplicitListTy [mj AnnSimpleQuote $1,mos $2,mcs $4] IsPromoted $3) }
- | SIMPLEQUOTE var {% acsA (\cs -> sLL $1 $> $ HsTyVar (EpAnn (glEE $1 $>) [mj AnnSimpleQuote $1,mjN AnnName $2] cs) IsPromoted $2) }
+ | SIMPLEQUOTE var {% amsA' (sLL $1 $> $ HsTyVar [mj AnnSimpleQuote $1,mjN AnnName $2] IsPromoted $2) }
-- Two or more [ty, ty, ty] must be a promoted list type, just as
-- if you had written '[ty, ty, ty]
@@ -2306,7 +2306,7 @@ atype :: { LHsType GhcPs }
-- Type variables are never exported, so `M.tyvar` will be rejected by the renamer.
-- We let it pass the parser because the renamer can generate a better error message.
| QVARID {% let qname = mkQual tvName (getQVARID $1)
- in acsA (\cs -> sL1 $1 (HsTyVar (EpAnn (glEE $1 $>) [] cs) NotPromoted (sL1n $1 $ qname)))}
+ in amsA' (sL1 $1 (HsTyVar [] NotPromoted (sL1n $1 $ qname)))}
-- An inst_type is what occurs in the head of an instance decl
-- e.g. (Foo a, Gaz b) => Wibble a b
@@ -2341,12 +2341,12 @@ tv_bndrs :: { [LHsTyVarBndr Specificity GhcPs] }
tv_bndr :: { LHsTyVarBndr Specificity GhcPs }
: tv_bndr_no_braces { $1 }
- | '{' tyvar '}' {% acsA (\cs -> sLL $1 $> (UserTyVar (EpAnn (glEE $1 $>) [moc $1, mcc $3] cs) InferredSpec $2)) }
- | '{' tyvar '::' kind '}' {% acsA (\cs -> sLL $1 $> (KindedTyVar (EpAnn (glEE $1 $>) [moc $1,mu AnnDcolon $3 ,mcc $5] cs) InferredSpec $2 $4)) }
+ | '{' tyvar '}' {% amsA' (sLL $1 $> (UserTyVar [moc $1, mcc $3] InferredSpec $2)) }
+ | '{' tyvar '::' kind '}' {% amsA' (sLL $1 $> (KindedTyVar [moc $1,mu AnnDcolon $3 ,mcc $5] InferredSpec $2 $4)) }
tv_bndr_no_braces :: { LHsTyVarBndr Specificity GhcPs }
- : tyvar {% acsA (\cs -> (sL1 $1 (UserTyVar (EpAnn (glR $1) [] cs) SpecifiedSpec $1))) }
- | '(' tyvar '::' kind ')' {% acsA (\cs -> (sLL $1 $> (KindedTyVar (EpAnn (glEE $1 $>) [mop $1,mu AnnDcolon $3 ,mcp $5] cs) SpecifiedSpec $2 $4))) }
+ : tyvar {% amsA' (sL1 $1 (UserTyVar [] SpecifiedSpec $1)) }
+ | '(' tyvar '::' kind ')' {% amsA' (sLL $1 $> (KindedTyVar [mop $1,mu AnnDcolon $3 ,mcp $5] SpecifiedSpec $2 $4)) }
fds :: { Located ([AddEpAnn],[LHsFunDep GhcPs]) }
: {- empty -} { noLoc ([],[]) }
@@ -2998,7 +2998,7 @@ aexp2 :: { ECP }
| '_' { ECP $ pvA $ mkHsWildCardPV (getLoc $1) }
-- Template Haskell Extension
- | splice_untyped { ECP $ pvA $ mkHsSplicePV $1 }
+ | splice_untyped { ECP $ pvA' $ mkHsSplicePV $1 }
| splice_typed { ecpFromExp $ fmap (uncurry HsTypedSplice) (reLoc $1) }
| SIMPLEQUOTE qvar {% fmap ecpFromExp $ amsA' (sLL $1 $> $ HsUntypedBracket [mj AnnSimpleQuote $1] (VarBr noExtField True $2)) }
@@ -3021,7 +3021,7 @@ aexp2 :: { ECP }
amsA' (sLL $1 $> $ HsUntypedBracket [mo $1,mu AnnCloseQ $3] (PatBr noExtField p)) }
| '[d|' cvtopbody '|]' {% fmap ecpFromExp $
amsA' (sLL $1 $> $ HsUntypedBracket (mo $1:mu AnnCloseQ $3:fst $2) (DecBrL noExtField (snd $2))) }
- | quasiquote { ECP $ pvA $ mkHsSplicePV $1 }
+ | quasiquote { ECP $ pvA' $ mkHsSplicePV $1 }
-- arrow notation extension
| '(|' aexp cmdargs '|)' {% runPV (unECP $2) >>= \ $2 ->
=====================================
compiler/GHC/Parser/PostProcess.hs
=====================================
@@ -944,39 +944,37 @@ checkTyVars pp_what equals_or_where tc tparms
= do { tvs <- mapM check tparms
; return (mkHsQTvs tvs) }
where
- check (HsTypeArg at ki) = chkParens [] [] emptyComments (HsBndrInvisible at) ki
- check (HsValArg _ ty) = chkParens [] [] emptyComments (HsBndrRequired noExtField) ty
+ check (HsTypeArg at ki) = chkParens [] [] (HsBndrInvisible at) ki
+ check (HsValArg _ ty) = chkParens [] [] (HsBndrRequired noExtField) ty
check (HsArgPar sp) = addFatalError $ mkPlainErrorMsgEnvelope sp $
(PsErrMalformedDecl pp_what (unLoc tc))
-- Keep around an action for adjusting the annotations of extra parens
- chkParens :: [AddEpAnn] -> [AddEpAnn] -> EpAnnComments -> HsBndrVis GhcPs -> LHsType GhcPs
+ chkParens :: [AddEpAnn] -> [AddEpAnn] -> HsBndrVis GhcPs -> LHsType GhcPs
-> P (LHsTyVarBndr (HsBndrVis GhcPs) GhcPs)
- chkParens ops cps cs bvis (L l (HsParTy _ ty))
+ chkParens ops cps bvis (L l (HsParTy _ ty))
= let
(o,c) = mkParensEpAnn (realSrcSpan $ locA l)
in
- chkParens (o:ops) (c:cps) cs bvis ty
- chkParens ops cps cs bvis ty = chk ops cps cs bvis ty
+ chkParens (o:ops) (c:cps) bvis ty
+ chkParens ops cps bvis ty = chk ops cps bvis ty
-- Check that the name space is correct!
- chk :: [AddEpAnn] -> [AddEpAnn] -> EpAnnComments -> HsBndrVis GhcPs -> LHsType GhcPs -> P (LHsTyVarBndr (HsBndrVis GhcPs) GhcPs)
- chk ops cps cs bvis (L l (HsKindSig annk (L annt (HsTyVar ann _ (L lv tv))) k))
+ chk :: [AddEpAnn] -> [AddEpAnn] -> HsBndrVis GhcPs -> LHsType GhcPs -> P (LHsTyVarBndr (HsBndrVis GhcPs) GhcPs)
+ chk ops cps bvis (L l (HsKindSig annk (L annt (HsTyVar ann _ (L lv tv))) k))
| isRdrTyVar tv
= let
an = (reverse ops) ++ cps
in
return (L (widenLocatedAn (l Semi.<> annt) (for_widening bvis:an))
- (KindedTyVar (addAnns (annk Semi.<> ann Semi.<> for_widening_ann bvis) an cs)
- bvis (L lv tv) k))
- chk ops cps cs bvis (L l (HsTyVar ann _ (L ltv tv)))
+ (KindedTyVar (an ++ annk ++ ann) bvis (L lv tv) k))
+ chk ops cps bvis (L l (HsTyVar ann _ (L ltv tv)))
| isRdrTyVar tv
= let
an = (reverse ops) ++ cps
in
return (L (widenLocatedAn l (for_widening bvis:an))
- (UserTyVar (addAnns (ann Semi.<> for_widening_ann bvis) an cs)
- bvis (L ltv tv)))
- chk _ _ _ _ t@(L loc _)
+ (UserTyVar (an ++ ann) bvis (L ltv tv)))
+ chk _ _ _ t@(L loc _)
= addFatalError $ mkPlainErrorMsgEnvelope (locA loc) $
(PsErrUnexpectedTypeInDecl t pp_what (unLoc tc) tparms equals_or_where)
@@ -985,11 +983,6 @@ checkTyVars pp_what equals_or_where tc tparms
for_widening (HsBndrInvisible (EpTok loc)) = AddEpAnn AnnAnyclass loc
for_widening _ = AddEpAnn AnnAnyclass (EpaDelta (SameLine 0) [])
- for_widening_ann :: HsBndrVis GhcPs -> EpAnn [AddEpAnn]
- for_widening_ann (HsBndrInvisible (EpTok (EpaSpan (RealSrcSpan r _mb))))
- = EpAnn (realSpanAsAnchor r) [] emptyComments
- for_widening_ann _ = noAnn
-
whereDots, equalsDots :: SDoc
-- Second argument to checkTyVars
@@ -1004,7 +997,7 @@ checkDatatypeContext (Just c)
(PsErrIllegalDataTypeContext c)
type LRuleTyTmVar = LocatedAn NoEpAnns RuleTyTmVar
-data RuleTyTmVar = RuleTyTmVar (EpAnn [AddEpAnn]) (LocatedN RdrName) (Maybe (LHsType GhcPs))
+data RuleTyTmVar = RuleTyTmVar [AddEpAnn] (LocatedN RdrName) (Maybe (LHsType GhcPs))
-- ^ Essentially a wrapper for a @RuleBndr GhcPs@
-- turns RuleTyTmVars into RuleBnrs - this is straightforward
@@ -1523,7 +1516,7 @@ instance DisambInfixOp RdrName where
mkHsInfixHolePV (L l _) = addFatalError $ mkPlainErrorMsgEnvelope (getHasLoc l) $ PsErrInvalidInfixHole
type AnnoBody b
- = ( Anno (GRHS GhcPs (LocatedA (Body b GhcPs))) ~ EpAnn NoEpAnns
+ = ( Anno (GRHS GhcPs (LocatedA (Body b GhcPs))) ~ EpAnnCO
, Anno [LocatedA (Match GhcPs (LocatedA (Body b GhcPs)))] ~ SrcSpanAnnL
, Anno (Match GhcPs (LocatedA (Body b GhcPs))) ~ SrcSpanAnnA
, Anno (StmtLR GhcPs GhcPs (LocatedA (Body (Body b GhcPs) GhcPs))) ~ SrcSpanAnnA
@@ -1608,7 +1601,7 @@ class (b ~ (Body b) GhcPs, AnnoBody b) => DisambECP b where
-- | Disambiguate "[a,b,c]" (list syntax)
mkHsExplicitListPV :: SrcSpan -> [LocatedA b] -> AnnList -> PV (LocatedA b)
-- | Disambiguate "$(...)" and "[quasi|...|]" (TH splices)
- mkHsSplicePV :: Located (HsUntypedSplice GhcPs) -> PV (Located b)
+ mkHsSplicePV :: Located (HsUntypedSplice GhcPs) -> PV (LocatedA b)
-- | Disambiguate "f { a = b, ... }" syntax (record construction and record updates)
mkHsRecordPV ::
Bool -> -- Is OverloadedRecordUpdate in effect?
@@ -1833,13 +1826,13 @@ instance DisambECP (HsExpr GhcPs) where
mkHsExplicitListPV l xs anns = do
cs <- getCommentsFor l
return $ L (EpAnn (spanAsAnchor l) noAnn cs) (ExplicitList anns xs)
- mkHsSplicePV sp@(L l _) = do
+ mkHsSplicePV (L l a) = do
cs <- getCommentsFor l
- return $ fmap (HsUntypedSplice NoExtField) sp
+ return $ fmap (HsUntypedSplice NoExtField) (L (EpAnn (spanAsAnchor l) noAnn cs) a)
mkHsRecordPV opts l lrec a (fbinds, ddLoc) anns = do
cs <- getCommentsFor l
r <- mkRecConstrOrUpdate opts a lrec (fbinds, ddLoc) anns
- checkRecordSyntax (L (noAnnSrcSpan l) r)
+ checkRecordSyntax (L (EpAnn (spanAsAnchor l) noAnn cs) r)
mkHsNegAppPV l a anns = do
cs <- getCommentsFor l
return $ L (EpAnn (spanAsAnchor l) noAnn cs) (NegApp anns a noSyntaxExpr)
@@ -1909,7 +1902,9 @@ instance DisambECP (PatBuilder GhcPs) where
ps <- traverse checkLPat xs
cs <- getCommentsFor l
return (L (noAnnSrcSpan l) (PatBuilderPat (ListPat (EpAnn (spanAsAnchor l) anns cs) ps)))
- mkHsSplicePV (L l sp) = return $ L l (PatBuilderPat (SplicePat noExtField sp))
+ mkHsSplicePV (L l sp) = do
+ cs <- getCommentsFor l
+ return $ L (EpAnn (spanAsAnchor l) noAnn cs) (PatBuilderPat (SplicePat noExtField sp))
mkHsRecordPV _ l _ a (fbinds, ddLoc) anns = do
let (fs, ps) = partitionEithers fbinds
if not (null ps)
=====================================
compiler/GHC/Parser/Types.hs
=====================================
@@ -62,7 +62,7 @@ data PatBuilder p
| PatBuilderOverLit (HsOverLit GhcPs)
-- These instances are here so that they are not orphans
-type instance Anno (GRHS GhcPs (LocatedA (PatBuilder GhcPs))) = EpAnn NoEpAnns
+type instance Anno (GRHS GhcPs (LocatedA (PatBuilder GhcPs))) = EpAnnCO
type instance Anno [LocatedA (Match GhcPs (LocatedA (PatBuilder GhcPs)))] = SrcSpanAnnL
type instance Anno (Match GhcPs (LocatedA (PatBuilder GhcPs))) = SrcSpanAnnA
type instance Anno (StmtLR GhcPs GhcPs (LocatedA (PatBuilder GhcPs))) = SrcSpanAnnA
=====================================
compiler/GHC/Rename/Bind.hs
=====================================
@@ -1242,8 +1242,8 @@ type AnnoBody body
, Anno [LocatedA (Match GhcPs (LocatedA (body GhcPs)))] ~ SrcSpanAnnL
, Anno (Match GhcRn (LocatedA (body GhcRn))) ~ SrcSpanAnnA
, Anno (Match GhcPs (LocatedA (body GhcPs))) ~ SrcSpanAnnA
- , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ EpAnn NoEpAnns
- , Anno (GRHS GhcPs (LocatedA (body GhcPs))) ~ EpAnn NoEpAnns
+ , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ EpAnnCO
+ , Anno (GRHS GhcPs (LocatedA (body GhcPs))) ~ EpAnnCO
, Outputable (body GhcPs)
)
=====================================
compiler/GHC/Tc/Gen/Match.hs
=====================================
@@ -203,8 +203,8 @@ type AnnoBody body
, Anno (Match GhcTc (LocatedA (body GhcTc))) ~ SrcSpanAnnA
, Anno [LocatedA (Match GhcRn (LocatedA (body GhcRn)))] ~ SrcSpanAnnL
, Anno [LocatedA (Match GhcTc (LocatedA (body GhcTc)))] ~ SrcSpanAnnL
- , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ EpAnn NoEpAnns
- , Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
+ , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ EpAnnCO
+ , Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnnCO
, Anno (StmtLR GhcRn GhcRn (LocatedA (body GhcRn))) ~ SrcSpanAnnA
, Anno (StmtLR GhcTc GhcTc (LocatedA (body GhcTc))) ~ SrcSpanAnnA
)
=====================================
compiler/GHC/Tc/Zonk/Type.hs
=====================================
@@ -850,7 +850,7 @@ zonkLTcSpecPrags ps
************************************************************************
-}
-zonkMatchGroup :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
+zonkMatchGroup :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnnCO
=> (LocatedA (body GhcTc) -> ZonkTcM (LocatedA (body GhcTc)))
-> MatchGroup GhcTc (LocatedA (body GhcTc))
-> ZonkTcM (MatchGroup GhcTc (LocatedA (body GhcTc)))
@@ -864,7 +864,7 @@ zonkMatchGroup zBody (MG { mg_alts = L l ms
, mg_ext = MatchGroupTc arg_tys' res_ty' origin
}) }
-zonkMatch :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
+zonkMatch :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnnCO
=> (LocatedA (body GhcTc) -> ZonkTcM (LocatedA (body GhcTc)))
-> LMatch GhcTc (LocatedA (body GhcTc))
-> ZonkTcM (LMatch GhcTc (LocatedA (body GhcTc)))
@@ -875,7 +875,7 @@ zonkMatch zBody (L loc match@(Match { m_pats = pats
; return (L loc (match { m_pats = new_pats, m_grhss = new_grhss })) }
-------------------------------------------------------------------------
-zonkGRHSs :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
+zonkGRHSs :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnnCO
=> (LocatedA (body GhcTc) -> ZonkTcM (LocatedA (body GhcTc)))
-> GRHSs GhcTc (LocatedA (body GhcTc))
-> ZonkTcM (GRHSs GhcTc (LocatedA (body GhcTc)))
=====================================
testsuite/tests/ghc-api/exactprint/Test20239.stderr
=====================================
@@ -99,11 +99,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { Test20239.hs:5:22-32 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -163,11 +159,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { Test20239.hs:5:51-55 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -244,11 +236,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { Test20239.hs:7:51-60 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -276,11 +264,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { Test20239.hs:7:65-66 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -329,11 +313,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { Test20239.hs:7:69-74 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -352,11 +332,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { Test20239.hs:7:76-81 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
=====================================
@@ -73,11 +73,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:5:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -148,11 +144,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:6:9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -180,11 +172,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:6:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -252,11 +240,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:9:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -327,11 +311,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:10:9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -350,11 +330,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:10:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -429,11 +405,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:13:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -504,11 +476,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:14:9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -527,11 +495,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:14:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -609,11 +573,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:17:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -684,11 +644,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:18:9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -707,11 +663,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:18:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -779,11 +731,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:20:9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -802,11 +750,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:20:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -867,11 +811,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:22:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -922,11 +862,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:22:28 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -999,11 +935,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:23:10-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1022,11 +954,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:23:13-15 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1077,11 +1005,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:24:11-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1158,11 +1082,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:25:13-14 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1181,11 +1101,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:25:16-18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1244,11 +1160,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:28:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -1299,11 +1211,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:28:28 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -1376,11 +1284,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:29:10-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1399,11 +1303,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:29:13-15 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1454,11 +1354,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:30:11-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1535,11 +1431,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:31:13-14 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1558,11 +1450,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:31:16-18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1621,11 +1509,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:34:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -1676,11 +1560,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:34:28 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -1753,11 +1633,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:35:10-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1776,11 +1652,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:35:13-15 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1831,11 +1703,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:36:11-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1912,11 +1780,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:37:13-14 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1935,11 +1799,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:37:16-18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1998,11 +1858,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:40:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2053,11 +1909,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:40:28 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2130,11 +1982,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:41:10-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2153,11 +2001,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:41:13-15 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2208,11 +2052,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:42:11-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2289,11 +2129,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:43:13-14 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2312,11 +2148,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:43:16-18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2375,11 +2207,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:46:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2430,11 +2258,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:46:28 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2507,11 +2331,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:47:10-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2530,11 +2350,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:47:13-15 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2585,11 +2401,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:48:11-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2666,11 +2478,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:49:13-14 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2689,11 +2497,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:49:16-18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2752,11 +2556,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:52:11 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2807,11 +2607,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544.hs:52:30 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2884,11 +2680,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:53:10-12 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2907,11 +2699,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:53:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2962,11 +2750,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:54:12-14 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -3043,11 +2827,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:55:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -3066,11 +2846,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544.hs:55:18-20 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
=====================================
@@ -130,11 +130,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544_kw.hs:16:18-20 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -261,11 +257,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544_kw.hs:19:24-26 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -330,11 +322,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T17544_kw.hs:21:11 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -392,11 +380,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T17544_kw.hs:24:18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/DumpParsedAst.stderr
=====================================
@@ -174,11 +174,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:7:26-30 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -260,11 +256,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:9:17 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -283,11 +275,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:9:23-27 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -376,11 +364,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:11:11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -408,11 +392,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:11:15-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -441,11 +421,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:11:21-24 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -485,11 +461,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:11:27-32 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -508,11 +480,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:11:34-35 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -571,11 +539,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:12:21-24 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -606,13 +570,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:10:20-30 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:10:24-25 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:10:20 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:10:30 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:10:20 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:10:30 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:10:24-25 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -644,11 +604,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:10:28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -676,11 +632,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:10:35-39 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -727,11 +679,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:15:8 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -751,13 +699,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:15:10-17 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:15:13-14 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:15:10 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:15:17 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:15:10 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:15:17 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:15:13-14 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -777,11 +721,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:15:16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -861,11 +801,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:15:26 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -884,11 +820,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:15:28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -958,11 +890,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:17:12 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1019,11 +947,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:17:18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1042,11 +966,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:17:23-26 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1065,11 +985,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:17:32-35 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1137,11 +1053,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:7-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1162,11 +1074,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1187,11 +1095,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:15 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1239,11 +1143,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:19 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1262,11 +1162,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:22-26 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1285,11 +1181,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1308,11 +1200,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:19:30 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1343,13 +1231,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:18:16-23 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:18:19-20 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:18:16 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:18:23 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:18:16 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:18:23 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:18:19-20 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -1369,11 +1253,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:18:22 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1392,13 +1272,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:18:25-40 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:18:28-29 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:18:25 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:18:40 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:18:25 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:18:40 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:18:28-29 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -1431,11 +1307,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:18:31 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1454,11 +1326,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:18:36-39 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1486,11 +1354,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:18:45-48 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1565,11 +1429,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:21:20 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1601,11 +1461,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:21:25 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1624,11 +1480,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:21:30-33 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1694,11 +1546,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:23-36 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:22:25-26 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:22:25-26 }))]
(L
(EpAnn
(EpaSpan { DumpParsedAst.hs:22:23 })
@@ -1707,11 +1555,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:23 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1743,11 +1587,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1766,11 +1606,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:33-36 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1833,11 +1669,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:43 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1856,11 +1688,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:48-51 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1879,11 +1707,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:22:57-60 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1977,11 +1801,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:18-19 })
- []
- (EpaComments
- []))
+ []
(SpecifiedSpec)
(L
(EpAnn
@@ -2022,11 +1842,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:22 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2045,11 +1861,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:24-25 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2077,11 +1889,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:30 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2100,11 +1908,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:32-33 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2141,11 +1945,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:39-41 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2164,11 +1964,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:43 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2187,11 +1983,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpParsedAst.hs:23:45 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
=====================================
@@ -217,11 +217,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -311,11 +307,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -341,11 +333,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -373,11 +361,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -416,11 +400,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -438,11 +418,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -497,11 +473,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -530,13 +502,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:12:20-30 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:12:24-25 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:12:20 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:12:30 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:12:20 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:12:30 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:12:24-25 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -567,11 +535,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -598,11 +562,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -673,11 +633,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -695,11 +651,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -768,11 +720,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -801,11 +749,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -823,11 +767,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -889,11 +829,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:19:23-36 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:19:25-26 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:19:25-26 }))]
(L
(EpAnn
(EpaSpan { DumpRenamedAst.hs:19:23 })
@@ -902,11 +838,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -935,11 +867,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -957,11 +885,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1019,11 +943,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1041,11 +961,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1063,11 +979,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1150,11 +1062,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:20:18-19 })
- []
- (EpaComments
- []))
+ []
(SpecifiedSpec)
(L
(EpAnn
@@ -1192,11 +1100,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1214,11 +1118,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1245,11 +1145,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1267,11 +1163,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1307,11 +1199,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1329,11 +1217,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1351,11 +1235,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1400,11 +1280,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:22:8 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -1423,13 +1299,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:22:10-17 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:22:13-14 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:22:10 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:22:17 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:22:10 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:22:17 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:22:13-14 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -1448,11 +1320,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1524,11 +1392,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1546,11 +1410,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1618,11 +1478,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1642,11 +1498,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1666,11 +1518,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1716,11 +1564,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1738,11 +1582,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1760,11 +1600,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1782,11 +1618,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1815,13 +1647,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:25:16-23 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:25:19-20 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:25:16 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:25:23 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:25:16 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:25:23 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:25:19-20 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -1840,11 +1668,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1862,13 +1686,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:25:25-40 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:25:28-29 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:25:25 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:25:40 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:25:25 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:25:40 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:25:28-29 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -1898,11 +1718,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1920,11 +1736,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1951,11 +1763,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2014,11 +1822,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2070,11 +1874,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2092,11 +1892,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2114,11 +1910,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2160,11 +1952,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:28:9 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2213,11 +2001,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:29:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2236,11 +2020,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { DumpRenamedAst.hs:29:12 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -2304,11 +2084,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2338,11 +2114,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2406,11 +2178,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2430,11 +2198,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2471,11 +2235,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2493,11 +2253,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -2515,11 +2271,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/DumpSemis.stderr
=====================================
@@ -197,11 +197,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:9:8-9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -498,11 +494,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:14:8-9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -762,11 +754,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:21:8-9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1330,15 +1318,11 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:28:22-38 })
- [(AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:28:30-31 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpSemis.hs:28:22 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { DumpSemis.hs:28:23 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpSemis.hs:28:37 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { DumpSemis.hs:28:38 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { DumpSemis.hs:28:22 }))
+ ,(AddEpAnn AnnOpenP (EpaSpan { DumpSemis.hs:28:23 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpSemis.hs:28:37 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { DumpSemis.hs:28:38 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:28:30-31 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -1358,11 +1342,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:28:33-36 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1432,11 +1412,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:29:12-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1455,11 +1431,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:29:21-23 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1555,11 +1527,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:31:8-9 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1578,11 +1546,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:31:11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1610,11 +1574,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:31:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1633,11 +1593,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:31:18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1669,11 +1625,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:31:25 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1692,11 +1644,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { DumpSemis.hs:31:30 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/KindSigs.stderr
=====================================
@@ -123,11 +123,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:12:7 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -147,11 +143,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:12:11-21 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:12:15-16 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:12:15-16 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:12:11-13 })
@@ -160,11 +152,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:12:11-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -183,11 +171,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:12:18-21 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -218,11 +202,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:11:17 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -279,11 +259,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:10 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -318,11 +294,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:15:16-26 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:20-21 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:20-21 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:15:16-18 })
@@ -331,11 +303,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:16-18 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -354,11 +322,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:23-26 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -378,11 +342,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:29-32 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -401,11 +361,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:15:35-49 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:43-44 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:43-44 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:15:35-41 })
@@ -423,11 +379,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:35-39 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -446,11 +398,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:41 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -469,11 +417,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:15:46-49 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -519,11 +463,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:11 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -558,11 +498,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:16:18-28 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:22-23 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:22-23 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:16:18-20 })
@@ -571,11 +507,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:18-20 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -594,11 +526,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:25-28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -618,11 +546,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:31-34 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -641,11 +565,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:16:37-51 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:45-46 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:45-46 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:16:37-43 })
@@ -663,11 +583,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:37-41 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -686,11 +602,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:43 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -709,11 +621,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:16:48-51 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -773,11 +681,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:19:14-24 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:19:18-19 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:19:18-19 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:19:14-16 })
@@ -786,11 +690,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:19:14-16 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -809,11 +709,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:19:21-24 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -896,11 +792,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:22:9-19 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:13-14 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:13-14 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:22:9-11 })
@@ -909,11 +801,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:22:9-11 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -932,11 +820,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:22:16-19 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -968,11 +852,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:22:25-28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1003,11 +883,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:22:34-43 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:37-38 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:37-38 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:22:34-35 })
@@ -1030,11 +906,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:22:40-43 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1211,11 +1083,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:26:16-27 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:26:21-22 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:26:21-22 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:26:16-19 })
@@ -1224,11 +1092,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:26:16-19 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1247,11 +1111,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:26:24-27 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1311,11 +1171,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:27:16-27 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:21-22 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:21-22 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:27:16-19 })
@@ -1324,11 +1180,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:27:16-19 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1347,11 +1199,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:27:24-27 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1370,11 +1218,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:27:30-42 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:36-37 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:36-37 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:27:30-34 })
@@ -1383,11 +1227,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:27:30-34 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1406,11 +1246,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:27:39-42 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1456,11 +1292,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:28:12 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -1493,11 +1325,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:28:19-39 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:28:31-32 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:28:31-32 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:28:19-29 })
@@ -1518,11 +1346,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:28:20-22 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1541,11 +1365,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:28:25-28 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1576,11 +1396,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:28:35-38 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1599,11 +1415,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:28:42 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1651,11 +1463,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:31:21-31 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:31:25-26 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:31:25-26 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:31:21-23 })
@@ -1664,11 +1472,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:31:21-23 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1687,11 +1491,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:31:28-31 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1761,11 +1561,7 @@
(EpaComments
[]))
(HsKindSig
- (EpAnn
- (EpaSpan { KindSigs.hs:34:10-21 })
- [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:34:15-16 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:34:15-16 }))]
(L
(EpAnn
(EpaSpan { KindSigs.hs:34:10-13 })
@@ -1774,11 +1570,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:34:10-13 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -1797,11 +1589,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { KindSigs.hs:34:18-21 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/T14189.stderr
=====================================
@@ -52,11 +52,7 @@
(EpaComments
[]))
(ConDeclH98
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ (NoExtField)
(L
(EpAnn
(EpaSpan { T14189.hs:6:15-16 })
@@ -81,11 +77,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -105,11 +97,7 @@
(EpaComments
[]))
(ConDeclH98
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ (NoExtField)
(L
(EpAnn
(EpaSpan { T14189.hs:6:24-25 })
@@ -133,11 +121,7 @@
(EpaComments
[]))
(ConDeclH98
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ (NoExtField)
(L
(EpAnn
(EpaSpan { T14189.hs:6:29 })
@@ -203,11 +187,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaDelta (SameLine 0) [])
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/T15323.stderr
=====================================
@@ -68,11 +68,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T15323.hs:5:19 })
- []
- (EpaComments
- []))
+ []
(HsBndrRequired
(NoExtField))
(L
@@ -143,11 +139,7 @@
(EpaComments
[]))
(UserTyVar
- (EpAnn
- (EpaSpan { T15323.hs:6:27 })
- []
- (EpaComments
- []))
+ []
(SpecifiedSpec)
(L
(EpAnn
@@ -200,11 +192,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T15323.hs:6:32-33 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -223,11 +211,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T15323.hs:6:35 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -258,11 +242,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T15323.hs:6:41-52 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -281,11 +261,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T15323.hs:6:54 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/parser/should_compile/T20452.stderr
=====================================
@@ -68,13 +68,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:5:14-21 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:5:17-18 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:5:14 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:5:21 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:5:14 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:5:21 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:5:17-18 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -94,11 +90,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:5:20 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -182,15 +174,11 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:6:13-22 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:6:17-18 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:6:13 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:6:14 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:6:21 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:6:22 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:6:13 }))
+ ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:6:14 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:6:21 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:6:22 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:6:17-18 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -210,11 +198,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:6:20 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -308,13 +292,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:15-26 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:8:20-21 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:8:15 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:8:26 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:8:15 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:8:26 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:8:20-21 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -334,11 +314,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:23-25 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -357,13 +333,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:30-45 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:8:36-37 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:8:30 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:8:45 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:8:30 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:8:45 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:8:36-37 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -383,11 +355,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:39-44 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -406,13 +374,9 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:49-75 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:8:54-55 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:8:49 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:8:75 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:8:49 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:8:75 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:8:54-55 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -458,11 +422,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:59-64 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -481,11 +441,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:8:67-72 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -549,15 +505,11 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:14-27 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:9:20-21 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:14 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:15 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:26 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:27 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:14 }))
+ ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:15 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:26 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:27 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:9:20-21 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -577,11 +529,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:23-25 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -600,15 +548,11 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:29-46 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:9:36-37 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:29 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:30 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:45 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:46 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:29 }))
+ ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:30 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:45 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:46 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:9:36-37 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -628,11 +572,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:39-44 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -651,15 +591,11 @@
(EpaComments
[]))
(KindedTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:48-76 })
- [(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:9:54-55 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:48 }))
- ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:49 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:75 }))
- ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:76 }))]
- (EpaComments
- []))
+ [(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:48 }))
+ ,(AddEpAnn AnnOpenP (EpaSpan { T20452.hs:9:49 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:75 }))
+ ,(AddEpAnn AnnCloseP (EpaSpan { T20452.hs:9:76 }))
+ ,(AddEpAnn AnnDcolon (EpaSpan { T20452.hs:9:54-55 }))]
(HsBndrRequired
(NoExtField))
(L
@@ -705,11 +641,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:59-64 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -728,11 +660,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T20452.hs:9:67-72 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
testsuite/tests/printer/T18791.stderr
=====================================
@@ -122,11 +122,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T18791.hs:5:10-12 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
@@ -145,11 +141,7 @@
(EpaComments
[]))
(HsTyVar
- (EpAnn
- (EpaSpan { T18791.hs:5:17 })
- []
- (EpaComments
- []))
+ []
(NotPromoted)
(L
(EpAnn
=====================================
utils/check-exact/ExactPrint.hs
=====================================
@@ -2204,11 +2204,11 @@ instance ExactPrint (RuleBndr GhcPs) where
ln' <- markAnnotated ln
return (RuleBndr x ln')
exact (RuleBndrSig an ln (HsPS x ty)) = do
- an0 <- markEpAnnL an lidl AnnOpenP -- "("
+ an0 <- markEpAnnL' an lidl AnnOpenP -- "("
ln' <- markAnnotated ln
- an1 <- markEpAnnL an0 lidl AnnDcolon
+ an1 <- markEpAnnL' an0 lidl AnnDcolon
ty' <- markAnnotated ty
- an2 <- markEpAnnL an1 lidl AnnCloseP -- ")"
+ an2 <- markEpAnnL' an1 lidl AnnCloseP -- ")"
return (RuleBndrSig an2 ln' (HsPS x ty'))
-- ---------------------------------------------------------------------
@@ -3941,21 +3941,21 @@ instance ExactPrint (InjectivityAnn GhcPs) where
class Typeable flag => ExactPrintTVFlag flag where
exactTVDelimiters :: (Monad m, Monoid w)
- => EpAnn [AddEpAnn] -> flag -> EP w m (HsTyVarBndr flag GhcPs)
- -> EP w m (EpAnn [AddEpAnn], (HsTyVarBndr flag GhcPs))
+ => [AddEpAnn] -> flag -> EP w m (HsTyVarBndr flag GhcPs)
+ -> EP w m ([AddEpAnn], (HsTyVarBndr flag GhcPs))
instance ExactPrintTVFlag () where
exactTVDelimiters an _ thing_inside = do
- an0 <- markEpAnnAllL an lid AnnOpenP
+ an0 <- markEpAnnAllL' an lid AnnOpenP
r <- thing_inside
- an1 <- markEpAnnAllL an0 lid AnnCloseP
+ an1 <- markEpAnnAllL' an0 lid AnnCloseP
return (an1, r)
instance ExactPrintTVFlag Specificity where
exactTVDelimiters an s thing_inside = do
- an0 <- markEpAnnAllL an lid open
+ an0 <- markEpAnnAllL' an lid open
r <- thing_inside
- an1 <- markEpAnnAllL an0 lid close
+ an1 <- markEpAnnAllL' an0 lid close
return (an1, r)
where
(open, close) = case s of
@@ -3967,17 +3967,14 @@ instance ExactPrintTVFlag (HsBndrVis GhcPs) where
case bvis of
HsBndrRequired _ -> return ()
HsBndrInvisible at -> markEpToken at >> return ()
- an1 <- markEpAnnAllL an0 lid AnnOpenP
+ an1 <- markEpAnnAllL' an0 lid AnnOpenP
r <- thing_inside
- an2 <- markEpAnnAllL an1 lid AnnCloseP
+ an2 <- markEpAnnAllL' an1 lid AnnCloseP
return (an2, r)
instance ExactPrintTVFlag flag => ExactPrint (HsTyVarBndr flag GhcPs) where
- getAnnotationEntry (UserTyVar an _ _) = fromAnn an
- getAnnotationEntry (KindedTyVar an _ _ _) = fromAnn an
-
- setAnnotationAnchor (UserTyVar an a b) anc ts cs = UserTyVar (setAnchorEpa an anc ts cs) a b
- setAnnotationAnchor (KindedTyVar an a b c) anc ts cs = KindedTyVar (setAnchorEpa an anc ts cs) a b c
+ getAnnotationEntry _ = NoEntryVal
+ setAnnotationAnchor a _ _ _ = a
exact (UserTyVar an flag n) = do
r <- exactTVDelimiters an flag $ do
@@ -3989,7 +3986,7 @@ instance ExactPrintTVFlag flag => ExactPrint (HsTyVarBndr flag GhcPs) where
exact (KindedTyVar an flag n k) = do
r <- exactTVDelimiters an flag $ do
n' <- markAnnotated n
- an0 <- markEpAnnL an lidl AnnDcolon
+ an0 <- markEpAnnL' an lidl AnnDcolon
k' <- markAnnotated k
return (KindedTyVar an0 flag n' k')
case r of
@@ -3999,53 +3996,8 @@ instance ExactPrintTVFlag flag => ExactPrint (HsTyVarBndr flag GhcPs) where
-- ---------------------------------------------------------------------
instance ExactPrint (HsType GhcPs) where
- getAnnotationEntry (HsForAllTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsQualTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsTyVar an _ _) = fromAnn an
- getAnnotationEntry (HsAppTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsAppKindTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsFunTy _ _ _ _) = NoEntryVal
- getAnnotationEntry (HsListTy _ _) = NoEntryVal
- getAnnotationEntry (HsTupleTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsSumTy _ _) = NoEntryVal
- getAnnotationEntry (HsOpTy _ _ _ _ _) = NoEntryVal
- getAnnotationEntry (HsParTy _ _) = NoEntryVal
- getAnnotationEntry (HsIParamTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsStarTy _ _) = NoEntryVal
- getAnnotationEntry (HsKindSig an _ _) = fromAnn an
- getAnnotationEntry (HsSpliceTy _ _) = NoEntryVal
- getAnnotationEntry (HsDocTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsBangTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsRecTy _ _) = NoEntryVal
- getAnnotationEntry (HsExplicitListTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsExplicitTupleTy _ _) = NoEntryVal
- getAnnotationEntry (HsTyLit _ _) = NoEntryVal
- getAnnotationEntry (HsWildCardTy _) = NoEntryVal
- getAnnotationEntry (XHsType _) = NoEntryVal
-
- setAnnotationAnchor a@(HsForAllTy _ _ _) _ _ _s = a
- setAnnotationAnchor a@(HsQualTy _ _ _) _ _ _s = a
- setAnnotationAnchor (HsTyVar an a b) anc ts cs = (HsTyVar (setAnchorEpa an anc ts cs) a b)
- setAnnotationAnchor a@(HsAppTy _ _ _) _ _ _s = a
- setAnnotationAnchor a@(HsAppKindTy _ _ _) _ _ _s = a
- setAnnotationAnchor a@(HsFunTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsListTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsTupleTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsSumTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsOpTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsParTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsIParamTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsStarTy _ _) _ _ _s = a
- setAnnotationAnchor (HsKindSig an a b) anc ts cs = (HsKindSig (setAnchorEpa an anc ts cs) a b)
- setAnnotationAnchor a@(HsSpliceTy _ _) _ _ _s = a
- setAnnotationAnchor a@(HsDocTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsBangTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsRecTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsExplicitListTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsExplicitTupleTy{}) _ _ _s = a
- setAnnotationAnchor a@(HsTyLit _ _) _ _ _s = a
- setAnnotationAnchor a@(HsWildCardTy _) _ _ _s = a
- setAnnotationAnchor a@(XHsType _) _ _ _s = a
+ getAnnotationEntry _ = NoEntryVal
+ setAnnotationAnchor a _ _ _s = a
exact (HsForAllTy { hst_xforall = an
, hst_tele = tele, hst_body = ty }) = do
@@ -4060,7 +4012,7 @@ instance ExactPrint (HsType GhcPs) where
return (HsQualTy an ctxt' ty')
exact (HsTyVar an promoted name) = do
an0 <- if (promoted == IsPromoted)
- then markEpAnnL an lidl AnnSimpleQuote
+ then markEpAnnL' an lidl AnnSimpleQuote
else return an
name' <- markAnnotated name
return (HsTyVar an0 promoted name')
@@ -4118,7 +4070,7 @@ instance ExactPrint (HsType GhcPs) where
return (HsStarTy an isUnicode)
exact (HsKindSig an ty k) = do
ty' <- markAnnotated ty
- an0 <- markEpAnnL an lidl AnnDcolon
+ an0 <- markEpAnnL' an lidl AnnDcolon
k' <- markAnnotated k
return (HsKindSig an0 ty' k')
exact (HsSpliceTy a splice) = do
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e848e044e94eeed1fc54c32edf436cdf175ca1c1
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e848e044e94eeed1fc54c32edf436cdf175ca1c1
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231210/585bf966/attachment-0001.html>
More information about the ghc-commits
mailing list