Got rid of two unneeded 'getState's. Note that

lookAhead automatically saves and restores the state.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@538 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2007-02-15 01:43:12 +00:00
parent 9ad7c73b57
commit 87eb8be143
2 changed files with 3 additions and 4 deletions

View file

@ -170,12 +170,11 @@ parseMarkdown = do
updateState (\state -> state { stateParseRaw = True })
-- need to parse raw HTML, since markdown allows it
(title, author, date) <- option ([],[],"") titleBlock
oldState <- getState
-- go through once just to get list of reference keys
keysUsed <- lookAhead $ (do {manyTill (referenceKey <|> (do{anyLine; return Null})) eof;
newState <- getState;
return $ stateKeysUsed newState})
setState (oldState { stateKeysUsed = keysUsed })
updateState (\st -> st { stateKeysUsed = keysUsed })
blocks <- parseBlocks -- go through again, for real
let blocks' = filter (/= Null) blocks
state <- getState

View file

@ -100,12 +100,12 @@ titleTransform ((Header 1 head1):rest) = -- title, no subtitle
titleTransform blocks = (blocks, [])
parseRST = do
state <- getState
-- first pass: get anonymous keys
keyBlocks <- lookAhead $ manyTill (anonymousKey <|> (do{anyLine; return Null})) eof
let anonymousKeys = filter (/= Null) keyBlocks
-- run parser again to fill in anonymous links...
setState (state { stateKeyBlocks = anonymousKeys })
updateState (\st -> st { stateKeyBlocks = anonymousKeys })
state <- getState
blocks <- parseBlocks
let blocks' = filter isNotAnonKeyBlock blocks
let (blocks'', title) = if stateStandalone state