summaryrefslogtreecommitdiff
path: root/Text
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-06-17 19:07:11 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-06-17 19:07:11 +0000
commit18e44501a7986087a73b4cc4d87730aa677d78d9 (patch)
tree1aae99aab677852486ecbef64f8cbe3a8f8ce4bb /Text
parenta8920f47aaf5bb01e5730ccd03cbafdcc4e3ba25 (diff)
Cleaned up Text/Pandoc/Shared.hs to avoid -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1288 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'Text')
-rw-r--r--Text/Pandoc/Shared.hs10
1 files changed, 9 insertions, 1 deletions
diff --git a/Text/Pandoc/Shared.hs b/Text/Pandoc/Shared.hs
index 1731a7c7d..fa3d86770 100644
--- a/Text/Pandoc/Shared.hs
+++ b/Text/Pandoc/Shared.hs
@@ -228,6 +228,7 @@ wrapIfNeeded opts = if writerWrapText opts
else ($)
-- auxiliary function for wrappedTeX
+isNote :: Inline -> Bool
isNote (Note _) = True
isNote _ = False
@@ -386,7 +387,10 @@ charsInBalanced' open close = try $ do
-- Auxiliary functions for romanNumeral:
+lowercaseRomanDigits :: [Char]
lowercaseRomanDigits = ['i','v','x','l','c','d','m']
+
+uppercaseRomanDigits :: [Char]
uppercaseRomanDigits = map toUpper lowercaseRomanDigits
-- | Parses a roman numeral (uppercase or lowercase), returns number.
@@ -421,13 +425,16 @@ romanNumeral upperCase = do
-- Parsers for email addresses and URIs
+emailChar :: GenParser Char st Char
emailChar = alphaNum <|> oneOf "-+_."
+domainChar :: GenParser Char st Char
domainChar = alphaNum <|> char '-'
+domain :: GenParser Char st [Char]
domain = do
first <- many1 domainChar
- dom <- many1 (try (do{ char '.'; many1 domainChar }))
+ dom <- many1 $ try (char '.' >> many1 domainChar )
return $ joinWithSep "." (first:dom)
-- | Parses an email address; returns string.
@@ -441,6 +448,7 @@ emailAddress = try $ do
return $ addr ++ '@':dom
-- | Parses a URI.
+uri :: GenParser Char st String
uri = try $ do
str <- many1 $ satisfy isAllowedInURI
case parseURI str of