Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Muse reader: replace pattern matching with "when"

Browse source
This commit is contained in:
Alexander Krotov 2018-04-07 19:06:40 +03:00
parent 828bfc749d
commit 4cb053ce3d
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Text/Pandoc/Readers/Muse.hs
View file

@ -50,7 +50,7 @@ import Data.List (stripPrefix, intercalate)
import Data.List.Split (splitOn) import Data.List.Split (splitOn)
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Maybe (fromMaybe, isNothing) import Data.Maybe (fromMaybe, isJust, isNothing)
import Data.Text (Text, unpack) import Data.Text (Text, unpack)
import System.FilePath (takeExtension) import System.FilePath (takeExtension)
import Text.HTML.TagSoup import Text.HTML.TagSoup
@ -474,9 +474,8 @@ amuseNoteBlockUntil end = try $ do
updateState (\st -> st { museInPara = False }) updateState (\st -> st { museInPara = False })
(content, e) <- listItemContentsUntil (sourceColumn pos - 1) (fail "x") end (content, e) <- listItemContentsUntil (sourceColumn pos - 1) (fail "x") end
oldnotes <- museNotes <$> getState oldnotes <- museNotes <$> getState
case M.lookup ref oldnotes of when (isJust (M.lookup ref oldnotes))
Just _ -> logMessage $ DuplicateNoteReference ref pos (logMessage $ DuplicateNoteReference ref pos)
Nothing -> return ()
updateState $ \s -> s{ museNotes = M.insert ref (pos, content) oldnotes } updateState $ \s -> s{ museNotes = M.insert ref (pos, content) oldnotes }
return (mempty, e) return (mempty, e)
@ -489,9 +488,8 @@ emacsNoteBlock = try $ do
ref <- noteMarker <* skipSpaces ref <- noteMarker <* skipSpaces
content <- mconcat <$> blocksTillNote content <- mconcat <$> blocksTillNote
oldnotes <- museNotes <$> getState oldnotes <- museNotes <$> getState
case M.lookup ref oldnotes of when (isJust (M.lookup ref oldnotes))
Just _ -> logMessage $ DuplicateNoteReference ref pos (logMessage $ DuplicateNoteReference ref pos)
Nothing -> return ()
updateState $ \s -> s{ museNotes = M.insert ref (pos, content) oldnotes } updateState $ \s -> s{ museNotes = M.insert ref (pos, content) oldnotes }
return mempty return mempty
where where