2f54de7 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed compiler warnings.

commit2f54de7cc4596ae54c1918229213f6ce590736cb authorJohn MacFarlane <jgm@berkeley.edu> dateThu 14 Jul 2016, 23:38 (10 years ago) parentc203ace

6 files changed+11−14

compare with master

unifiedsplit

src/Text/Pandoc/Parsing.hs+3−3 src/Text/Pandoc/Pretty.hs+2−4 src/Text/Pandoc/Readers/TWiki.hs+4−4 src/Text/Pandoc/Readers/Txt2Tags.hs+1−1 src/Text/Pandoc/Writers/Docx.hs−1 src/Text/Pandoc/Writers/EPUB.hs+1−1

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

@@ -865,7 +865,7 @@ gridTableFooter = blanklines

865865---

866866

867867-- | Removes the ParsecT layer from the monad transformer stack

868−readWithM :: (Monad m, Functor m)

868+readWithM :: (Monad m)

869869 => ParserT [Char] st m a -- ^ parser

870870 -> st -- ^ initial state

871871 -> String -- ^ input

@@ -891,7 +891,7 @@ readWithWarnings p = readWith $ do

891891 return (doc, warnings)

892892

893893-- | Parse a string with @parser@ (for testing).

894−testStringWith :: (Show a, Stream [Char] Identity Char)

894+testStringWith :: (Show a)

895895 => ParserT [Char] ParserState Identity a

896896 -> [Char]

897897 -> IO ()

@@ -1267,7 +1267,7 @@ addWarning mbpos msg =

12671267 stateWarnings = (msg ++ maybe "" (\pos -> " " ++ show pos) mbpos) :

12681268 stateWarnings st }

12691269infixr 5 <+?>

1270−(<+?>) :: (Monoid a, Monad m) => ParserT s st m a -> ParserT s st m a -> ParserT s st m a

1270+(<+?>) :: (Monoid a) => ParserT s st m a -> ParserT s st m a -> ParserT s st m a

12711271a <+?> b = a >>= flip fmap (try b <|> return mempty) . (<>)

12721272

12731273extractIdClass :: Attr -> Attr

src/Text/Pandoc/Pretty.hs+2−4

@@ -208,8 +208,7 @@ chomp d = Doc (fromList dl')

208208 go (Prefixed s d' : xs) = Prefixed s (chomp d') : xs

209209 go xs = xs

210210

211−outp :: (IsString a, Monoid a)

212− => Int -> String -> DocState a

211+outp :: (IsString a) => Int -> String -> DocState a

213212outp off s | off < 0 = do -- offset < 0 means newline characters

214213 st' <- get

215214 let rawpref = prefix st'

@@ -234,8 +233,7 @@ outp off s = do -- offset >= 0 (0 might be combining char)

234233-- | Renders a 'Doc'. @render (Just n)@ will use

235234-- a line length of @n@ to reflow text on breakable spaces.

236235-- @render Nothing@ will not reflow text.

237−render :: (Monoid a, IsString a)

238− => Maybe Int -> Doc -> a

236+render :: (IsString a) => Maybe Int -> Doc -> a

239237render linelen doc = fromString . mconcat . reverse . output $

240238 execState (renderDoc doc) startingState

241239 where startingState = RenderState{

src/Text/Pandoc/Readers/TWiki.hs+4−4

@@ -205,7 +205,7 @@ orderedList :: String -> TWParser B.Blocks

205205orderedList prefix = tryMsg "orderedList" $

206206 parseList prefix (oneOf "1iIaA") (string ". ")

207207

208−parseList :: Show a => String -> TWParser Char -> TWParser a -> TWParser B.Blocks

208+parseList :: String -> TWParser Char -> TWParser a -> TWParser B.Blocks

209209parseList prefix marker delim = do

210210 (indent, style) <- lookAhead $ string prefix *> listStyle <* delim

211211 blocks <- many $ parseListItem (prefix ++ indent) (char style <* delim)

@@ -281,7 +281,7 @@ tableParseColumn = char '|' *> skipSpaces *>

281281tableEndOfRow :: TWParser Char

282282tableEndOfRow = lookAhead (try $ char '|' >> char '\n') >> char '|'

283283

284−tableColumnContent :: Show a => TWParser a -> TWParser B.Blocks

284+tableColumnContent :: TWParser a -> TWParser B.Blocks

285285tableColumnContent end = manyTill content (lookAhead $ try end) >>= return . B.plain . mconcat

286286 where

287287 content = continuation <|> inline

@@ -351,11 +351,11 @@ linebreak = newline >> notFollowedBy newline >> (lastNewline <|> innerNewline)

351351 where lastNewline = eof >> return mempty

352352 innerNewline = return B.space

353353

354−between :: (Show b, Monoid c) => TWParser a -> TWParser b -> (TWParser b -> TWParser c) -> TWParser c

354+between :: (Monoid c) => TWParser a -> TWParser b -> (TWParser b -> TWParser c) -> TWParser c

355355between start end p =

356356 mconcat <$> try (start >> notFollowedBy whitespace >> many1Till (p end) end)

357357

358−enclosed :: (Show a, Monoid b) => TWParser a -> (TWParser a -> TWParser b) -> TWParser b

358+enclosed :: (Monoid b) => TWParser a -> (TWParser a -> TWParser b) -> TWParser b

359359enclosed sep p = between sep (try $ sep <* endMarker) p

360360 where

361361 endMarker = lookAhead $ skip endSpace <|> skip (oneOf ".,!?:)|") <|> eof

src/Text/Pandoc/Readers/Txt2Tags.hs+1−1

@@ -285,7 +285,7 @@ table = try $ do

285285 (zip aligns (replicate ncolumns 0.0))

286286 headerPadded rowsPadded

287287

288−pad :: (Show a, Monoid a) => Int -> [a] -> [a]

288+pad :: (Monoid a) => Int -> [a] -> [a]

289289pad n xs = xs ++ (replicate (n - length xs) mempty)

290290

291291

src/Text/Pandoc/Writers/Docx.hs−1

@@ -38,7 +38,6 @@ import qualified Data.Set as Set

3838import qualified Text.Pandoc.UTF8 as UTF8

3939import Codec.Archive.Zip

4040import Data.Time.Clock.POSIX

41−import Data.Time.Clock

4241import System.Environment

4342import Text.Pandoc.Compat.Time

4443import Text.Pandoc.Definition

src/Text/Pandoc/Writers/EPUB.hs+1−1

@@ -888,7 +888,7 @@ transformInline opts mediaRef (RawInline fmt raw)

888888 return $ RawInline fmt (renderTags' tags')

889889transformInline _ _ x = return x

890890

891−(!) :: Node t => (t -> Element) -> [(String, String)] -> t -> Element

891+(!) :: (t -> Element) -> [(String, String)] -> t -> Element

892892(!) f attrs n = add_attrs (map (\(k,v) -> Attr (unqual k) v) attrs) (f n)

893893

894894-- | Version of 'ppTopElement' that specifies UTF-8 encoding.