Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Parser.y
    ... ... @@ -1797,10 +1797,10 @@ cvars1 :: { [RecordPatSynField GhcPs] }
    1797 1797 
     where_decls :: { LocatedA (OrdList (LHsDecl GhcPs), EpToken "where", AnnList) }
    1798 1798 
             : 'where' '{' decls '}'       {% amsA' (sLL $1 $> (thdOf3 $ unLoc $3,
    1799 1799 
                                                     epTok $1,
    1800 
    -                                                AnnList (AnnListLayout (fstOf3 $ unLoc $3)) (ListBraces (epTok $2) (epTok $4)) (sndOf3 $ unLoc $3))) }
    1800 
    +                                                AnnList AnnListBraces (ListBraces (epTok $2) (epTok $4)) (sndOf3 $ unLoc $3))) }
    1801 1801 
             | 'where' vocurly decls close {% amsA' (sLL $1 $3 (thdOf3 $ unLoc $3,
    1802 1802 
                                                     epTok $1,
    1803 
    -                                                AnnList (AnnListLayout (fstOf3 $ unLoc $3)) ListNone (sndOf3 $ unLoc $3))) }
    1803 
    +                                                AnnList (AnnListLayout (glR $3)) ListNone (sndOf3 $ unLoc $3))) }
    1804 1804
    1805 1805 
     pattern_synonym_sig :: { LSig GhcPs }
    1806 1806 
             : 'pattern' con_list '::' sigtype
    ... ... @@ -1936,7 +1936,7 @@ decls :: { Located (EpaLocation, [EpToken ";"], OrdList (LHsDecl GhcPs)) }
    1936 1936 
             | {- empty -}                   { noLoc (noAnn, [],nilOL) }
    1937 1937
    1938 1938 
     decllist :: { Located (AnnList,Located (OrdList (LHsDecl GhcPs))) }
    1939 
    -        : '{'            decls '}'     { sLL $1 $> (AnnList (AnnListLayout (fstOf3 $ unLoc $2)) (ListBraces (epTok $1) (epTok $3)) (sndOf3 $ unLoc $2)
    1939 
    +        : '{'            decls '}'     { sLL $1 $> (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) (sndOf3 $ unLoc $2)
    1940 1940 
                                                        ,sL1 $2 $ thdOf3 $ unLoc $2) }
    1941 1941 
             |     vocurly    decls close   { sL1 $2    (AnnList (AnnListLayout (fstOf3 $ unLoc $2)) ListNone (sndOf3 $ unLoc $2)
    1942 1942 
                                                        ,sL1 $2 $ thdOf3 $ unLoc $2) }
    ... ... @@ -1952,7 +1952,7 @@ binds :: { Located (HsLocalBinds GhcPs) }
    1952 1952 
                                       ; return (sL1 $1 $ HsValBinds (EpAnn (glR $1) (AnnList la p s) cs, noEpTok) val_binds)} }
    1953 1953
    1954 1954 
             | '{'            dbinds '}'     {% acs (comb3 $1 $2 $3) (\loc cs -> (L loc
    1955 
    -                                             $ HsIPBinds (EpAnn (spanAsAnchor (comb3 $1 $2 $3)) (AnnList (AnnListLayout$ glR $2) (ListBraces (epTok $1) (epTok $3)) []) cs, noEpTok) (IPBinds noExtField (reverse $ unLoc $2)))) }
    1955 
    +                                             $ HsIPBinds (EpAnn (spanAsAnchor (comb3 $1 $2 $3)) (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) []) cs, noEpTok) (IPBinds noExtField (reverse $ unLoc $2)))) }
    1956 1956
    1957 1957 
             |     vocurly    dbinds close   {% acs (gl $2) (\loc cs -> (L loc
    1958 1958 
                                                  $ HsIPBinds (EpAnn (glR $1) (AnnList (AnnListLayout $ glR $2) ListNone []) cs, noEpTok) (IPBinds noExtField (reverse $ unLoc $2)))) }
    ... ... @@ -3543,12 +3543,12 @@ guardquals1 :: { Located [LStmt GhcPs (LHsExpr GhcPs)] }
    3543 3543 
     altslist(PATS) :: { forall b. DisambECP b => PV (LocatedA ([LMatch GhcPs (LocatedA b)], AnnList)) }
    3544 3544 
             : '{'        alts(PATS) '}'    { $2 >>= \ $2 -> amsA'
    3545 3545 
                                                (sLL $1 $> (reverse (snd $ unLoc $2),
    3546 
    -                                           (AnnList (AnnListLayout $ glR $2) (ListBraces (epTok $1) (epTok $3)) (fst $ unLoc $2)))) }
    3546 
    +                                           (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) (fst $ unLoc $2)))) }
    3547 3547 
             | vocurly    alts(PATS)  close { $2 >>= \ $2 -> amsA'
    3548 3548 
                                                (L (getLoc $2) (reverse (snd $ unLoc $2),
    3549 3549 
                                                (AnnList (AnnListLayout $ glR $2) ListNone (fst $ unLoc $2)))) }
    3550 
    -        | '{'              '}'   { amsA' (sLL $1 $> ([], (AnnList AnnListNoLayout (ListBraces (epTok $1) (epTok $2)) []))) }
    3551 
    -        | vocurly          close { return $ noLocA ([], noAnn) }
    3550 
    +        | '{'              '}'   { amsA' (sLL $1 $> ([], (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $2)) []))) }
    3551 
    +        | vocurly          close { return $ noLocA ([], AnnList (AnnListLayout $ glR $1) ListNone []) }
    3552 3552
    3553 3553 
     alts(PATS) :: { forall b. DisambECP b => PV (Located ([EpToken ";"],[LMatch GhcPs (LocatedA b)])) }
    3554 3554 
             : alts1(PATS)              { $1 >>= \ $1 -> return $
    ... ... @@ -3657,7 +3657,7 @@ apat : aexp {% (checkPattern <=< runPV) (unECP $1) }
    3657 3657
    3658 3658 
     stmtlist :: { forall b. DisambECP b => PV (LocatedA (AnnList, Located [LocatedA (Stmt GhcPs (LocatedA b))])) }
    3659 3659 
             : '{'           stmts '}'       { $2 >>= \ $2 ->
    3660 
    -                                          amsA' (sLL $1 $> (AnnList (AnnListLayout (spanAsAnchor $ stmtsLoc $2)) (ListBraces (epTok $1) (epTok $3)) (fromOL $ fst $ unLoc $2)
    3660 
    +                                          amsA' (sLL $1 $> (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) (fromOL $ fst $ unLoc $2)
    3661 3661 
                                                                , sL1 $2 $ reverse $ snd $ unLoc $2))}
    3662 3662 
             |     vocurly   stmts close     { $2 >>= \ $2 ->
    3663 3663 
                                               amsA' (L (stmtsLoc $2) (AnnList (AnnListLayout (spanAsAnchor $ stmtsLoc $2)) ListNone (fromOL $ fst $ unLoc $2)

  • testsuite/tests/parser/should_compile/DumpSemis.stderr
    ... ... @@ -364,8 +364,7 @@
    364 364 
                            ((,)
    365 365 
                             (Right
    366 366 
                              (AnnList
    367 
    -                          (AnnListLayout
    368 
    -                           (EpaSpan { DumpSemis.hs:11:8-13 }))
    367 
    +                          (AnnListBraces)
    369 368 
                               (ListBraces
    370 369 
                                (EpTok (EpaSpan { DumpSemis.hs:11:6 }))
    371 370 
                                (EpTok (EpaSpan { DumpSemis.hs:11:15 })))
    ... ... @@ -627,8 +626,7 @@
    627 626 
                      ((,)
    628 627 
                       (Right
    629 628 
                        (AnnList
    630 
    -                    (AnnListLayout
    631 
    -                     (EpaSpan { DumpSemis.hs:(16,5)-(18,5) }))
    629 
    +                    (AnnListBraces)
    632 630 
                         (ListBraces
    633 631 
                          (EpTok (EpaSpan { DumpSemis.hs:16:3 }))
    634 632 
                          (EpTok (EpaSpan { DumpSemis.hs:19:3 })))
    ... ... @@ -880,8 +878,7 @@
    880 878 
                      ((,)
    881 879 
                       (Right
    882 880 
                        (AnnList
    883 
    -                    (AnnListLayout
    884 
    -                     (EpaSpan { DumpSemis.hs:22:12-28 }))
    881 
    +                    (AnnListBraces)
    885 882 
                         (ListBraces
    886 883 
                          (EpTok (EpaSpan { DumpSemis.hs:22:10 }))
    887 884 
                          (EpTok (EpaSpan { DumpSemis.hs:22:30 })))
    ... ... @@ -1936,8 +1933,7 @@
    1936 1933 
                        (EpAnn
    1937 1934 
                         (EpaSpan { DumpSemis.hs:34:13-31 })
    1938 1935 
                         (AnnList
    1939 
    -                     (AnnListLayout
    1940 
    -                      (EpaSpan { DumpSemis.hs:34:18-30 }))
    1936 
    +                     (AnnListBraces)
    1941 1937 
                          (ListBraces
    1942 1938 
                           (EpTok (EpaSpan { DumpSemis.hs:34:13 }))
    1943 1939 
                           (EpTok (EpaSpan { DumpSemis.hs:34:31 })))
    ... ... @@ -2333,8 +2329,7 @@
    2333 2329 
                       ((,)
    2334 2330 
                        (FromSource)
    2335 2331 
                        (AnnList
    2336 
    -                    (AnnListLayout
    2337 
    -                     (EpaSpan { DumpSemis.hs:(38,6)-(43,13) }))
    2332 
    +                    (AnnListBraces)
    2338 2333 
                         (ListBraces
    2339 2334 
                          (EpTok (EpaSpan { DumpSemis.hs:38:4 }))
    2340 2335 
                          (EpTok (EpaSpan { DumpSemis.hs:44:4 })))

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help Notification message regarding https://gitlab.haskell.org/ghc/ghc/-/commit/f34c79ee8e394b59dd9bc0c93078a0a7669ec313 at 1792054519