a44fdea · ormolu · git.iko.soy

git.iko.soy/ormolu

Remove redundant ‘sitcc’

commita44fdeaae144e4884d3608ae83057f37073de93f authorMark Karpov <markkarpov92@gmail.com> dateWed 27 May 2020, 15:23 (6 years ago) parentef07eb8

8 files changed+32−32

compare with master

unifiedsplit

src/Ormolu/Printer/Meat/Declaration/Data.hs+1−1 src/Ormolu/Printer/Meat/Declaration/Default.hs+1−1 src/Ormolu/Printer/Meat/Declaration/Rule.hs+1−1 src/Ormolu/Printer/Meat/Declaration/Signature.hs+1−1 src/Ormolu/Printer/Meat/Declaration/Value.hs+18−18 src/Ormolu/Printer/Meat/Declaration/Warning.hs+2−2 src/Ormolu/Printer/Meat/ImportExport.hs+3−3 src/Ormolu/Printer/Meat/Type.hs+5−5

src/Ormolu/Printer/Meat/Declaration/Data.hs+1−1

@@ -211,7 +211,7 @@ p_hsDerivingClause HsDerivingClause {..} = do

211211 let derivingWhat = located deriv_clause_tys $ \case

212212 [] -> txt "()"

213213 xs ->

214− parens N . sitcc $

214+ parens N $

215215 sep

216216 (comma >> breakpoint)

