git.iko.soy/typeable/pandoc
on master help sign in
Odt reader: replaced collectRights with rights from Data.Either.
commit21c4281b13bf2d72012139ecc5c16cf7cae21de1 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 20 Jun 2017, 22:43 (9 years ago) parentc0a1286
2 files changed+2−6
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs−5 src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs+2−1
src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs−5
@@ -124,8 +124,3 @@ instance ChoiceVector SuccessList where
124124 spreadChoice = Right . SuccessList . (foldr unTagRight []) . collectNonFailing
125125 where unTagRight (Right x) = (x:)
126126 unTagRight _ = id
127−
128−-- | Like 'catMaybes', but for 'Either'.
129−collectRights :: [Either _l r] -> [r]
130−collectRights = collectNonFailing . untag . spreadChoice . SuccessList
131− where untag = fromLeft (error "Unexpected Left")
src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs+2−1
@@ -71,6 +71,7 @@ import Control.Applicative hiding ( liftA, liftA2 )
7171import Control.Monad ( MonadPlus )
7272import Control.Arrow
7373
74+import Data.Either ( rights )
7475import qualified Data.Map as M
7576import Data.Default
7677import Data.Maybe
@@ -604,7 +605,7 @@ tryAll :: (NameSpaceID nsID)
604605 -> XMLConverter nsID extraState b [a]
605606tryAll nsID name a = prepareIteration nsID name
606607 >>> iterateS (switchingTheStack a)
607− >>^ collectRights
608+ >>^ rights
608609
609610--------------------------------------------------------------------------------
610611-- Matching children