aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-07-23 00:19:00 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-07-23 00:19:00 +0000
commitcaef362065f3965107b0d5619b5d7bbb3d3b1889 (patch)
tree97d79f749eef1516e1f6e15dd0dd25f6e6d28697 /src/Text/Pandoc
parentc1c30a76640cff5a052178fba879ca67ab7c0cd4 (diff)
downloadpandoc-caef362065f3965107b0d5619b5d7bbb3d3b1889.tar.gz
Renamed parseFromStr -> parseFromString.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@779 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/Text/Pandoc')
-rw-r--r--src/Text/Pandoc/ParserCombinators.hs6
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Text/Pandoc/ParserCombinators.hs b/src/Text/Pandoc/ParserCombinators.hs
index c49845597..189f97182 100644
--- a/src/Text/Pandoc/ParserCombinators.hs
+++ b/src/Text/Pandoc/ParserCombinators.hs
@@ -38,7 +38,7 @@ module Text.Pandoc.ParserCombinators (
blanklines,
enclosed,
stringAnyCase,
- parseFromStr,
+ parseFromString,
lineClump,
charsInBalanced
) where
@@ -108,8 +108,8 @@ stringAnyCase (x:xs) = try (do
return (firstChar:rest))
-- | Parse contents of 'str' using 'parser' and return result.
-parseFromStr :: GenParser tok st a -> [tok] -> GenParser tok st a
-parseFromStr parser str = try $ do
+parseFromString :: GenParser tok st a -> [tok] -> GenParser tok st a
+parseFromString parser str = try $ do
oldInput <- getInput
setInput str
result <- parser
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 3f37c1766..ad3b015b4 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -591,14 +591,14 @@ rawTableLine indices = do
-- Parse a table line and return a list of lists of blocks (columns).
tableLine indices = try $ do
rawline <- rawTableLine indices
- mapM (parseFromStr (many plain)) rawline
+ mapM (parseFromString (many plain)) rawline
-- Parse a multiline table row and return a list of blocks (columns).
multilineRow indices = try $ do
colLines <- many1 (rawTableLine indices)
option "" blanklines
let cols = map unlines $ transpose colLines
- mapM (parseFromStr (many plain)) cols
+ mapM (parseFromString (many plain)) cols
-- Calculate relative widths of table columns, based on indices
widthsFromIndices :: Int -- Number of columns on terminal
@@ -628,7 +628,7 @@ tableWith headerParser lineParser footerParser = try $ do
(rawHeads, aligns, indices) <- headerParser
lines <- many1Till (lineParser indices) footerParser
caption <- option [] tableCaption
- heads <- mapM (parseFromStr (many plain)) rawHeads
+ heads <- mapM (parseFromString (many plain)) rawHeads
state <- getState
let numColumns = stateColumns state
let widths = widthsFromIndices numColumns indices