217217 (sitcc . located' p_hsType . hsib_body)

src/Ormolu/Printer/Meat/Declaration/Default.hs+1−1

@@ -15,6 +15,6 @@ p_defaultDecl = \case

1515 DefaultDecl NoExtField ts -> do

1616 txt "default"

1717 breakpoint

18− inci . parens N . sitcc $

18+ inci . parens N $

1919 sep (comma >> breakpoint) (sitcc . located' p_hsType) ts

2020 XDefaultDecl x -> noExtCon x

src/Ormolu/Printer/Meat/Declaration/Rule.hs+1−1

@@ -18,7 +18,7 @@ import Ormolu.Printer.Meat.Type

1818p_ruleDecls :: RuleDecls GhcPs -> R ()

1919p_ruleDecls = \case

2020 HsRules NoExtField _ xs ->

21− pragma "RULES" . sitcc $

21+ pragma "RULES" $

2222 sep breakpoint (sitcc . located' p_ruleDecl) xs

2323 XRuleDecls x -> noExtCon x

2424

src/Ormolu/Printer/Meat/Declaration/Signature.hs+1−1

@@ -211,7 +211,7 @@ p_completeSig ::

211211p_completeSig cs' mty =

212212 located cs' $ \cs ->

213213 pragma "COMPLETE" . inci $ do

214− sitcc $ sep (comma >> breakpoint) p_rdrName cs

214+ sep (comma >> breakpoint) p_rdrName cs

215215 forM_ mty $ \ty -> do

216216 space

217217 txt "::"

src/Ormolu/Printer/Meat/Declaration/Value.hs+18−18

@@ -316,7 +316,7 @@ p_hsCmd = \case

316316 HsHigherOrderApp -> txt "-<<"

317317 placeHanging (exprPlacement (unLoc input)) $

318318 located input p_hsExpr

319− HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ sitcc $ do

319+ HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do

320320 located form p_hsExpr

321321 unless (null cmds) $ do

322322 breakpoint

@@ -654,7 +654,7 @@ p_hsExpr' s = \case

654654 switchLayout [] . parens' s $

655655 sep comma (located' p_hsTupArg) args

656656 else

657− switchLayout (getLoc <$> args) . parens' s . sitcc $

657+ switchLayout (getLoc <$> args) . parens' s $

658658 sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args

659659 ExplicitSum NoExtField tag arity e ->

660660 p_unboxedSum N tag arity (located e p_hsExpr)

@@ -665,7 +665,7 @@ p_hsExpr' s = \case

665665 HsMultiIf NoExtField guards -> do

666666 txt "if"

667667 breakpoint

668− inci . inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards

668+ inci . inci $ sep newline (located' (p_grhs RightArrow)) guards

669669 HsLet NoExtField localBinds e ->

670670 p_let p_hsExpr localBinds e

671671 HsDo NoExtField ctx es -> do

@@ -680,7 +680,7 @@ p_hsExpr' s = \case

680680 compBody = brackets N $ located es $ \xs -> do

681681 let p_parBody =

682682 sep

683− (breakpoint >> txt "| ")

683+ (breakpoint >> txt "|" >> space)

684684 p_seqBody

685685 p_seqBody =

686686 sitcc

@@ -706,7 +706,7 @@ p_hsExpr' s = \case

706706 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"

707707 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"

708708 ExplicitList _ _ xs ->

709− brackets s . sitcc $

709+ brackets s $

710710 sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs

711711 RecordCon {..} -> do

712712 located rcon_con_name atom

@@ -723,7 +723,7 @@ p_hsExpr' s = \case

723723 case rec_dotdot of

724724 Just {} -> [txt ".."]

725725 Nothing -> []

726− inci . braces N . sitcc $

726+ inci . braces N $

727727 sep (comma >> breakpoint) sitcc (fields <> dotdot)

728728 RecordUpd {..} -> do

729729 located rupd_expr p_hsExpr

@@ -742,7 +742,7 @@ p_hsExpr' s = \case

742742 Unambiguous _ n -> n

743743 XAmbiguousFieldOcc x -> noExtCon x

744744 }

745− inci . braces N . sitcc $

745+ inci . braces N $

746746 sep

747747 (comma >> breakpoint)

748748 (sitcc . located' (p_hsRecField . updName))

@@ -757,22 +757,22 @@ p_hsExpr' s = \case

757757 ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x

758758 ArithSeq NoExtField _ x ->

759759 case x of

760− From from -> brackets s . sitcc $ do

760+ From from -> brackets s $ do

761761 located from p_hsExpr

762762 breakpoint

763763 txt ".."

764− FromThen from next -> brackets s . sitcc $ do

765− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]

764+ FromThen from next -> brackets s $ do

765+ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]

766766 breakpoint

767767 txt ".."

768− FromTo from to -> brackets s . sitcc $ do

768+ FromTo from to -> brackets s $ do

769769 located from p_hsExpr

770770 breakpoint

771771 txt ".."

772772 space

773773 located to p_hsExpr

774− FromThenTo from next to -> brackets s . sitcc $ do

775− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]

774+ FromThenTo from next to -> brackets s $ do

775+ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]

776776 breakpoint

777777 txt ".."

778778 space

@@ -849,7 +849,7 @@ p_patSynBind PSB {..} = do

849849 inci $ do

850850 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do

851851 unless (null xs) breakpoint

852− braces N . sitcc $

852+ braces N $

853853 sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs

854854 rhs

855855 InfixCon l r -> do

@@ -946,13 +946,13 @@ p_pat = \case

946946 txt "!"

947947 located pat p_pat

948948 ListPat NoExtField pats ->

949− brackets S . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats

949+ brackets S $ sep (comma >> breakpoint) (located' p_pat) pats

950950 TuplePat NoExtField pats boxing -> do

951− let f =

951+ let parens' =

952952 case boxing of

953953 Boxed -> parens S

954954 Unboxed -> parensHash S

955− f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats

955+ parens' $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats

956956 SumPat NoExtField pat tag arity ->

957957 p_unboxedSum S tag arity (located pat p_pat)

958958 ConPatIn pat details ->

@@ -968,7 +968,7 @@ p_pat = \case

968968 let f = \case

969969 Nothing -> txt ".."

970970 Just x -> located x p_pat_hsRecField

971− inci . braces N . sitcc . sep (comma >> breakpoint) f $

971+ inci . braces N . sep (comma >> breakpoint) f $

972972 case dotdot of

973973 Nothing -> Just <$> fields

974974 Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]

src/Ormolu/Printer/Meat/Declaration/Warning.hs+2−2

@@ -35,7 +35,7 @@ p_topLevelWarning fnames wtxt = do

3535 switchLayout (fmap getLoc fnames ++ fmap getLoc lits)

3636 $ pragma pragmaText . inci

3737 $ do

38− sitcc $ sep (comma >> breakpoint) p_rdrName fnames

38+ sep (comma >> breakpoint) p_rdrName fnames

3939 breakpoint

4040 p_lits lits

4141

@@ -47,4 +47,4 @@ warningText = \case

4747p_lits :: [Located StringLiteral] -> R ()

4848p_lits = \case

4949 [l] -> atom l

50− ls -> brackets N . sitcc $ sep (comma >> breakpoint) atom ls

50+ ls -> brackets N $ sep (comma >> breakpoint) atom ls

src/Ormolu/Printer/Meat/ImportExport.hs+3−3

@@ -21,7 +21,7 @@ p_hsmodExports [] = do

2121 breakpoint'

2222 txt ")"

2323p_hsmodExports xs =

24− parens N . sitcc $ do

24+ parens N $ do

2525 layout <- getLayout

2626 sep

2727 breakpoint

@@ -65,7 +65,7 @@ p_hsmodImport useQualifiedPost ImportDecl {..} = do

6565 Nothing -> return ()

6666 Just (_, L _ xs) -> do

6767 breakpoint

68− parens N . sitcc $ do

68+ parens N $ do

6969 layout <- getLayout

7070 sep

7171 breakpoint

@@ -93,7 +93,7 @@ p_lie encLayout relativePos = \case

9393 inci $ do

9494 let names :: [R ()]

9595 names = located' p_ieWrappedName <$> xs

96− parens N . sitcc

96+ parens N

9797 $ sep (comma >> breakpoint) sitcc

9898 $ case w of

9999 NoIEWildcard -> names

src/Ormolu/Printer/Meat/Type.hs+5−5

@@ -98,10 +98,10 @@ p_hsType' multilineArgs docStyle = \case

9898 HsBoxedTuple -> parens N

9999 HsConstraintTuple -> parens N

100100 HsBoxedOrConstraintTuple -> parens N

101− in parens' . sitcc $

101+ in parens' $

102102 sep (comma >> breakpoint) (sitcc . located' p_hsType) xs

103103 HsSumTy NoExtField xs ->

104− parensHash N . sitcc $

104+ parensHash N $

105105 sep (txt "|" >> breakpoint) (sitcc . located' p_hsType) xs

106106 HsOpTy NoExtField x op y ->

107107 sitcc $

@@ -154,7 +154,7 @@ p_hsType' multilineArgs docStyle = \case

154154 case (p, xs) of

155155 (IsPromoted, L _ t : _) | isPromoted t -> space

156156 _ -> return ()

157− sitcc $ sep (comma >> breakpoint) (sitcc . located' p_hsType) xs

157+ sep (comma >> breakpoint) (sitcc . located' p_hsType) xs

158158 HsExplicitTupleTy NoExtField xs -> do

159159 txt "'"

160160 parens N $ do

@@ -193,7 +193,7 @@ p_hsContext = \case

193193 [] -> txt "()"

194194 [x] -> located x p_hsType

195195 xs ->

196− parens N . sitcc $

196+ parens N $

197197 sep (comma >> breakpoint) (sitcc . located' p_hsType) xs

198198

199199p_hsTyVarBndr :: HsTyVarBndr GhcPs -> R ()

@@ -224,7 +224,7 @@ p_forallBndrs vis p tyvars =

224224

225225p_conDeclFields :: [LConDeclField GhcPs] -> R ()

226226p_conDeclFields xs =

227− braces N . sitcc $

227+ braces N $

228228 sep (comma >> breakpoint) (sitcc . located' p_conDeclField) xs

229229

230230p_conDeclField :: ConDeclField GhcPs -> R ()