ace8837 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Org reader: Improve code by following HLint recommendations

ace8837Albert Krewinkel13 years ago

src/Text/Pandoc/Readers/Org.hs+24−20

compare with master

unifiedsplit

@@ -44,11 +44,14 @@ import Data.List (foldl', isPrefixOf, isSuffixOf)

44import Data.Maybe (listToMaybe, fromMaybe)

45import Data.Monoid (mconcat, mempty, mappend)

47+-- Ignore HLint warnings to use String instead of [Char]

48+{-# ANN module ("HLint: ignore Use String" :: String) #-}

49+

47-- | Parse org-mode string and return a Pandoc document.

50-- | Parse org-mode string and return a Pandoc document.

48readOrg :: ReaderOptions -- ^ Reader options

51readOrg :: ReaderOptions -- ^ Reader options

49 -> String -- ^ String to parse (assuming @'\n'@ line endings)

52 -> String -- ^ String to parse (assuming @'\n'@ line endings)

50 -> Pandoc

53 -> Pandoc

51−readOrg opts s = (readWith parseOrg) def{ orgStateOptions = opts } (s ++ "\n\n")

54+readOrg opts s = readWith parseOrg def{ orgStateOptions = opts } (s ++ "\n\n")

53type OrgParser = Parser [Char] OrgParserState

56type OrgParser = Parser [Char] OrgParserState

@@ -111,7 +114,7 @@ updateLastPreCharPos = getPosition >>= \p ->

111

114

112pushToInlineCharStack :: Char -> OrgParser ()

115pushToInlineCharStack :: Char -> OrgParser ()

113pushToInlineCharStack c = updateState $ \st ->

116pushToInlineCharStack c = updateState $ \st ->

114− st { orgStateEmphasisCharStack = c:(orgStateEmphasisCharStack st) }

117+ st { orgStateEmphasisCharStack = c:orgStateEmphasisCharStack st }

115

118

116popInlineCharStack :: OrgParser ()

119popInlineCharStack :: OrgParser ()

117popInlineCharStack = updateState $ \st ->

120popInlineCharStack = updateState $ \st ->

@@ -176,7 +179,7 @@ orgBlock = try $ do

176 "comment" -> return mempty

179 "comment" -> return mempty

177 "src" -> return $ B.codeBlockWith ("", classArgs, []) blockStr

180 "src" -> return $ B.codeBlockWith ("", classArgs, []) blockStr

178 _ -> B.divWith ("", [blockType], [])

181 _ -> B.divWith ("", [blockType], [])

179− <$> (parseFromString parseBlocks blockStr)

182+ <$> parseFromString parseBlocks blockStr

180

183

181blockHeader :: OrgParser (Int, String, [String])

184blockHeader :: OrgParser (Int, String, [String])

182blockHeader = (,,) <$> blockIndent

185blockHeader = (,,) <$> blockIndent

@@ -199,7 +202,7 @@ rawBlockContent indent blockType =

199indentWith :: Int -> OrgParser String

202indentWith :: Int -> OrgParser String

200indentWith num = do

203indentWith num = do

201 tabStop <- getOption readerTabStop

204 tabStop <- getOption readerTabStop

202− if (num < tabStop)

205+ if num < tabStop

203 then count num (char ' ')

206 then count num (char ' ')

204 else choice [ try (count num (char ' '))

207 else choice [ try (count num (char ' '))

205 , try (char '\t' >> count (num - tabStop) (char ' ')) ]

208 , try (char '\t' >> count (num - tabStop) (char ' ')) ]

@@ -242,7 +245,7 @@ drawerStart = try $

242 <|> stringAnyCase "LOGBOOK"

245 <|> stringAnyCase "LOGBOOK"

243

246

244drawerLine :: OrgParser String

247drawerLine :: OrgParser String

245−drawerLine = try $ anyLine

248+drawerLine = try anyLine

246

249

247drawerEnd :: OrgParser String

250drawerEnd :: OrgParser String

248drawerEnd = try $

251drawerEnd = try $

@@ -276,7 +279,7 @@ declarationLine = try $ do

276metaValue :: OrgParser MetaValue

279metaValue :: OrgParser MetaValue

277metaValue = MetaInlines . B.toList . trimInlines <$> restOfLine

280metaValue = MetaInlines . B.toList . trimInlines <$> restOfLine

278

281

279−metaKey :: OrgParser [Char]

282+metaKey :: OrgParser String

280metaKey = map toLower <$> many1 (noneOf ": \n\r")

283metaKey = map toLower <$> many1 (noneOf ": \n\r")

281 <* char ':'

284 <* char ':'

282 <* skipSpaces

285 <* skipSpaces

@@ -350,7 +353,7 @@ tableAlignRow = try $

350

353

351tableAlignCell :: OrgParser Alignment

354tableAlignCell :: OrgParser Alignment

352tableAlignCell =

355tableAlignCell =

353− choice [ try $ emptyCell *> return (AlignDefault)

356+ choice [ try $ emptyCell *> return AlignDefault

354 , try $ skipSpaces

357 , try $ skipSpaces

355 *> char '<'

358 *> char '<'

356 *> tableAlignFromChar

359 *> tableAlignFromChar

@@ -381,8 +384,8 @@ normalizeTable (OrgTable cols aligns heads lns) =

381 let aligns' = fillColumns aligns AlignDefault

384 let aligns' = fillColumns aligns AlignDefault

382 heads' = if heads == mempty

385 heads' = if heads == mempty

383 then mempty

386 then mempty

384− else fillColumns heads (B.plain mempty)

387+ else fillColumns heads (B.plain mempty)

385− lns' = map (flip fillColumns (B.plain mempty)) lns

388+ lns' = map (`fillColumns` B.plain mempty) lns

386 fillColumns base padding = take cols $ base ++ repeat padding

389 fillColumns base padding = take cols $ base ++ repeat padding

387 in OrgTable cols aligns' heads' lns'

390 in OrgTable cols aligns' heads' lns'

388

391

@@ -565,13 +568,14 @@ explicitOrImageLink = try $ do

565 title <- enclosedRaw (char '[') (char ']')

568 title <- enclosedRaw (char '[') (char ']')

566 title' <- parseFromString (mconcat <$> many inline) title

569 title' <- parseFromString (mconcat <$> many inline) title

567 char ']'

570 char ']'

571+ return . B.link src ""

568− return $ if (isImageFilename src) && (isImageFilename title)

572+ $ if isImageFilename src && isImageFilename title

569− then B.link src "" (B.image title "" "")

573+ then B.image title "" ""

570− else B.link src "" title'

574+ else title'

571

575

572selflinkOrImage :: OrgParser Inlines

576selflinkOrImage :: OrgParser Inlines

573selflinkOrImage = try $ do

577selflinkOrImage = try $ do

574− src <- (char '[') *> linkTarget <* char ']'

578+ src <- char '[' *> linkTarget <* char ']'

575 return $ if isImageFilename src

579 return $ if isImageFilename src

576 then B.image src "" ""

580 then B.image src "" ""

577 else B.link src "" (B.str src)

581 else B.link src "" (B.str src)

@@ -619,10 +623,10 @@ displayMath = B.displayMath <$> choice [ rawMathBetween "\\[" "\\]"

619 ]

623 ]

620

624

621subscript :: OrgParser Inlines

625subscript :: OrgParser Inlines

622−subscript = B.subscript <$> (try $ char '_' *> maybeGroupedByBraces)

626+subscript = B.subscript <$> try (char '_' *> maybeGroupedByBraces)

623

627

624superscript :: OrgParser Inlines

628superscript :: OrgParser Inlines

625−superscript = B.superscript <$> (try $ char '^' *> maybeGroupedByBraces)

629+superscript = B.superscript <$> try (char '^' *> maybeGroupedByBraces)

626

630

627maybeGroupedByBraces :: OrgParser Inlines

631maybeGroupedByBraces :: OrgParser Inlines

628maybeGroupedByBraces = try $

632maybeGroupedByBraces = try $

@@ -702,14 +706,14 @@ emphasisEnd c = try $ do

702 return c

706 return c

703

707

704mathStart :: Char -> OrgParser Char

708mathStart :: Char -> OrgParser Char

705−mathStart c = try $ do

709+mathStart c = try $

706 char c <* notFollowedBy' (oneOf (c:mathForbiddenBorderChars))

710 char c <* notFollowedBy' (oneOf (c:mathForbiddenBorderChars))

707

711

708mathEnd :: Char -> OrgParser Char

712mathEnd :: Char -> OrgParser Char

709mathEnd c = try $ do

713mathEnd c = try $ do

710 res <- noneOf (c:mathForbiddenBorderChars)

714 res <- noneOf (c:mathForbiddenBorderChars)

711 char c

715 char c

712− eof <|> (lookAhead $ oneOf mathPostChars *> pure ())

716+ eof <|> lookAhead (oneOf mathPostChars *> pure ())

713 return res

717 return res

714

718

715

719

@@ -741,8 +745,8 @@ many1TillNOrLessNewlines n p end = try $

741 nMoreLines (Just 0) cs = try $ (cs ++) <$> finalLine

745 nMoreLines (Just 0) cs = try $ (cs ++) <$> finalLine

742 nMoreLines k cs = try $ (final k cs <|> rest k cs)

746 nMoreLines k cs = try $ (final k cs <|> rest k cs)

743 >>= uncurry nMoreLines

747 >>= uncurry nMoreLines

744− final _ cs = (\x -> (Nothing, cs ++ x)) <$> (try finalLine)

748+ final _ cs = (\x -> (Nothing, cs ++ x)) <$> try finalLine

745− rest m cs = (\x -> (minus1 <$> m, cs ++ x ++ "\n")) <$> (try $ manyTill p P.newline)

749+ rest m cs = (\x -> (minus1 <$> m, cs ++ x ++ "\n")) <$> try (manyTill p P.newline)

746 finalLine = try $ manyTill p end

750 finalLine = try $ manyTill p end

747 minus1 k = k - 1

751 minus1 k = k - 1

748 oneOrMore cs = guard (not $ null cs) *> return cs

752 oneOrMore cs = guard (not $ null cs) *> return cs

@@ -786,7 +790,7 @@ afterEmphasisPreChar :: OrgParser Bool

786afterEmphasisPreChar = do

790afterEmphasisPreChar = do

787 pos <- getPosition

791 pos <- getPosition

788 lastPrePos <- orgStateLastPreCharPos <$> getState

792 lastPrePos <- orgStateLastPreCharPos <$> getState

789− return $ lastPrePos == Nothing || lastPrePos == Just pos

793+ return . fromMaybe True $ (== pos) <$> lastPrePos

790

794

791-- | Whether we are right after the end of a string

795-- | Whether we are right after the end of a string

792notAfterString :: OrgParser Bool

796notAfterString :: OrgParser Bool