fd76e60 · typeable/pandoc

git.iko.soy/typeable/pandoc

T.P.Readers.Odt.StyleReader: rewrite foldr1 use as foldr.

This avoids a partial function.

commitfd76e605cde2639d6bb1b6891dd4b097a6eded01 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 18 Mar 2021, 21:02 (6 years ago) parent2d10f46

1 file changed+6−5

unifiedsplit

src/Text/Pandoc/Readers/Odt/StyleReader.hs+6−5

@@ -563,12 +563,13 @@ readListLevelStyle levelType = readAttr NsText "level"

563563

564564--

565565chooseMostSpecificListLevelStyle :: S.Set ListLevelStyle -> Maybe ListLevelStyle

566−chooseMostSpecificListLevelStyle ls | ls == mempty = Nothing

567− | otherwise = Just ( F.foldr1 select ls )

566+chooseMostSpecificListLevelStyle ls = F.foldr select Nothing ls

568567 where

569− select ( ListLevelStyle t1 p1 s1 f1 b1 )

570− ( ListLevelStyle t2 p2 s2 f2 _ )

571− = ListLevelStyle (select' t1 t2) (p1 <|> p2) (s1 <|> s2) (selectLinf f1 f2) b1

568+ select l Nothing = Just l

569+ select ( ListLevelStyle t1 p1 s1 f1 b1 )

570+ ( Just ( ListLevelStyle t2 p2 s2 f2 _ ))

571+ = Just $ ListLevelStyle (select' t1 t2) (p1 <|> p2) (s1 <|> s2)

572+ (selectLinf f1 f2) b1

572573 select' LltNumbered _ = LltNumbered

573574 select' _ LltNumbered = LltNumbered

574575 select' _ _ = LltBullet