1b68dc3 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Revert "Added stateWarnings to ParserState, added warning function."

1b68dc3John MacFarlane14 years ago

src/Text/Pandoc/Parsing.hs−8

compare with master

unifiedsplit

@@ -62,7 +62,6 @@ module Text.Pandoc.Parsing ( (>>~),

62 getOption,

63 guardEnabled,

64 guardDisabled,

65− warning,

66 ParserState (..),

65 ParserState (..),

67 defaultParserState,

66 defaultParserState,

68 HeaderType (..),

67 HeaderType (..),

@@ -726,7 +725,6 @@ data ParserState = ParserState

726 stateExamples :: M.Map String Int, -- ^ Map from example labels to numbers

725 stateExamples :: M.Map String Int, -- ^ Map from example labels to numbers

727 stateHasChapters :: Bool, -- ^ True if \chapter encountered

726 stateHasChapters :: Bool, -- ^ True if \chapter encountered

728 stateMacros :: [Macro], -- ^ List of macros defined so far

727 stateMacros :: [Macro], -- ^ List of macros defined so far

729− stateWarnings :: [(SourcePos, String)], -- ^ List of warnings

730 stateRstDefaultRole :: String -- ^ Current rST default interpreted text role

728 stateRstDefaultRole :: String -- ^ Current rST default interpreted text role

731 }

729 }

732

730

@@ -753,17 +751,11 @@ defaultParserState =

753 stateExamples = M.empty,

751 stateExamples = M.empty,

754 stateHasChapters = False,

752 stateHasChapters = False,

755 stateMacros = [],

753 stateMacros = [],

756− stateWarnings = [],

757 stateRstDefaultRole = "title-reference"}

754 stateRstDefaultRole = "title-reference"}

758

755

759getOption :: (ReaderOptions -> a) -> Parser s ParserState a

756getOption :: (ReaderOptions -> a) -> Parser s ParserState a

760getOption f = (f . stateOptions) `fmap` getState

757getOption f = (f . stateOptions) `fmap` getState

761

758

762−warning :: String -> Parser s ParserState ()

763−warning msg = do

764− pos <- getPosition

765− modifyState $ \st -> st{ stateWarnings = stateWarnings st ++ [(pos,msg)] }

766−

767-- | Succeed only if the extension is enabled.

759-- | Succeed only if the extension is enabled.

768guardEnabled :: Extension -> Parser s ParserState ()

760guardEnabled :: Extension -> Parser s ParserState ()

769guardEnabled ext = getOption readerExtensions >>= guard . Set.member ext

761guardEnabled ext = getOption readerExtensions >>= guard . Set.member ext