caef362 · typeable/pandoc

git.iko.soy/typeable/pandoc

Renamed parseFromStr -> parseFromString.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@779 788f1e2b-df1e-0410-8736-df70ead52e1b

commitcaef362065f3965107b0d5619b5d7bbb3d3b1889 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateMon 23 Jul 2007, 00:19 (19 years ago) parentc1c30a7

2 files changed+6−6

compare with master

unifiedsplit

src/Text/Pandoc/ParserCombinators.hs+3−3 src/Text/Pandoc/Readers/Markdown.hs+3−3

src/Text/Pandoc/ParserCombinators.hs+3−3

@@ -38,7 +38,7 @@ module Text.Pandoc.ParserCombinators (

3838 blanklines,

3939 enclosed,

4040 stringAnyCase,

41− parseFromStr,

41+ parseFromString,

4242 lineClump,

4343 charsInBalanced

4444 ) where

@@ -108,8 +108,8 @@ stringAnyCase (x:xs) = try (do

108108 return (firstChar:rest))

109109

110110-- | Parse contents of 'str' using 'parser' and return result.

111−parseFromStr :: GenParser tok st a -> [tok] -> GenParser tok st a

112−parseFromStr parser str = try $ do

111+parseFromString :: GenParser tok st a -> [tok] -> GenParser tok st a

112+parseFromString parser str = try $ do

113113 oldInput <- getInput

114114 setInput str

115115 result <- parser

src/Text/Pandoc/Readers/Markdown.hs+3−3

@@ -591,14 +591,14 @@ rawTableLine indices = do

591591-- Parse a table line and return a list of lists of blocks (columns).

592592tableLine indices = try $ do

593593 rawline <- rawTableLine indices

594− mapM (parseFromStr (many plain)) rawline

594+ mapM (parseFromString (many plain)) rawline

595595

596596-- Parse a multiline table row and return a list of blocks (columns).

597597multilineRow indices = try $ do

598598 colLines <- many1 (rawTableLine indices)

599599 option "" blanklines

600600 let cols = map unlines $ transpose colLines

601− mapM (parseFromStr (many plain)) cols

601+ mapM (parseFromString (many plain)) cols

602602

603603-- Calculate relative widths of table columns, based on indices

604604widthsFromIndices :: Int -- Number of columns on terminal

@@ -628,7 +628,7 @@ tableWith headerParser lineParser footerParser = try $ do

628628 (rawHeads, aligns, indices) <- headerParser

629629 lines <- many1Till (lineParser indices) footerParser

630630 caption <- option [] tableCaption

631− heads <- mapM (parseFromStr (many plain)) rawHeads

631+ heads <- mapM (parseFromString (many plain)) rawHeads

632632 state <- getState

633633 let numColumns = stateColumns state

634634 let widths = widthsFromIndices numColumns indices