| ... |
... |
@@ -1486,9 +1486,7 @@ markAnnList ann action = do |
|
1486
|
1486
|
markAnnList' :: (Monad m, Monoid w)
|
|
1487
|
1487
|
=> AnnList -> EP w m a -> EP w m (AnnList, a)
|
|
1488
|
1488
|
markAnnList' ann action = do
|
|
1489
|
|
- markAnnListA' ann $ \a -> do
|
|
1490
|
|
- r <- action
|
|
1491
|
|
- return (a,r)
|
|
|
1489
|
+ markAnnListA' ann $ action
|
|
1492
|
1490
|
|
|
1493
|
1491
|
markAnnListA :: (Monad m, Monoid w)
|
|
1494
|
1492
|
=> EpAnn AnnList
|
| ... |
... |
@@ -1503,14 +1501,14 @@ markAnnListA an action = do |
|
1503
|
1501
|
|
|
1504
|
1502
|
markAnnListA' :: (Monad m, Monoid w)
|
|
1505
|
1503
|
=> AnnList
|
|
1506
|
|
- -> (AnnList -> EP w m (AnnList, a))
|
|
|
1504
|
+ -> EP w m a
|
|
1507
|
1505
|
-> EP w m (AnnList, a)
|
|
1508
|
1506
|
markAnnListA' an action = do
|
|
1509
|
1507
|
an0 <- markLensBracketsO' an lal_brackets
|
|
1510
|
1508
|
an1 <- markEpAnnAllLT' an0 lal_semis
|
|
1511
|
|
- (an2, r) <- action an1
|
|
1512
|
|
- an3 <- markLensBracketsC' an2 lal_brackets
|
|
1513
|
|
- return (an3, r)
|
|
|
1509
|
+ r <- action
|
|
|
1510
|
+ an2 <- markLensBracketsC' an1 lal_brackets
|
|
|
1511
|
+ return (an2, r)
|
|
1514
|
1512
|
|
|
1515
|
1513
|
-- ---------------------------------------------------------------------
|
|
1516
|
1514
|
|
| ... |
... |
@@ -2413,9 +2411,7 @@ instance ExactPrint (ClsInstDecl GhcPs) where |
|
2413
|
2411
|
, cid_modifiers = mods })
|
|
2414
|
2412
|
= do
|
|
2415
|
2413
|
(mbWarn', i', w', mbOverlap', inst_ty', mods') <- top_matter
|
|
2416
|
|
- (ann_list', decls') <- markAnnListA' ann_list $ \a -> do
|
|
2417
|
|
- r <- setLayoutBoth $ mapM markAnnotated decls
|
|
2418
|
|
- return (a,r)
|
|
|
2414
|
+ (ann_list', decls') <- markAnnListA' ann_list $ setLayoutBoth $ mapM markAnnotated decls
|
|
2419
|
2415
|
return (ClsInstDecl { cid_ext = (mbWarn', AnnClsInstDecl i' w' ann_list')
|
|
2420
|
2416
|
, cid_poly_ty = inst_ty'
|
|
2421
|
2417
|
, cid_decls = decls'
|
| ... |
... |
@@ -3336,9 +3332,7 @@ markMaybeDodgyStmts (an,l) stmts = |
|
3336
|
3332
|
c' <- markEpToken c
|
|
3337
|
3333
|
return (Left (o',c'), r)
|
|
3338
|
3334
|
Right an' -> do
|
|
3339
|
|
- (an'',r') <- markAnnListA' an' $ \a -> do
|
|
3340
|
|
- r <- markAnnotatedWithLayout stmts
|
|
3341
|
|
- return (a, r)
|
|
|
3335
|
+ (an'',r') <- markAnnListA' an' $ markAnnotatedWithLayout stmts
|
|
3342
|
3336
|
return (Right an'',r')
|
|
3343
|
3337
|
return ((an0, l), stmts')
|
|
3344
|
3338
|
else return ((an, l), stmts)
|
| ... |
... |
@@ -3411,9 +3405,7 @@ instance (Typeable body, |
|
3411
|
3405
|
= MG (origin,an) (L (setAnchorEpa l anc ts cs) matches)
|
|
3412
|
3406
|
|
|
3413
|
3407
|
exact (MG (origin,an) (L l matches)) = do
|
|
3414
|
|
- (an0,matches') <- markAnnListA' an $ \a -> do
|
|
3415
|
|
- m' <- markAnnotated matches
|
|
3416
|
|
- return (a,m')
|
|
|
3408
|
+ (an0,matches') <- markAnnListA' an $ markAnnotated matches
|
|
3417
|
3409
|
return (MG (origin, an0) (L l matches'))
|
|
3418
|
3410
|
|
|
3419
|
3411
|
-- ---------------------------------------------------------------------
|