diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2021-03-25 22:54:15 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-31 11:13:28 -0400 |
| commit | 798d8f80e1562891e4bbd8e4d8f42926cecf32b3 (patch) | |
| tree | 927e558a1849636d6fb5e4924adf56fdb283b128 | |
| parent | 49bc1e9ec854e571dfa78ac43565073586579f31 (diff) | |
| download | haskell-798d8f80e1562891e4bbd8e4d8f42926cecf32b3.tar.gz | |
EPA : Rename AnnComment to EpaComment
Follow-up from !2418, see #19579
20 files changed, 596 insertions, 591 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs index ec9c473c26..d7b43caa84 100644 --- a/compiler/GHC.hs +++ b/compiler/GHC.hs @@ -283,7 +283,7 @@ module GHC ( parser, -- * API Annotations - AnnKeywordId(..),AnnotationComment(..), + AnnKeywordId(..),EpaComment(..), -- * Miscellaneous --sessionHscEnv, diff --git a/compiler/GHC/Parser.y b/compiler/GHC/Parser.y index c30665837c..356a728b23 100644 --- a/compiler/GHC/Parser.y +++ b/compiler/GHC/Parser.y @@ -4223,8 +4223,8 @@ acsFinal a = do csf <- getFinalCommentsFor l meof <- getEofPos let ce = case meof of - Nothing -> AnnComments [] - Just (pos, gap) -> AnnCommentsBalanced [] [L (realSpanAsAnchor pos) (AnnComment AnnEofComment gap)] + Nothing -> EpaComments [] + Just (pos, gap) -> EpaCommentsBalanced [] [L (realSpanAsAnchor pos) (EpaComment EpaEofComment gap)] return (a (cs Semi.<> csf Semi.<> ce)) acsa :: MonadP m => (EpAnnComments -> LocatedAn t a) -> m (LocatedAn t a) diff --git a/compiler/GHC/Parser/Annotation.hs b/compiler/GHC/Parser/Annotation.hs index 6fba7baa94..c62bdce65e 100644 --- a/compiler/GHC/Parser/Annotation.hs +++ b/compiler/GHC/Parser/Annotation.hs @@ -6,7 +6,7 @@ module GHC.Parser.Annotation ( -- * Core Exact Print Annotation types AnnKeywordId(..), - AnnotationComment(..), AnnotationCommentTok(..), + EpaComment(..), EpaCommentTok(..), IsUnicodeSyntax(..), unicodeAnn, HasE(..), @@ -22,7 +22,7 @@ module GHC.Parser.Annotation ( -- ** Comments in Annotations - EpAnnComments(..), LAnnotationComment, com, noCom, + EpAnnComments(..), LEpaComment, com, noCom, getFollowingComments, setFollowingComments, setPriorComments, EpAnnCO, @@ -103,7 +103,7 @@ source code comments? We need to track the locations of all elements from the original source: this includes keywords such as 'let' / 'in' / 'do' etc as well as punctuation such as commas and braces, and also comments. We collectively refer to this -metadata as the "API annotations". +metadata as the "exact print annotations". NON-COMMENT ELEMENTS @@ -132,8 +132,8 @@ PARSER STATE There are three fields in PState (the parser state) which play a role with annotation comments. -> comment_q :: [LAnnotationComment], -> header_comments :: Maybe [LAnnotationComment], +> comment_q :: [LEpaComment], +> header_comments :: Maybe [LEpaComment], > eof_pos :: Maybe (RealSrcSpan, RealSrcSpan), -- pos, gap to prior token The 'comment_q' field captures comments as they are seen in the token stream, @@ -181,10 +181,10 @@ https://gitlab.haskell.org/ghc/ghc/wikis/api-annotations -- -------------------------------------------------------------------- --- | API Annotations exist so that tools can perform source to source --- conversions of Haskell code. They are used to keep track of the --- various syntactic keywords that are not captured in the existing --- AST. +-- | Exact print annotations exist so that tools can perform source to +-- source conversions of Haskell code. They are used to keep track of +-- the various syntactic keywords that are not captured in the +-- existing AST. -- -- The annotations, together with original source comments are made available in -- the @'pm_parsed_source@ field of @'GHC.Driver.Env.HsParsedModule'@. @@ -255,7 +255,10 @@ data AnnKeywordId | AnnNewtype | AnnName -- ^ where a name loses its location in the AST, this carries it | AnnOf - | AnnOpen -- ^ '{-\# LANGUAGE' etc + | AnnOpen -- ^ '{-\# DEPRECATED' etc. Opening of pragmas where + -- the capitalisation of the string can be changed by + -- the user. The actual text used is stored in a + -- 'SourceText' on the relevant pragma item. | AnnOpenB -- ^ '(|' | AnnOpenBU -- ^ '(|', unicode variant | AnnOpenC -- ^ '{' @@ -309,29 +312,31 @@ instance Outputable AnnKeywordId where -- --------------------------------------------------------------------- -data AnnotationComment = AnnComment { ac_tok :: AnnotationCommentTok - , ac_prior_tok :: RealSrcSpan - -- ^ The location of the prior - -- token, used for exact printing - } +data EpaComment = + EpaComment + { ac_tok :: EpaCommentTok + , ac_prior_tok :: RealSrcSpan + -- ^ The location of the prior + -- token, used for exact printing + } deriving (Eq, Ord, Data, Show) -data AnnotationCommentTok = +data EpaCommentTok = -- Documentation annotations - AnnDocCommentNext String -- ^ something beginning '-- |' - | AnnDocCommentPrev String -- ^ something beginning '-- ^' - | AnnDocCommentNamed String -- ^ something beginning '-- $' - | AnnDocSection Int String -- ^ a section heading - | AnnDocOptions String -- ^ doc options (prune, ignore-exports, etc) - | AnnLineComment String -- ^ comment starting by "--" - | AnnBlockComment String -- ^ comment in {- -} - | AnnEofComment -- ^ empty comment, capturing + EpaDocCommentNext String -- ^ something beginning '-- |' + | EpaDocCommentPrev String -- ^ something beginning '-- ^' + | EpaDocCommentNamed String -- ^ something beginning '-- $' + | EpaDocSection Int String -- ^ a section heading + | EpaDocOptions String -- ^ doc options (prune, ignore-exports, etc) + | EpaLineComment String -- ^ comment starting by "--" + | EpaBlockComment String -- ^ comment in {- -} + | EpaEofComment -- ^ empty comment, capturing -- location of EOF deriving (Eq, Ord, Data, Show) -- Note: these are based on the Token versions, but the Token type is -- defined in GHC.Parser.Lexer and bringing it in here would create a loop -instance Outputable AnnotationComment where +instance Outputable EpaComment where ppr x = text (show x) -- | - 'GHC.Parser.Annotation.AnnKeywordId' : 'GHC.Parser.Annotation.AnnOpen', @@ -534,22 +539,22 @@ realSpanAsAnchor s = Anchor s UnchangedAnchor -- them into the output stream. But when editin the AST, to move -- fragments around, it is useful to be able to first separate the -- comments into those occuring before the AST element and those --- following it. The 'AnnCommentsBalanced' constructor is used to do --- this. The GHC parser will only insert the 'AnnComments' form. -data EpAnnComments = AnnComments - { priorComments :: ![LAnnotationComment] } - | AnnCommentsBalanced - { priorComments :: ![LAnnotationComment] - , followingComments :: ![LAnnotationComment] } +-- following it. The 'EpaCommentsBalanced' constructor is used to do +-- this. The GHC parser will only insert the 'EpaComments' form. +data EpAnnComments = EpaComments + { priorComments :: ![LEpaComment] } + | EpaCommentsBalanced + { priorComments :: ![LEpaComment] + , followingComments :: ![LEpaComment] } deriving (Data, Eq) -type LAnnotationComment = GenLocated Anchor AnnotationComment +type LEpaComment = GenLocated Anchor EpaComment noCom :: EpAnnComments -noCom = AnnComments [] +noCom = EpaComments [] -com :: [LAnnotationComment] -> EpAnnComments -com cs = AnnComments cs +com :: [LEpaComment] -> EpAnnComments +com cs = EpaComments cs -- --------------------------------------------------------------------- @@ -925,17 +930,17 @@ noAnn = EpAnnNotUsed addAnns :: EpAnn -> [AddEpAnn] -> EpAnnComments -> EpAnn addAnns (EpAnn l as1 cs) as2 cs2 = EpAnn (widenAnchor l (as1 ++ as2)) (as1 ++ as2) (cs <> cs2) -addAnns EpAnnNotUsed [] (AnnComments []) = EpAnnNotUsed -addAnns EpAnnNotUsed [] (AnnCommentsBalanced [] []) = EpAnnNotUsed +addAnns EpAnnNotUsed [] (EpaComments []) = EpAnnNotUsed +addAnns EpAnnNotUsed [] (EpaCommentsBalanced [] []) = EpAnnNotUsed addAnns EpAnnNotUsed as cs = EpAnn (Anchor placeholderRealSpan UnchangedAnchor) as cs -- AZ:TODO use widenSpan here too addAnnsA :: SrcSpanAnnA -> [TrailingAnn] -> EpAnnComments -> SrcSpanAnnA addAnnsA (SrcSpanAnn (EpAnn l as1 cs) loc) as2 cs2 = SrcSpanAnn (EpAnn l (AnnListItem (lann_trailing as1 ++ as2)) (cs <> cs2)) loc -addAnnsA (SrcSpanAnn EpAnnNotUsed loc) [] (AnnComments []) +addAnnsA (SrcSpanAnn EpAnnNotUsed loc) [] (EpaComments []) = SrcSpanAnn EpAnnNotUsed loc -addAnnsA (SrcSpanAnn EpAnnNotUsed loc) [] (AnnCommentsBalanced [] []) +addAnnsA (SrcSpanAnn EpAnnNotUsed loc) [] (EpaCommentsBalanced [] []) = SrcSpanAnn EpAnnNotUsed loc addAnnsA (SrcSpanAnn EpAnnNotUsed loc) as cs = SrcSpanAnn (EpAnn (spanAsAnchor loc) (AnnListItem as) cs) loc @@ -983,7 +988,7 @@ annParen2AddEpAnn (EpAnn _ (AnnParen pt o c) _) (ai,ac) = parenTypeKws pt epAnnComments :: EpAnn' an -> EpAnnComments -epAnnComments EpAnnNotUsed = AnnComments [] +epAnnComments EpAnnNotUsed = EpaComments [] epAnnComments (EpAnn _ _ cs) = cs -- --------------------------------------------------------------------- @@ -1014,17 +1019,17 @@ addCLocAA a b c = L (noAnnSrcSpan $ combineSrcSpans (locA $ getLoc a) (locA $ ge -- Utilities for manipulating EpAnnComments -- --------------------------------------------------------------------- -getFollowingComments :: EpAnnComments -> [LAnnotationComment] -getFollowingComments (AnnComments _) = [] -getFollowingComments (AnnCommentsBalanced _ cs) = cs +getFollowingComments :: EpAnnComments -> [LEpaComment] +getFollowingComments (EpaComments _) = [] +getFollowingComments (EpaCommentsBalanced _ cs) = cs -setFollowingComments :: EpAnnComments -> [LAnnotationComment] -> EpAnnComments -setFollowingComments (AnnComments ls) cs = AnnCommentsBalanced ls cs -setFollowingComments (AnnCommentsBalanced ls _) cs = AnnCommentsBalanced ls cs +setFollowingComments :: EpAnnComments -> [LEpaComment] -> EpAnnComments +setFollowingComments (EpaComments ls) cs = EpaCommentsBalanced ls cs +setFollowingComments (EpaCommentsBalanced ls _) cs = EpaCommentsBalanced ls cs -setPriorComments :: EpAnnComments -> [LAnnotationComment] -> EpAnnComments -setPriorComments (AnnComments _) cs = AnnComments cs -setPriorComments (AnnCommentsBalanced _ ts) cs = AnnCommentsBalanced cs ts +setPriorComments :: EpAnnComments -> [LEpaComment] -> EpAnnComments +setPriorComments (EpaComments _) cs = EpaComments cs +setPriorComments (EpaCommentsBalanced _ ts) cs = EpaCommentsBalanced cs ts -- --------------------------------------------------------------------- -- Comment-only annotations @@ -1116,10 +1121,10 @@ instance Semigroup Anchor where Anchor r1 o1 <> Anchor r2 _ = Anchor (combineRealSrcSpans r1 r2) o1 instance Semigroup EpAnnComments where - AnnComments cs1 <> AnnComments cs2 = AnnComments (cs1 ++ cs2) - AnnComments cs1 <> AnnCommentsBalanced cs2 as2 = AnnCommentsBalanced (cs1 ++ cs2) as2 - AnnCommentsBalanced cs1 as1 <> AnnComments cs2 = AnnCommentsBalanced (cs1 ++ cs2) as1 - AnnCommentsBalanced cs1 as1 <> AnnCommentsBalanced cs2 as2 = AnnCommentsBalanced (cs1 ++ cs2) (as1++as2) + EpaComments cs1 <> EpaComments cs2 = EpaComments (cs1 ++ cs2) + EpaComments cs1 <> EpaCommentsBalanced cs2 as2 = EpaCommentsBalanced (cs1 ++ cs2) as2 + EpaCommentsBalanced cs1 as1 <> EpaComments cs2 = EpaCommentsBalanced (cs1 ++ cs2) as1 + EpaCommentsBalanced cs1 as1 <> EpaCommentsBalanced cs2 as2 = EpaCommentsBalanced (cs1 ++ cs2) (as1++as2) instance (Monoid a) => Monoid (EpAnn' a) where @@ -1173,12 +1178,12 @@ instance Outputable AnchorOperation where instance Outputable DeltaPos where ppr (DP l c) = text "DP" <+> ppr l <+> ppr c -instance Outputable (GenLocated Anchor AnnotationComment) where +instance Outputable (GenLocated Anchor EpaComment) where ppr (L l c) = text "L" <+> ppr l <+> ppr c instance Outputable EpAnnComments where - ppr (AnnComments cs) = text "AnnComments" <+> ppr cs - ppr (AnnCommentsBalanced cs ts) = text "AnnCommentsBalanced" <+> ppr cs <+> ppr ts + ppr (EpaComments cs) = text "EpaComments" <+> ppr cs + ppr (EpaCommentsBalanced cs ts) = text "EpaCommentsBalanced" <+> ppr cs <+> ppr ts instance (NamedThing (Located a)) => NamedThing (LocatedAn an a) where getName (L l a) = getName (L (locA l) a) diff --git a/compiler/GHC/Parser/Lexer.x b/compiler/GHC/Parser/Lexer.x index be99757176..eec5171eb8 100644 --- a/compiler/GHC/Parser/Lexer.x +++ b/compiler/GHC/Parser/Lexer.x @@ -2348,8 +2348,8 @@ data PState = PState { -- the GHC API can do source to source conversions. -- See note [exact print annotations] in GHC.Parser.Annotation eof_pos :: Maybe (RealSrcSpan, RealSrcSpan), -- pos, gap to prior token - header_comments :: Maybe [LAnnotationComment], - comment_q :: [LAnnotationComment], + header_comments :: Maybe [LEpaComment], + comment_q :: [LEpaComment], -- Haddock comments accumulated in ascending order of their location -- (BufPos). We use OrdList to get O(1) snoc. @@ -2918,21 +2918,21 @@ instance MonadP P where let (comment_q', newAnns) = allocateComments ss (comment_q s) in POk s { comment_q = comment_q' - } (AnnComments newAnns) + } (EpaComments newAnns) allocatePriorCommentsP ss = P $ \s -> let (header_comments', comment_q', newAnns) = allocatePriorComments ss (comment_q s) (header_comments s) in POk s { header_comments = header_comments', comment_q = comment_q' - } (AnnComments newAnns) + } (EpaComments newAnns) allocateFinalCommentsP ss = P $ \s -> let (header_comments', comment_q', newAnns) = allocateFinalComments ss (comment_q s) (header_comments s) in POk s { header_comments = header_comments', comment_q = comment_q' - } (AnnCommentsBalanced (fromMaybe [] header_comments') (reverse newAnns)) + } (EpaCommentsBalanced (fromMaybe [] header_comments') (reverse newAnns)) getCommentsFor :: (MonadP m) => SrcSpan -> m EpAnnComments getCommentsFor (RealSrcSpan l _) = allocateCommentsP l @@ -3456,8 +3456,8 @@ queueComment c = P $ \s -> POk s { allocateComments :: RealSrcSpan - -> [LAnnotationComment] - -> ([LAnnotationComment], [LAnnotationComment]) + -> [LEpaComment] + -> ([LEpaComment], [LEpaComment]) allocateComments ss comment_q = let (before,rest) = break (\(L l _) -> isRealSubspanOf (anchor l) ss) comment_q @@ -3469,9 +3469,9 @@ allocateComments ss comment_q = allocatePriorComments :: RealSrcSpan - -> [LAnnotationComment] - -> Maybe [LAnnotationComment] - -> (Maybe [LAnnotationComment], [LAnnotationComment], [LAnnotationComment]) + -> [LEpaComment] + -> Maybe [LEpaComment] + -> (Maybe [LEpaComment], [LEpaComment], [LEpaComment]) allocatePriorComments ss comment_q mheader_comments = let cmp (L l _) = anchor l <= ss @@ -3485,9 +3485,9 @@ allocatePriorComments ss comment_q mheader_comments = allocateFinalComments :: RealSrcSpan - -> [LAnnotationComment] - -> Maybe [LAnnotationComment] - -> (Maybe [LAnnotationComment], [LAnnotationComment], [LAnnotationComment]) + -> [LEpaComment] + -> Maybe [LEpaComment] + -> (Maybe [LEpaComment], [LEpaComment], [LEpaComment]) allocateFinalComments ss comment_q mheader_comments = let cmp (L l _) = anchor l <= ss @@ -3499,19 +3499,19 @@ allocateFinalComments ss comment_q mheader_comments = Nothing -> (Just newAnns, [], comment_q') Just _ -> (mheader_comments, [], comment_q' ++ newAnns) -commentToAnnotation :: RealLocated Token -> LAnnotationComment -commentToAnnotation (L l (ITdocCommentNext s ll)) = mkLAnnotationComment l ll (AnnDocCommentNext s) -commentToAnnotation (L l (ITdocCommentPrev s ll)) = mkLAnnotationComment l ll (AnnDocCommentPrev s) -commentToAnnotation (L l (ITdocCommentNamed s ll)) = mkLAnnotationComment l ll (AnnDocCommentNamed s) -commentToAnnotation (L l (ITdocSection n s ll)) = mkLAnnotationComment l ll (AnnDocSection n s) -commentToAnnotation (L l (ITdocOptions s ll)) = mkLAnnotationComment l ll (AnnDocOptions s) -commentToAnnotation (L l (ITlineComment s ll)) = mkLAnnotationComment l ll (AnnLineComment s) -commentToAnnotation (L l (ITblockComment s ll)) = mkLAnnotationComment l ll (AnnBlockComment s) +commentToAnnotation :: RealLocated Token -> LEpaComment +commentToAnnotation (L l (ITdocCommentNext s ll)) = mkLEpaComment l ll (EpaDocCommentNext s) +commentToAnnotation (L l (ITdocCommentPrev s ll)) = mkLEpaComment l ll (EpaDocCommentPrev s) +commentToAnnotation (L l (ITdocCommentNamed s ll)) = mkLEpaComment l ll (EpaDocCommentNamed s) +commentToAnnotation (L l (ITdocSection n s ll)) = mkLEpaComment l ll (EpaDocSection n s) +commentToAnnotation (L l (ITdocOptions s ll)) = mkLEpaComment l ll (EpaDocOptions s) +commentToAnnotation (L l (ITlineComment s ll)) = mkLEpaComment l ll (EpaLineComment s) +commentToAnnotation (L l (ITblockComment s ll)) = mkLEpaComment l ll (EpaBlockComment s) commentToAnnotation _ = panic "commentToAnnotation" -- see Note [PsSpan in Comments] -mkLAnnotationComment :: RealSrcSpan -> PsSpan -> AnnotationCommentTok -> LAnnotationComment -mkLAnnotationComment l ll tok = L (realSpanAsAnchor l) (AnnComment tok (psRealSpan ll)) +mkLEpaComment :: RealSrcSpan -> PsSpan -> EpaCommentTok -> LEpaComment +mkLEpaComment l ll tok = L (realSpanAsAnchor l) (EpaComment tok (psRealSpan ll)) -- --------------------------------------------------------------------- diff --git a/compiler/GHC/Parser/PostProcess.hs b/compiler/GHC/Parser/PostProcess.hs index 2a70119fcf..2686bc151b 100644 --- a/compiler/GHC/Parser/PostProcess.hs +++ b/compiler/GHC/Parser/PostProcess.hs @@ -2721,8 +2721,8 @@ data PV_Accum = PV_Accum { pv_warnings :: Bag PsWarning , pv_errors :: Bag PsError - , pv_header_comments :: Maybe [LAnnotationComment] - , pv_comment_q :: [LAnnotationComment] + , pv_header_comments :: Maybe [LEpaComment] + , pv_comment_q :: [LEpaComment] } data PV_Result a = PV_Ok PV_Accum a | PV_Failed PV_Accum @@ -2811,21 +2811,21 @@ instance MonadP PV where let (comment_q', newAnns) = allocateComments ss (pv_comment_q s) in PV_Ok s { pv_comment_q = comment_q' - } (AnnComments newAnns) + } (EpaComments newAnns) allocatePriorCommentsP ss = PV $ \_ s -> let (header_comments', comment_q', newAnns) = allocatePriorComments ss (pv_comment_q s) (pv_header_comments s) in PV_Ok s { pv_header_comments = header_comments', pv_comment_q = comment_q' - } (AnnComments newAnns) + } (EpaComments newAnns) allocateFinalCommentsP ss = PV $ \_ s -> let (header_comments', comment_q', newAnns) = allocateFinalComments ss (pv_comment_q s) (pv_header_comments s) in PV_Ok s { pv_header_comments = header_comments', pv_comment_q = comment_q' - } (AnnCommentsBalanced (fromMaybe [] header_comments') (reverse newAnns)) + } (EpaCommentsBalanced (fromMaybe [] header_comments') (reverse newAnns)) {- Note [Parser-Validator Hint] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr index cdf694f4da..7e34424807 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr @@ -17,14 +17,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { T17544.hs:57:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { T17544.hs:57:1 }))])) (VirtualBraces (1)) @@ -41,7 +41,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(5,1)-(6,16) }) (TyClD (NoExtField) @@ -53,7 +53,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnClass (AR { T17544.hs:5:1-5 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:5:12-16 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (VirtualBraces @@ -73,7 +73,7 @@ { T17544.hs:5:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -92,7 +92,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { T17544.hs:6:6-7 })) []) - (AnnComments + (EpaComments [])) (False) [(L @@ -114,7 +114,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { T17544.hs:6:11-12 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -126,7 +126,7 @@ { T17544.hs:6:9 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -145,7 +145,7 @@ { T17544.hs:6:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -168,7 +168,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(9,1)-(10,16) }) (TyClD (NoExtField) @@ -180,7 +180,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnClass (AR { T17544.hs:9:1-5 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:9:12-16 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (VirtualBraces @@ -200,7 +200,7 @@ { T17544.hs:9:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -219,7 +219,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { T17544.hs:10:6-7 })) []) - (AnnComments + (EpaComments [])) (False) [(L @@ -241,7 +241,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { T17544.hs:10:11-12 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -253,7 +253,7 @@ { T17544.hs:10:9 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -268,7 +268,7 @@ { T17544.hs:10:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -291,7 +291,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(13,1)-(14,16) }) (TyClD (NoExtField) @@ -303,7 +303,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnClass (AR { T17544.hs:13:1-5 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:13:12-16 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (VirtualBraces @@ -323,7 +323,7 @@ { T17544.hs:13:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -342,7 +342,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { T17544.hs:14:6-7 })) []) - (AnnComments + (EpaComments [])) (False) [(L @@ -364,7 +364,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { T17544.hs:14:11-12 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -376,7 +376,7 @@ { T17544.hs:14:9 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -391,7 +391,7 @@ { T17544.hs:14:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -417,7 +417,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(17,1)-(20,16) }) (TyClD (NoExtField) @@ -429,7 +429,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnClass (AR { T17544.hs:17:1-5 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:17:12-16 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (VirtualBraces @@ -449,7 +449,7 @@ { T17544.hs:17:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -468,7 +468,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { T17544.hs:18:6-7 })) []) - (AnnComments + (EpaComments [])) (False) [(L @@ -490,7 +490,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { T17544.hs:18:11-12 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -502,7 +502,7 @@ { T17544.hs:18:9 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -517,7 +517,7 @@ { T17544.hs:18:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -534,7 +534,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { T17544.hs:20:6-7 })) []) - (AnnComments + (EpaComments [])) (False) [(L @@ -556,7 +556,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { T17544.hs:20:11-12 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -568,7 +568,7 @@ { T17544.hs:20:9 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -583,7 +583,7 @@ { T17544.hs:20:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -602,7 +602,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:22:1-30 }) (TyClD (NoExtField) @@ -616,7 +616,7 @@ ,(AddEpAnn AnnWhere (AR { T17544.hs:22:12-16 })) ,(AddEpAnn AnnOpenC (AR { T17544.hs:22:18 })) ,(AddEpAnn AnnCloseC (AR { T17544.hs:22:30 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (ExplicitBraces)) @@ -635,7 +635,7 @@ { T17544.hs:22:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -655,7 +655,7 @@ { T17544.hs:22:20-28 } (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:22:20-23 }))] - (AnnComments + (EpaComments [])) (DataFamily) (NotTopLevel) @@ -673,7 +673,7 @@ { T17544.hs:22:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -695,7 +695,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(23,1)-(25,18) }) (InstD (NoExtField) @@ -709,7 +709,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnInstance (AR { T17544.hs:23:1-8 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:23:17-21 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey)) (L @@ -730,7 +730,7 @@ { T17544.hs:23:10-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -745,7 +745,7 @@ { T17544.hs:23:13-15 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -776,7 +776,7 @@ { T17544.hs:24:11-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -791,7 +791,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:24:3-6 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:24:15-19 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -805,7 +805,7 @@ { T17544.hs:25:5-18 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544.hs:25:10-11 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:5-8 }) @@ -830,7 +830,7 @@ { T17544.hs:25:13-14 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -845,7 +845,7 @@ { T17544.hs:25:16-18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -862,7 +862,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:28:1-30 }) (TyClD (NoExtField) @@ -876,7 +876,7 @@ ,(AddEpAnn AnnWhere (AR { T17544.hs:28:12-16 })) ,(AddEpAnn AnnOpenC (AR { T17544.hs:28:18 })) ,(AddEpAnn AnnCloseC (AR { T17544.hs:28:30 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (ExplicitBraces)) @@ -895,7 +895,7 @@ { T17544.hs:28:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -915,7 +915,7 @@ { T17544.hs:28:20-28 } (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:28:20-23 }))] - (AnnComments + (EpaComments [])) (DataFamily) (NotTopLevel) @@ -933,7 +933,7 @@ { T17544.hs:28:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -955,7 +955,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(29,1)-(31,18) }) (InstD (NoExtField) @@ -969,7 +969,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnInstance (AR { T17544.hs:29:1-8 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:29:17-21 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey)) (L @@ -990,7 +990,7 @@ { T17544.hs:29:10-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1005,7 +1005,7 @@ { T17544.hs:29:13-15 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1036,7 +1036,7 @@ { T17544.hs:30:11-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1051,7 +1051,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:30:3-6 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:30:15-19 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -1065,7 +1065,7 @@ { T17544.hs:31:5-18 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544.hs:31:10-11 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:5-8 }) @@ -1090,7 +1090,7 @@ { T17544.hs:31:13-14 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1105,7 +1105,7 @@ { T17544.hs:31:16-18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1122,7 +1122,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:34:1-30 }) (TyClD (NoExtField) @@ -1136,7 +1136,7 @@ ,(AddEpAnn AnnWhere (AR { T17544.hs:34:12-16 })) ,(AddEpAnn AnnOpenC (AR { T17544.hs:34:18 })) ,(AddEpAnn AnnCloseC (AR { T17544.hs:34:30 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (ExplicitBraces)) @@ -1155,7 +1155,7 @@ { T17544.hs:34:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1175,7 +1175,7 @@ { T17544.hs:34:20-28 } (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:34:20-23 }))] - (AnnComments + (EpaComments [])) (DataFamily) (NotTopLevel) @@ -1193,7 +1193,7 @@ { T17544.hs:34:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1215,7 +1215,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(35,1)-(37,18) }) (InstD (NoExtField) @@ -1229,7 +1229,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnInstance (AR { T17544.hs:35:1-8 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:35:17-21 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey)) (L @@ -1250,7 +1250,7 @@ { T17544.hs:35:10-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1265,7 +1265,7 @@ { T17544.hs:35:13-15 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1296,7 +1296,7 @@ { T17544.hs:36:11-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1311,7 +1311,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:36:3-6 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:36:15-19 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -1325,7 +1325,7 @@ { T17544.hs:37:5-18 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544.hs:37:10-11 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:5-8 }) @@ -1350,7 +1350,7 @@ { T17544.hs:37:13-14 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1365,7 +1365,7 @@ { T17544.hs:37:16-18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1382,7 +1382,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:40:1-30 }) (TyClD (NoExtField) @@ -1396,7 +1396,7 @@ ,(AddEpAnn AnnWhere (AR { T17544.hs:40:12-16 })) ,(AddEpAnn AnnOpenC (AR { T17544.hs:40:18 })) ,(AddEpAnn AnnCloseC (AR { T17544.hs:40:30 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (ExplicitBraces)) @@ -1415,7 +1415,7 @@ { T17544.hs:40:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1435,7 +1435,7 @@ { T17544.hs:40:20-28 } (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:40:20-23 }))] - (AnnComments + (EpaComments [])) (DataFamily) (NotTopLevel) @@ -1453,7 +1453,7 @@ { T17544.hs:40:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1475,7 +1475,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(41,1)-(43,18) }) (InstD (NoExtField) @@ -1489,7 +1489,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnInstance (AR { T17544.hs:41:1-8 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:41:17-21 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey)) (L @@ -1510,7 +1510,7 @@ { T17544.hs:41:10-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1525,7 +1525,7 @@ { T17544.hs:41:13-15 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1556,7 +1556,7 @@ { T17544.hs:42:11-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1571,7 +1571,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:42:3-6 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:42:15-19 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -1585,7 +1585,7 @@ { T17544.hs:43:5-18 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544.hs:43:10-11 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:5-8 }) @@ -1610,7 +1610,7 @@ { T17544.hs:43:13-14 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1625,7 +1625,7 @@ { T17544.hs:43:16-18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1642,7 +1642,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:46:1-30 }) (TyClD (NoExtField) @@ -1656,7 +1656,7 @@ ,(AddEpAnn AnnWhere (AR { T17544.hs:46:12-16 })) ,(AddEpAnn AnnOpenC (AR { T17544.hs:46:18 })) ,(AddEpAnn AnnCloseC (AR { T17544.hs:46:30 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (ExplicitBraces)) @@ -1675,7 +1675,7 @@ { T17544.hs:46:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1695,7 +1695,7 @@ { T17544.hs:46:20-28 } (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:46:20-23 }))] - (AnnComments + (EpaComments [])) (DataFamily) (NotTopLevel) @@ -1713,7 +1713,7 @@ { T17544.hs:46:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1735,7 +1735,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(47,1)-(49,18) }) (InstD (NoExtField) @@ -1749,7 +1749,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnInstance (AR { T17544.hs:47:1-8 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:47:17-21 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey)) (L @@ -1770,7 +1770,7 @@ { T17544.hs:47:10-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1785,7 +1785,7 @@ { T17544.hs:47:13-15 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1816,7 +1816,7 @@ { T17544.hs:48:11-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1831,7 +1831,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:48:3-6 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:48:15-19 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -1845,7 +1845,7 @@ { T17544.hs:49:5-18 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544.hs:49:10-11 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:5-8 }) @@ -1870,7 +1870,7 @@ { T17544.hs:49:13-14 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1885,7 +1885,7 @@ { T17544.hs:49:16-18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1902,7 +1902,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:52:1-32 }) (TyClD (NoExtField) @@ -1916,7 +1916,7 @@ ,(AddEpAnn AnnWhere (AR { T17544.hs:52:13-17 })) ,(AddEpAnn AnnOpenC (AR { T17544.hs:52:19 })) ,(AddEpAnn AnnCloseC (AR { T17544.hs:52:32 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (ExplicitBraces)) @@ -1935,7 +1935,7 @@ { T17544.hs:52:11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1955,7 +1955,7 @@ { T17544.hs:52:21-30 } (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:52:21-24 }))] - (AnnComments + (EpaComments [])) (DataFamily) (NotTopLevel) @@ -1973,7 +1973,7 @@ { T17544.hs:52:30 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1995,7 +1995,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544.hs:(53,1)-(55,20) }) (InstD (NoExtField) @@ -2009,7 +2009,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnInstance (AR { T17544.hs:53:1-8 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:53:18-22 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey)) (L @@ -2030,7 +2030,7 @@ { T17544.hs:53:10-12 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -2045,7 +2045,7 @@ { T17544.hs:53:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -2076,7 +2076,7 @@ { T17544.hs:54:12-14 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -2091,7 +2091,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544.hs:54:3-6 })) ,(AddEpAnn AnnWhere (AR { T17544.hs:54:16-20 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -2105,7 +2105,7 @@ { T17544.hs:55:5-20 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544.hs:55:11-12 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:5-9 }) @@ -2130,7 +2130,7 @@ { T17544.hs:55:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -2145,7 +2145,7 @@ { T17544.hs:55:18-20 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr index 9af1cf3961..b00f2efdeb 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr @@ -17,14 +17,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { T17544_kw.hs:25:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { T17544_kw.hs:25:1 }))])) (VirtualBraces (1)) @@ -41,7 +41,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544_kw.hs:(15,1)-(16,20) }) (TyClD (NoExtField) @@ -52,7 +52,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544_kw.hs:15:1-4 })) ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:16:3-7 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:15:6-8 }) @@ -69,7 +69,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T17544_kw.hs:15:1-4 })) ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:16:3-7 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -83,7 +83,7 @@ { T17544_kw.hs:16:9-20 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544_kw.hs:16:15-16 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:9-13 }) @@ -104,7 +104,7 @@ { T17544_kw.hs:16:18-20 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -124,7 +124,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544_kw.hs:(18,1)-(19,26) }) (TyClD (NoExtField) @@ -135,7 +135,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnNewtype (AR { T17544_kw.hs:18:1-7 })) ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:19:3-7 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:18:9-11 }) @@ -152,7 +152,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnNewtype (AR { T17544_kw.hs:18:1-7 })) ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:19:3-7 }))] - (AnnComments + (EpaComments [])) (NewType) (Nothing) @@ -166,7 +166,7 @@ { T17544_kw.hs:19:9-26 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T17544_kw.hs:19:15-16 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:19:9-13 }) @@ -189,7 +189,7 @@ (AnnListItem [(AddRarrowAnn (AR { T17544_kw.hs:19:21-22 }))]) - (AnnComments + (EpaComments [])) { T17544_kw.hs:19:18-19 }) (HsTupleTy (EpAnn @@ -200,7 +200,7 @@ (AnnParens) (AR { T17544_kw.hs:19:18 }) (AR { T17544_kw.hs:19:19 })) - (AnnComments + (EpaComments [])) (HsBoxedOrConstraintTuple) [])))]) @@ -212,7 +212,7 @@ { T17544_kw.hs:19:24-26 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -232,7 +232,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T17544_kw.hs:(21,1)-(24,18) }) (TyClD (NoExtField) @@ -244,7 +244,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnClass (AR { T17544_kw.hs:21:1-5 })) ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:23:3-7 }))] - (AnnComments + (EpaComments [])) (NoAnnSortKey) (VirtualBraces @@ -264,7 +264,7 @@ { T17544_kw.hs:21:11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -283,7 +283,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { T17544_kw.hs:24:15-16 })) []) - (AnnComments + (EpaComments [])) (False) [(L @@ -304,7 +304,7 @@ { T17544_kw.hs:24:18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L diff --git a/testsuite/tests/module/mod185.stderr b/testsuite/tests/module/mod185.stderr index 44b5b19947..bc428b5d0b 100644 --- a/testsuite/tests/module/mod185.stderr +++ b/testsuite/tests/module/mod185.stderr @@ -16,14 +16,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { mod185.hs:6:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { mod185.hs:6:1 }))])) (VirtualBraces (1)) @@ -44,7 +44,7 @@ (AR { mod185.hs:3:16-24 })) (Nothing) (Nothing)) - (AnnComments + (EpaComments [])) (NoSourceText) (L @@ -64,7 +64,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { mod185.hs:5:1-24 }) (ValD (NoExtField) @@ -86,7 +86,7 @@ { mod185.hs:5:1-24 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (FunRhs (L @@ -108,7 +108,7 @@ (GrhsAnn (Nothing) (AddEpAnn AnnEqual (AR { mod185.hs:5:6 }))) - (AnnComments + (EpaComments [])) [] (L diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr index 988170e23c..332e6e4822 100644 --- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr @@ -17,14 +17,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { DumpParsedAst.hs:21:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { DumpParsedAst.hs:21:1 }))])) (VirtualBraces (1)) @@ -47,7 +47,7 @@ (Nothing) (Nothing) (Nothing)) - (AnnComments + (EpaComments [])) (NoSourceText) (L @@ -67,7 +67,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpParsedAst.hs:8:1-30 }) (TyClD (NoExtField) @@ -78,7 +78,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { DumpParsedAst.hs:8:1-4 })) ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:6-10 }) @@ -95,7 +95,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { DumpParsedAst.hs:8:1-4 })) ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -109,7 +109,7 @@ (AnnListItem [(AddVbarAnn (AR { DumpParsedAst.hs:8:19 }))]) - (AnnComments + (EpaComments [])) { DumpParsedAst.hs:8:14-17 }) (ConDeclH98 (EpAnn @@ -117,7 +117,7 @@ { DumpParsedAst.hs:8:14-17 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:14-17 }) @@ -138,7 +138,7 @@ { DumpParsedAst.hs:8:21-30 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:21-24 }) @@ -161,7 +161,7 @@ { DumpParsedAst.hs:8:26-30 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -177,7 +177,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpParsedAst.hs:10:1-39 }) (TyClD (NoExtField) @@ -194,7 +194,7 @@ ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:10:41-45 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 }))] - (AnnComments + (EpaComments [])) (ClosedTypeFamily (Just @@ -206,7 +206,7 @@ { DumpParsedAst.hs:11:3-36 } (UnchangedAnchor)) [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:11:19 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:11:3-8 }) @@ -226,7 +226,7 @@ (AnnParens) (AR { DumpParsedAst.hs:11:10 }) (AR { DumpParsedAst.hs:11:17 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:11:11-16 }) @@ -240,7 +240,7 @@ { DumpParsedAst.hs:11:11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -259,7 +259,7 @@ { DumpParsedAst.hs:11:15-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -279,7 +279,7 @@ { DumpParsedAst.hs:11:21-24 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -297,7 +297,7 @@ (AnnParens) (AR { DumpParsedAst.hs:11:26 }) (AR { DumpParsedAst.hs:11:36 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:11:27-35 }) @@ -311,7 +311,7 @@ { DumpParsedAst.hs:11:27-32 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -326,7 +326,7 @@ { DumpParsedAst.hs:11:34-35 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -341,7 +341,7 @@ { DumpParsedAst.hs:12:3-24 } (UnchangedAnchor)) [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:12:19 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:12:3-8 }) @@ -360,7 +360,7 @@ [(AddEpAnn AnnSimpleQuote (AR { DumpParsedAst.hs:12:10 })) ,(AddEpAnn AnnOpenS (AR { DumpParsedAst.hs:12:11 })) ,(AddEpAnn AnnCloseS (AR { DumpParsedAst.hs:12:12 }))] - (AnnComments + (EpaComments [])) (IsPromoted) [])))] @@ -373,7 +373,7 @@ { DumpParsedAst.hs:12:21-24 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -397,7 +397,7 @@ [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:10:24-25 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -415,7 +415,7 @@ (AnnParensSquare) (AR { DumpParsedAst.hs:10:27 }) (AR { DumpParsedAst.hs:10:29 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:10:28 }) @@ -425,7 +425,7 @@ { DumpParsedAst.hs:10:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -445,7 +445,7 @@ { DumpParsedAst.hs:10:35-39 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -460,7 +460,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpParsedAst.hs:15:1-29 }) (TyClD (NoExtField) @@ -473,7 +473,7 @@ ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:15:19 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:6 }) @@ -489,7 +489,7 @@ { DumpParsedAst.hs:15:8 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -506,7 +506,7 @@ [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:15:13-14 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -521,7 +521,7 @@ { DumpParsedAst.hs:15:16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -538,7 +538,7 @@ ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:15:19 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -552,7 +552,7 @@ { DumpParsedAst.hs:15:21-29 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:21-23 }) @@ -578,7 +578,7 @@ (AnnParens) (AR { DumpParsedAst.hs:15:25 }) (AR { DumpParsedAst.hs:15:29 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26-28 }) @@ -592,7 +592,7 @@ { DumpParsedAst.hs:15:26 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -607,7 +607,7 @@ { DumpParsedAst.hs:15:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -623,7 +623,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpParsedAst.hs:17:1-48 }) (TyClD (NoExtField) @@ -642,7 +642,7 @@ ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 }))] - (AnnComments + (EpaComments [])) (ClosedTypeFamily (Just @@ -654,7 +654,7 @@ { DumpParsedAst.hs:18:3-30 } (UnchangedAnchor)) [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:18:17 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:18:3-4 }) @@ -672,7 +672,7 @@ { DumpParsedAst.hs:18:7-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -688,7 +688,7 @@ { DumpParsedAst.hs:18:13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -704,7 +704,7 @@ { DumpParsedAst.hs:18:15 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -732,7 +732,7 @@ { DumpParsedAst.hs:18:19 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -747,7 +747,7 @@ { DumpParsedAst.hs:18:22-26 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -762,7 +762,7 @@ { DumpParsedAst.hs:18:28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -777,7 +777,7 @@ { DumpParsedAst.hs:18:30 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -801,7 +801,7 @@ [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:19-20 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -816,7 +816,7 @@ { DumpParsedAst.hs:17:22 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -833,7 +833,7 @@ [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:28-29 })) ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 })) ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -849,7 +849,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpParsedAst.hs:17:33-34 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -861,7 +861,7 @@ { DumpParsedAst.hs:17:31 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -876,7 +876,7 @@ { DumpParsedAst.hs:17:36-39 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -896,7 +896,7 @@ { DumpParsedAst.hs:17:45-48 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -911,7 +911,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpParsedAst.hs:20:1-23 }) (ValD (NoExtField) @@ -933,7 +933,7 @@ { DumpParsedAst.hs:20:1-23 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (FunRhs (L @@ -955,7 +955,7 @@ (GrhsAnn (Nothing) (AddEpAnn AnnEqual (AR { DumpParsedAst.hs:20:6 }))) - (AnnComments + (EpaComments [])) [] (L @@ -966,7 +966,7 @@ { DumpParsedAst.hs:20:8-23 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:20:8-15 }) @@ -984,7 +984,7 @@ { DumpParsedAst.hs:20:17-23 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsString (SourceText "hello") diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr index 96188efc4a..ac53ca8274 100644 --- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr @@ -17,7 +17,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:27:1-23 }) (FunBind {NameSet: @@ -55,7 +55,7 @@ { DumpRenamedAst.hs:27:8-23 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:27:8-15 }) @@ -72,7 +72,7 @@ { DumpRenamedAst.hs:27:17-23 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsString (SourceText "hello") @@ -92,7 +92,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:10:1-30 }) (DataDecl (DataDeclRn @@ -120,7 +120,7 @@ (AnnListItem [(AddVbarAnn (AR { DumpRenamedAst.hs:10:19 }))]) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:10:14-17 }) (ConDeclH98 (EpAnnNotUsed) @@ -172,7 +172,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:12:1-39 }) (FamDecl (NoExtField) @@ -296,7 +296,7 @@ [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:12:24-25 })) ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:12:20 })) ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:12:30 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -313,7 +313,7 @@ (AnnParensSquare) (AR { DumpRenamedAst.hs:12:27 }) (AR { DumpRenamedAst.hs:12:29 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:12:28 }) @@ -349,7 +349,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:16:1-33 }) (FamDecl (NoExtField) @@ -377,7 +377,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:16:22-23 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -398,7 +398,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:16:27-28 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -428,7 +428,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:(19,1)-(20,45) }) (DataFamInstD (NoExtField) @@ -454,7 +454,7 @@ { DumpRenamedAst.hs:19:23 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:19:25-26 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:19:23 }) @@ -473,7 +473,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:19:30-31 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -509,7 +509,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:19:54-55 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -526,7 +526,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:19:45-46 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -579,7 +579,7 @@ (AnnListItem [(AddRarrowAnn (AR { DumpRenamedAst.hs:20:36-37 }))]) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:20:10-34 }) (HsParTy (EpAnnNotUsed) @@ -597,7 +597,7 @@ { DumpRenamedAst.hs:20:18-19 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (SpecifiedSpec) (L @@ -612,7 +612,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:20:27-28 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -699,7 +699,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:22:1-29 }) (DataDecl (DataDeclRn @@ -720,7 +720,7 @@ { DumpRenamedAst.hs:22:8 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -736,7 +736,7 @@ [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:22:13-14 })) ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:22:10 })) ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:22:17 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -811,7 +811,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:24:1-48 }) (FamDecl (NoExtField) @@ -918,7 +918,7 @@ [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:24:19-20 })) ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:24:16 })) ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:24:23 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -942,7 +942,7 @@ [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:24:28-29 })) ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:24:25 })) ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:24:40 }))] - (AnnComments + (EpaComments [])) (()) (L @@ -957,7 +957,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { DumpRenamedAst.hs:24:33-34 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -1062,7 +1062,7 @@ (AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:8:23 }))) [] []) - (AnnComments + (EpaComments [])) { DumpRenamedAst.hs:8:18-23 }) [(L (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:8:19-22 }) diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr index a31552ccb1..1ba86ee6ef 100644 --- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr @@ -15,7 +15,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -25,7 +25,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -35,7 +35,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -45,7 +45,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -55,7 +55,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -65,7 +65,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -80,7 +80,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (1374752024144278257) (NoSourceText)})))) (L @@ -91,7 +91,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (13654949607623281177) (NoSourceText)})))) (L @@ -113,7 +113,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -128,7 +128,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -141,7 +141,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsInt{64}Prim (1) (SourceText "1")})))) @@ -165,7 +165,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -175,7 +175,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -185,7 +185,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -195,7 +195,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -205,7 +205,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -215,7 +215,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -230,7 +230,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (10715337633704422415) (NoSourceText)})))) (L @@ -241,7 +241,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (12411373583424111944) (NoSourceText)})))) (L @@ -263,7 +263,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -278,7 +278,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -291,7 +291,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsInt{64}Prim (3) (SourceText "3")})))) @@ -315,7 +315,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -325,7 +325,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -335,7 +335,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -345,7 +345,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -355,7 +355,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -365,7 +365,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -380,7 +380,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (14073232900889011755) (NoSourceText)})))) (L @@ -391,7 +391,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (2739668351064589274) (NoSourceText)})))) (L @@ -413,7 +413,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -428,7 +428,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -441,7 +441,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsInt{64}Prim (0) (SourceText "0")})))) @@ -465,7 +465,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -475,7 +475,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -485,7 +485,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -495,7 +495,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -505,7 +505,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -515,7 +515,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -530,7 +530,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (13760111476013868540) (NoSourceText)})))) (L @@ -541,7 +541,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (12314848029315386153) (NoSourceText)})))) (L @@ -563,7 +563,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -578,7 +578,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -591,7 +591,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsInt{64}Prim (0) (SourceText "0")})))) @@ -615,7 +615,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -625,7 +625,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -635,7 +635,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -645,7 +645,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -655,7 +655,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -665,7 +665,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -680,7 +680,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (1143980031331647856) (NoSourceText)})))) (L @@ -691,7 +691,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsWord{64}Prim (14802086722010293686) (NoSourceText)})))) (L @@ -713,7 +713,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -728,7 +728,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -741,7 +741,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) {HsInt{64}Prim (0) (SourceText "0")})))) @@ -765,7 +765,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -780,7 +780,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsInt (NoExtField) @@ -801,7 +801,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -816,7 +816,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsInt (NoExtField) @@ -837,7 +837,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -852,7 +852,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsInt (NoExtField) @@ -873,7 +873,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -883,7 +883,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -917,7 +917,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -927,7 +927,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -961,7 +961,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -971,7 +971,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1005,7 +1005,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1015,7 +1015,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1049,7 +1049,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1059,7 +1059,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1093,7 +1093,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1103,7 +1103,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1129,7 +1129,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1139,7 +1139,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1172,7 +1172,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1182,7 +1182,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1215,7 +1215,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1225,7 +1225,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1271,7 +1271,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1281,7 +1281,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1320,7 +1320,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1330,7 +1330,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1349,7 +1349,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1364,7 +1364,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -1381,7 +1381,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { <no location info> }) @@ -1396,7 +1396,7 @@ { placeholder:-1:-1 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsStringPrim (NoSourceText) @@ -1423,7 +1423,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { DumpTypecheckedAst.hs:19:1-23 }) (FunBind (WpHole) @@ -1477,7 +1477,7 @@ { DumpTypecheckedAst.hs:19:17-23 } (UnchangedAnchor)) (NoEpAnns) - (AnnComments + (EpaComments [])) (HsString (SourceText "hello") diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr index 33e5bcd12d..3f477a4bec 100644 --- a/testsuite/tests/parser/should_compile/KindSigs.stderr +++ b/testsuite/tests/parser/should_compile/KindSigs.stderr @@ -17,14 +17,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { KindSigs.hs:36:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { KindSigs.hs:36:1 }))])) (VirtualBraces (1)) @@ -47,7 +47,7 @@ (Nothing) (Nothing) (Nothing)) - (AnnComments + (EpaComments [])) (NoSourceText) (L @@ -67,7 +67,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:11:1-17 }) (TyClD (NoExtField) @@ -81,7 +81,7 @@ [(AddEpAnn AnnType (AR { KindSigs.hs:11:1-4 })) ,(AddEpAnn AnnFamily (AR { KindSigs.hs:11:6-11 })) ,(AddEpAnn AnnWhere (AR { KindSigs.hs:11:19-23 }))] - (AnnComments + (EpaComments [])) (ClosedTypeFamily (Just @@ -93,7 +93,7 @@ { KindSigs.hs:12:3-21 } (UnchangedAnchor)) [(AddEpAnn AnnEqual (AR { KindSigs.hs:12:9 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:12:3-5 }) @@ -110,7 +110,7 @@ { KindSigs.hs:12:7 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -126,7 +126,7 @@ { KindSigs.hs:12:11-13 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:12:15-16 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:12:11-13 }) @@ -136,7 +136,7 @@ { KindSigs.hs:12:11-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -151,7 +151,7 @@ { KindSigs.hs:12:18-21 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -173,7 +173,7 @@ { KindSigs.hs:11:17 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -193,7 +193,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:15:1-51 }) (TyClD (NoExtField) @@ -204,7 +204,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:15:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:15:12 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:15:6-8 }) @@ -220,7 +220,7 @@ { KindSigs.hs:15:10 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -239,7 +239,7 @@ (AnnParens) (AR { KindSigs.hs:15:14 }) (AR { KindSigs.hs:15:51 })) - (AnnComments + (EpaComments [])) (HsBoxedOrConstraintTuple) [(L @@ -250,7 +250,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:15:27 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:15:16-26 }) (HsKindSig (EpAnn @@ -258,7 +258,7 @@ { KindSigs.hs:15:16-18 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:15:20-21 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:15:16-18 }) @@ -268,7 +268,7 @@ { KindSigs.hs:15:16-18 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -283,7 +283,7 @@ { KindSigs.hs:15:23-26 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -298,7 +298,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:15:33 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:15:29-32 }) (HsTyVar (EpAnn @@ -306,7 +306,7 @@ { KindSigs.hs:15:29-32 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -321,7 +321,7 @@ { KindSigs.hs:15:35-41 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:15:43-44 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:15:35-41 }) @@ -335,7 +335,7 @@ { KindSigs.hs:15:35-39 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -350,7 +350,7 @@ { KindSigs.hs:15:41 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -365,7 +365,7 @@ { KindSigs.hs:15:46-49 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -379,7 +379,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:16:1-54 }) (TyClD (NoExtField) @@ -390,7 +390,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:16:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:16:13 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:16:6-9 }) @@ -406,7 +406,7 @@ { KindSigs.hs:16:11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -425,7 +425,7 @@ (AnnParensHash) (AR { KindSigs.hs:16:15-16 }) (AR { KindSigs.hs:16:53-54 })) - (AnnComments + (EpaComments [])) (HsUnboxedTuple) [(L @@ -436,7 +436,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:16:29 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:16:18-28 }) (HsKindSig (EpAnn @@ -444,7 +444,7 @@ { KindSigs.hs:16:18-20 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:16:22-23 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:16:18-20 }) @@ -454,7 +454,7 @@ { KindSigs.hs:16:18-20 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -469,7 +469,7 @@ { KindSigs.hs:16:25-28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -484,7 +484,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:16:35 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:16:31-34 }) (HsTyVar (EpAnn @@ -492,7 +492,7 @@ { KindSigs.hs:16:31-34 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -507,7 +507,7 @@ { KindSigs.hs:16:37-43 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:16:45-46 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:16:37-43 }) @@ -521,7 +521,7 @@ { KindSigs.hs:16:37-41 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -536,7 +536,7 @@ { KindSigs.hs:16:43 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -551,7 +551,7 @@ { KindSigs.hs:16:48-51 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -565,7 +565,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:19:1-26 }) (TyClD (NoExtField) @@ -576,7 +576,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:19:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:19:10 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:19:6-8 }) @@ -597,7 +597,7 @@ (AnnParensSquare) (AR { KindSigs.hs:19:12 }) (AR { KindSigs.hs:19:26 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:19:14-24 }) @@ -607,7 +607,7 @@ { KindSigs.hs:19:14-16 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:19:18-19 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:19:14-16 }) @@ -617,7 +617,7 @@ { KindSigs.hs:19:14-16 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -632,7 +632,7 @@ { KindSigs.hs:19:21-24 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -646,7 +646,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:22:1-44 }) (SigD (NoExtField) @@ -658,7 +658,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { KindSigs.hs:22:5-6 })) []) - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:22:1-3 }) @@ -681,7 +681,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { KindSigs.hs:22:22-23 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -696,7 +696,7 @@ (AnnParens) (AR { KindSigs.hs:22:8 }) (AR { KindSigs.hs:22:20 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:22:9-19 }) @@ -706,7 +706,7 @@ { KindSigs.hs:22:9-11 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:22:13-14 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:22:9-11 }) @@ -716,7 +716,7 @@ { KindSigs.hs:22:9-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -731,7 +731,7 @@ { KindSigs.hs:22:16-19 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -747,7 +747,7 @@ (UnchangedAnchor)) (AddRarrowAnn (AR { KindSigs.hs:22:30-31 })) - (AnnComments + (EpaComments [])) (HsUnrestrictedArrow (NormalSyntax)) @@ -759,7 +759,7 @@ { KindSigs.hs:22:25-28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -777,7 +777,7 @@ (AnnParens) (AR { KindSigs.hs:22:33 }) (AR { KindSigs.hs:22:44 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:22:34-43 }) @@ -787,7 +787,7 @@ { KindSigs.hs:22:34-35 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:22:37-38 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:22:34-35 }) @@ -800,7 +800,7 @@ (AnnParens) (AR { KindSigs.hs:22:34 }) (AR { KindSigs.hs:22:35 })) - (AnnComments + (EpaComments [])) (HsBoxedOrConstraintTuple) [])) @@ -812,7 +812,7 @@ { KindSigs.hs:22:40-43 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -826,7 +826,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:23:1-12 }) (ValD (NoExtField) @@ -848,7 +848,7 @@ { KindSigs.hs:23:1-12 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (FunRhs (L @@ -877,7 +877,7 @@ (GrhsAnn (Nothing) (AddEpAnn AnnEqual (AR { KindSigs.hs:23:9 }))) - (AnnComments + (EpaComments [])) [] (L @@ -894,7 +894,7 @@ (AR { KindSigs.hs:23:11 }) (AR { KindSigs.hs:23:12 }) []) - (AnnComments + (EpaComments [])) { KindSigs.hs:23:11-12 }) (Exact {Name: ()}))))))] @@ -909,7 +909,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:26:1-29 }) (TyClD (NoExtField) @@ -920,7 +920,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:26:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:26:11 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:26:6-9 }) @@ -940,7 +940,7 @@ [(AddEpAnn AnnSimpleQuote (AR { KindSigs.hs:26:13 })) ,(AddEpAnn AnnOpenS (AR { KindSigs.hs:26:14 })) ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:26:29 }))] - (AnnComments + (EpaComments [])) (IsPromoted) [(L @@ -951,7 +951,7 @@ { KindSigs.hs:26:16-19 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:26:21-22 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:26:16-19 }) @@ -961,7 +961,7 @@ { KindSigs.hs:26:16-19 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -976,7 +976,7 @@ { KindSigs.hs:26:24-27 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -990,7 +990,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:27:1-45 }) (TyClD (NoExtField) @@ -1001,7 +1001,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:27:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:27:12 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:27:6-10 }) @@ -1020,7 +1020,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnOpenS (AR { KindSigs.hs:27:14 })) ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:27:45 }))] - (AnnComments + (EpaComments [])) (NotPromoted) [(L @@ -1031,7 +1031,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:27:28 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:27:16-27 }) (HsKindSig (EpAnn @@ -1039,7 +1039,7 @@ { KindSigs.hs:27:16-19 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:27:21-22 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:27:16-19 }) @@ -1049,7 +1049,7 @@ { KindSigs.hs:27:16-19 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1064,7 +1064,7 @@ { KindSigs.hs:27:24-27 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1079,7 +1079,7 @@ { KindSigs.hs:27:30-34 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:27:36-37 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:27:30-34 }) @@ -1089,7 +1089,7 @@ { KindSigs.hs:27:30-34 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1104,7 +1104,7 @@ { KindSigs.hs:27:39-42 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1118,7 +1118,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:28:1-44 }) (TyClD (NoExtField) @@ -1129,7 +1129,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:28:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:28:14 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:28:6-10 }) @@ -1145,7 +1145,7 @@ { KindSigs.hs:28:12 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -1163,7 +1163,7 @@ [(AddEpAnn AnnSimpleQuote (AR { KindSigs.hs:28:16 })) ,(AddEpAnn AnnOpenP (AR { KindSigs.hs:28:17 })) ,(AddEpAnn AnnCloseP (AR { KindSigs.hs:28:44 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnn @@ -1173,7 +1173,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:28:40 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:28:19-39 }) (HsKindSig (EpAnn @@ -1181,7 +1181,7 @@ { KindSigs.hs:28:19-29 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:28:31-32 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:28:19-29 }) @@ -1192,7 +1192,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnOpenS (AR { KindSigs.hs:28:19 })) ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:28:29 }))] - (AnnComments + (EpaComments [])) (NotPromoted) [(L @@ -1203,7 +1203,7 @@ (AnnListItem [(AddCommaAnn (AR { KindSigs.hs:28:23 }))]) - (AnnComments + (EpaComments [])) { KindSigs.hs:28:20-22 }) (HsTyVar (EpAnn @@ -1211,7 +1211,7 @@ { KindSigs.hs:28:20-22 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1226,7 +1226,7 @@ { KindSigs.hs:28:25-28 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1244,7 +1244,7 @@ (AnnParensSquare) (AR { KindSigs.hs:28:34 }) (AR { KindSigs.hs:28:39 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:28:35-38 }) @@ -1254,7 +1254,7 @@ { KindSigs.hs:28:35-38 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1269,7 +1269,7 @@ { KindSigs.hs:28:42 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1283,7 +1283,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:31:1-31 }) (TyClD (NoExtField) @@ -1294,7 +1294,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnType (AR { KindSigs.hs:31:1-4 })) ,(AddEpAnn AnnEqual (AR { KindSigs.hs:31:19 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:31:6-17 }) @@ -1312,7 +1312,7 @@ { KindSigs.hs:31:21-23 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:31:25-26 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:31:21-23 }) @@ -1322,7 +1322,7 @@ { KindSigs.hs:31:21-23 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1337,7 +1337,7 @@ { KindSigs.hs:31:28-31 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1351,7 +1351,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:34:1-22 }) (SigD (NoExtField) @@ -1363,7 +1363,7 @@ (AnnSig (AddEpAnn AnnDcolon (AR { KindSigs.hs:34:6-7 })) []) - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:34:1-4 }) @@ -1388,7 +1388,7 @@ (AnnParens) (AR { KindSigs.hs:34:9 }) (AR { KindSigs.hs:34:22 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:34:10-21 }) @@ -1398,7 +1398,7 @@ { KindSigs.hs:34:10-13 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { KindSigs.hs:34:15-16 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:34:10-13 }) @@ -1408,7 +1408,7 @@ { KindSigs.hs:34:10-13 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1423,7 +1423,7 @@ { KindSigs.hs:34:18-21 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -1437,7 +1437,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { KindSigs.hs:35:1-11 }) (ValD (NoExtField) @@ -1459,7 +1459,7 @@ { KindSigs.hs:35:1-11 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (FunRhs (L @@ -1481,7 +1481,7 @@ (GrhsAnn (Nothing) (AddEpAnn AnnEqual (AR { KindSigs.hs:35:6 }))) - (AnnComments + (EpaComments [])) [] (L diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr index 5fa06bd63e..c1ebd053ac 100644 --- a/testsuite/tests/parser/should_compile/T14189.stderr +++ b/testsuite/tests/parser/should_compile/T14189.stderr @@ -19,7 +19,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T14189.hs:6:1-42 }) (DataDecl (DataDeclRn @@ -47,7 +47,7 @@ (AnnListItem [(AddVbarAnn (AR { T14189.hs:6:22 }))]) - (AnnComments + (EpaComments [])) { T14189.hs:6:15-20 }) (ConDeclH98 (EpAnnNotUsed) @@ -80,7 +80,7 @@ (AnnListItem [(AddVbarAnn (AR { T14189.hs:6:27 }))]) - (AnnComments + (EpaComments [])) { T14189.hs:6:24-25 }) (ConDeclH98 (EpAnnNotUsed) @@ -121,7 +121,7 @@ (AddEpAnn AnnCloseC (AR { T14189.hs:6:42 }))) [] []) - (AnnComments + (EpaComments [])) { T14189.hs:6:31-42 }) [(L (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:33-40 }) diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr index 6ce1247f14..e91ff5b3f4 100644 --- a/testsuite/tests/parser/should_compile/T15323.stderr +++ b/testsuite/tests/parser/should_compile/T15323.stderr @@ -17,14 +17,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { T15323.hs:7:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { T15323.hs:7:1 }))])) (VirtualBraces (1)) @@ -41,7 +41,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T15323.hs:(5,1)-(6,54) }) (TyClD (NoExtField) @@ -52,7 +52,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T15323.hs:5:1-4 })) ,(AddEpAnn AnnWhere (AR { T15323.hs:5:21-25 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:5:6-17 }) @@ -68,7 +68,7 @@ { T15323.hs:5:19 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (()) (L @@ -83,7 +83,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T15323.hs:5:1-4 })) ,(AddEpAnn AnnWhere (AR { T15323.hs:5:21-25 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -97,7 +97,7 @@ { T15323.hs:6:5-54 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T15323.hs:6:17-18 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:5-14 }) @@ -113,7 +113,7 @@ ((,) (AddEpAnn AnnForall (AR { T15323.hs:6:20-25 })) (AddEpAnn AnnDot (AR { T15323.hs:6:29 }))) - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:27 }) @@ -123,7 +123,7 @@ { T15323.hs:6:27 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (SpecifiedSpec) (L @@ -143,7 +143,7 @@ (AR { T15323.hs:6:38-39 }))) [] []) - (AnnComments + (EpaComments [])) { T15323.hs:6:31-36 }) [(L (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:31-36 }) @@ -156,7 +156,7 @@ (AnnParens) (AR { T15323.hs:6:31 }) (AR { T15323.hs:6:36 })) - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-35 }) @@ -170,7 +170,7 @@ { T15323.hs:6:32-33 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -185,7 +185,7 @@ { T15323.hs:6:35 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -206,7 +206,7 @@ { T15323.hs:6:41-52 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -221,7 +221,7 @@ { T15323.hs:6:54 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr index 6a91856850..4787c0b8db 100644 --- a/testsuite/tests/printer/T18791.stderr +++ b/testsuite/tests/printer/T18791.stderr @@ -17,14 +17,14 @@ (Nothing) [] [])) - (AnnCommentsBalanced + (EpaCommentsBalanced [] [(L (Anchor { T18791.hs:6:1 } (UnchangedAnchor)) - (AnnComment - (AnnEofComment) + (EpaComment + (EpaEofComment) { T18791.hs:6:1 }))])) (VirtualBraces (1)) @@ -41,7 +41,7 @@ (UnchangedAnchor)) (AnnListItem []) - (AnnComments + (EpaComments [])) { T18791.hs:(4,1)-(5,17) }) (TyClD (NoExtField) @@ -52,7 +52,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T18791.hs:4:1-4 })) ,(AddEpAnn AnnWhere (AR { T18791.hs:4:8-12 }))] - (AnnComments + (EpaComments [])) (L (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:4:6 }) @@ -69,7 +69,7 @@ (UnchangedAnchor)) [(AddEpAnn AnnData (AR { T18791.hs:4:1-4 })) ,(AddEpAnn AnnWhere (AR { T18791.hs:4:8-12 }))] - (AnnComments + (EpaComments [])) (DataType) (Nothing) @@ -83,7 +83,7 @@ { T18791.hs:5:3-17 } (UnchangedAnchor)) [(AddEpAnn AnnDcolon (AR { T18791.hs:5:7-8 }))] - (AnnComments + (EpaComments [])) [(L (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:3-5 }) @@ -106,7 +106,7 @@ (AnnListItem [(AddRarrowAnn (AR { T18791.hs:5:14-15 }))]) - (AnnComments + (EpaComments [])) { T18791.hs:5:10-12 }) (HsTyVar (EpAnn @@ -114,7 +114,7 @@ { T18791.hs:5:10-12 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L @@ -129,7 +129,7 @@ { T18791.hs:5:17 } (UnchangedAnchor)) [] - (AnnComments + (EpaComments [])) (NotPromoted) (L diff --git a/utils/check-exact/ExactPrint.hs b/utils/check-exact/ExactPrint.hs index 30f71bdbc8..f65deb456b 100644 --- a/utils/check-exact/ExactPrint.hs +++ b/utils/check-exact/ExactPrint.hs @@ -275,7 +275,7 @@ enterAnn (Entry anchor' cs) a = do -- --------------------------------------------------------------------- -addCommentsA :: [LAnnotationComment] -> EPP () +addCommentsA :: [LEpaComment] -> EPP () addCommentsA csNew = addComments (map tokComment csNew) -- cs <- getUnallocatedComments -- -- AZ:TODO: sortedlist? @@ -412,7 +412,7 @@ data AnnotatedList a = AnnotatedList (Maybe Anchor) a deriving (Eq,Show) instance (ExactPrint a) => ExactPrint (AnnotatedList a) where - getAnnotationEntry (AnnotatedList (Just anc) _) = Entry anc (AnnComments []) + getAnnotationEntry (AnnotatedList (Just anc) _) = Entry anc (EpaComments []) getAnnotationEntry (AnnotatedList Nothing _) = NoEntryVal exact (AnnotatedList an ls) = do diff --git a/utils/check-exact/Transform.hs b/utils/check-exact/Transform.hs index 210f873a20..7d68da858a 100644 --- a/utils/check-exact/Transform.hs +++ b/utils/check-exact/Transform.hs @@ -470,9 +470,9 @@ setEntryDP' (L (SrcSpanAnn EpAnnNotUsed l) a) dp = L (SrcSpanAnn (EpAnn (Anchor (realSrcSpan l) (MovedAnchor dp)) mempty noCom) l) a -setEntryDP' (L (SrcSpanAnn (EpAnn (Anchor r _) an (AnnComments [])) l) a) dp +setEntryDP' (L (SrcSpanAnn (EpAnn (Anchor r _) an (EpaComments [])) l) a) dp = L (SrcSpanAnn - (EpAnn (Anchor r (MovedAnchor dp)) an (AnnComments [])) + (EpAnn (Anchor r (MovedAnchor dp)) an (EpaComments [])) l) a setEntryDP' (L (SrcSpanAnn (EpAnn (Anchor r _) an cs) l) a) dp = case sort (priorComments cs) of @@ -671,22 +671,22 @@ balanceCommentsMatch (L l (Match am mctxt pats (GRHSs xg grhss binds))) = do stay = map snd stay' (l'', grhss', binds', logInfo) = case reverse grhss of - [] -> (l, [], binds, (AnnComments [], SrcSpanAnn EpAnnNotUsed noSrcSpan)) - (L lg g@(GRHS EpAnnNotUsed _grs _rhs):gs) -> (l, reverse (L lg g:gs), binds, (AnnComments [], SrcSpanAnn EpAnnNotUsed noSrcSpan)) + [] -> (l, [], binds, (EpaComments [], SrcSpanAnn EpAnnNotUsed noSrcSpan)) + (L lg g@(GRHS EpAnnNotUsed _grs _rhs):gs) -> (l, reverse (L lg g:gs), binds, (EpaComments [], SrcSpanAnn EpAnnNotUsed noSrcSpan)) (L lg (GRHS ag grs rhs):gs) -> let anc1' = setFollowingComments anc1 stay an1' = setCommentsSrcAnn l anc1' -- --------------------------------- - (moved,bindsm) = pushTrailingComments WithWhere (AnnCommentsBalanced [] move) binds + (moved,bindsm) = pushTrailingComments WithWhere (EpaCommentsBalanced [] move) binds -- --------------------------------- (EpAnn anc an lgc) = ag lgc' = splitComments (realSrcSpan lg) $ addCommentOrigDeltas lgc ag' = if moved then EpAnn anc an lgc' - else EpAnn anc an (lgc' <> (AnnCommentsBalanced [] move)) + else EpAnn anc an (lgc' <> (EpaCommentsBalanced [] move)) -- ag' = EpAnn anc an lgc' in (an1', (reverse $ (L lg (GRHS ag' grs rhs):gs)), bindsm, (anc1',an1')) @@ -753,8 +753,8 @@ balanceComments' la1 la2 = do la2' = L an2' s -- | Like commentsDeltas, but calculates the delta from the end of the anchor, not the start -trailingCommentsDeltas :: RealSrcSpan -> [LAnnotationComment] - -> [(Int, LAnnotationComment)] +trailingCommentsDeltas :: RealSrcSpan -> [LEpaComment] + -> [(Int, LEpaComment)] trailingCommentsDeltas _ [] = [] trailingCommentsDeltas anc (la@(L l _):las) = deltaComment anc la : trailingCommentsDeltas (anchor l) las @@ -765,15 +765,15 @@ trailingCommentsDeltas anc (la@(L l _):las) (ll,_) = ss2pos (anchor loc) -- AZ:TODO: this is identical to commentsDeltas -priorCommentsDeltas :: RealSrcSpan -> [LAnnotationComment] - -> [(Int, LAnnotationComment)] +priorCommentsDeltas :: RealSrcSpan -> [LEpaComment] + -> [(Int, LEpaComment)] priorCommentsDeltas anc cs = go anc (reverse $ sort cs) where - go :: RealSrcSpan -> [LAnnotationComment] -> [(Int, LAnnotationComment)] + go :: RealSrcSpan -> [LEpaComment] -> [(Int, LEpaComment)] go _ [] = [] go anc' (la@(L l _):las) = deltaComment anc' la : go (anchor l) las - deltaComment :: RealSrcSpan -> LAnnotationComment -> (Int, LAnnotationComment) + deltaComment :: RealSrcSpan -> LEpaComment -> (Int, LEpaComment) deltaComment anc' (L loc c) = (abs(ll - al), L loc c) where (al,_) = ss2pos anc' @@ -783,14 +783,14 @@ priorCommentsDeltas anc cs = go anc (reverse $ sort cs) -- | Split comments into ones occuring before the end of the reference -- span, and those after it. splitComments :: RealSrcSpan -> EpAnnComments -> EpAnnComments -splitComments p (AnnComments cs) = cs' +splitComments p (EpaComments cs) = cs' where cmp (L (Anchor l _) _) = ss2pos l < ss2posEnd p (before, after) = break cmp cs cs' = case after of - [] -> AnnComments cs - _ -> AnnCommentsBalanced before after -splitComments p (AnnCommentsBalanced cs ts) = AnnCommentsBalanced cs' ts' + [] -> EpaComments cs + _ -> EpaCommentsBalanced before after +splitComments p (EpaCommentsBalanced cs ts) = EpaCommentsBalanced cs' ts' where cmp (L (Anchor l _) _) = ss2pos l < ss2posEnd p (before, after) = break cmp cs @@ -801,30 +801,30 @@ splitComments p (AnnCommentsBalanced cs ts) = AnnCommentsBalanced cs' ts' -- token. Takes an original list of comments, and converts the -- 'Anchor's to have a have a `MovedAnchor` operation based on the -- original locations. -commentOrigDeltas :: [LAnnotationComment] -> [LAnnotationComment] +commentOrigDeltas :: [LEpaComment] -> [LEpaComment] commentOrigDeltas [] = [] -commentOrigDeltas lcs@(L _ (GHC.AnnComment _ pt):_) = go pt lcs +commentOrigDeltas lcs@(L _ (GHC.EpaComment _ pt):_) = go pt lcs -- TODO:AZ: we now have deltas wrt *all* tokens, not just preceding -- non-comment. Simplify this. where - go :: RealSrcSpan -> [LAnnotationComment] -> [LAnnotationComment] + go :: RealSrcSpan -> [LEpaComment] -> [LEpaComment] go _ [] = [] - go p (L (Anchor la _) (GHC.AnnComment t pp):ls) - = L (Anchor la op) (GHC.AnnComment t pp) : go p' ls + go p (L (Anchor la _) (GHC.EpaComment t pp):ls) + = L (Anchor la op) (GHC.EpaComment t pp) : go p' ls where p' = p (r,c) = ss2posEnd pp op' = if r == 0 then MovedAnchor (ss2delta (r,c+1) la) else MovedAnchor (ss2delta (r,c) la) - op = if t == AnnEofComment && op' == MovedAnchor (DP 0 0) + op = if t == EpaEofComment && op' == MovedAnchor (DP 0 0) then MovedAnchor (DP 1 0) else op' addCommentOrigDeltas :: EpAnnComments -> EpAnnComments -addCommentOrigDeltas (AnnComments cs) = AnnComments (commentOrigDeltas cs) -addCommentOrigDeltas (AnnCommentsBalanced pcs fcs) - = AnnCommentsBalanced (commentOrigDeltas pcs) (commentOrigDeltas fcs) +addCommentOrigDeltas (EpaComments cs) = EpaComments (commentOrigDeltas cs) +addCommentOrigDeltas (EpaCommentsBalanced pcs fcs) + = EpaCommentsBalanced (commentOrigDeltas pcs) (commentOrigDeltas fcs) addCommentOrigDeltasAnn :: (EpAnn' a) -> (EpAnn' a) addCommentOrigDeltasAnn EpAnnNotUsed = EpAnnNotUsed @@ -857,12 +857,12 @@ balanceSameLineComments (L la (Match anm mctxt pats (GRHSs x grhss lb))) = do anc1 = addCommentOrigDeltas $ epAnnComments an1 (EpAnn anc an _) = ga :: EpAnn' GrhsAnn (csp,csf) = case anc1 of - AnnComments cs -> ([],cs) - AnnCommentsBalanced p f -> (p,f) + EpaComments cs -> ([],cs) + EpaCommentsBalanced p f -> (p,f) (move',stay') = break (simpleBreak 0) (trailingCommentsDeltas (anchor anc) csf) move = map snd move' stay = map snd stay' - cs1 = AnnCommentsBalanced csp stay + cs1 = EpaCommentsBalanced csp stay gac = addCommentOrigDeltas $ epAnnComments ga gfc = getFollowingComments gac diff --git a/utils/check-exact/Types.hs b/utils/check-exact/Types.hs index 6bae34631a..6717e45698 100644 --- a/utils/check-exact/Types.hs +++ b/utils/check-exact/Types.hs @@ -11,7 +11,7 @@ module Types where -import GHC hiding (AnnComment) +import GHC hiding (EpaComment) import GHC.Utils.Outputable hiding ( (<>) ) import GHC.Driver.Ppr import Data.Data (Data, toConstr,cast) diff --git a/utils/check-exact/Utils.hs b/utils/check-exact/Utils.hs index 57dab9d95c..0ac0bcdf91 100644 --- a/utils/check-exact/Utils.hs +++ b/utils/check-exact/Utils.hs @@ -24,7 +24,7 @@ import Data.Ord (comparing) import GHC.Hs.Dump import Lookup -import GHC hiding (AnnComment) +import GHC hiding (EpaComment) import qualified GHC import GHC.Types.Name import GHC.Types.Name.Reader @@ -260,17 +260,17 @@ isExactName = False `mkQ` isExact -- --------------------------------------------------------------------- -ghcCommentText :: LAnnotationComment -> String -ghcCommentText (L _ (GHC.AnnComment (AnnDocCommentNext s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnDocCommentPrev s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnDocCommentNamed s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnDocSection _ s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnDocOptions s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnLineComment s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnBlockComment s) _)) = s -ghcCommentText (L _ (GHC.AnnComment (AnnEofComment) _)) = "" - -tokComment :: LAnnotationComment -> Comment +ghcCommentText :: LEpaComment -> String +ghcCommentText (L _ (GHC.EpaComment (EpaDocCommentNext s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaDocCommentPrev s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaDocCommentNamed s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaDocSection _ s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaDocOptions s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaLineComment s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaBlockComment s) _)) = s +ghcCommentText (L _ (GHC.EpaComment (EpaEofComment) _)) = "" + +tokComment :: LEpaComment -> Comment tokComment t@(L lt _) = mkComment (normaliseCommentText $ ghcCommentText t) lt mkComment :: String -> Anchor -> Comment diff --git a/utils/check-ppr/Main.hs b/utils/check-ppr/Main.hs index c08f6e755d..542a35780e 100644 --- a/utils/check-ppr/Main.hs +++ b/utils/check-ppr/Main.hs @@ -101,8 +101,8 @@ parseOneFile libdir fileName = do getPragmas :: Located HsModule -> String getPragmas (L _ (HsModule { hsmodAnn = anns'})) = pragmaStr where - tokComment (L _ (AnnComment (AnnBlockComment s) _)) = s - tokComment (L _ (AnnComment (AnnLineComment s) _)) = s + tokComment (L _ (EpaComment (EpaBlockComment s) _)) = s + tokComment (L _ (EpaComment (EpaLineComment s) _)) = s tokComment _ = "" cmp (L l1 _) (L l2 _) = compare (anchor l1) (anchor l2) |