7424454 · typeable/pandoc

src/Text/Pandoc/Readers/Haddock.hs+4−2

compare with master

unifiedsplit

@@ -24,8 +24,10 @@ readHaddock :: ReaderOptions -- ^ Reader options

24readHaddock _ s = Pandoc (Meta [] [] []) blocks

25 where

26 blocks = case parseParas (tokenise s (0,0)) of

27− Nothing -> []

27+ Left [] -> error "parse failure"

28+ Left (tok:_) -> error $ "parse failure " ++ pos (tokenPos tok)

29+ where pos (l, c) = "(line " ++ show l ++ ", column " ++ show c ++ ")"

28− Just x -> mergeLists (toList x)

30+ Right x -> mergeLists (toList x)

29

31

30-- similar to 'docAppend' in Haddock.Doc

32-- similar to 'docAppend' in Haddock.Doc

31mergeLists :: [Block] -> [Block]

33mergeLists :: [Block] -> [Block]

src/Text/Pandoc/Readers/Haddock/Lex.x+2−1

@@ -19,7 +19,8 @@

19module Text.Pandoc.Readers.Haddock.Lex (

20 Token(..),

21 LToken,

22− tokenise

22+ tokenise,

23+ tokenPos

23 ) where

24 ) where

24

25

25import Data.Char

26import Data.Char

src/Text/Pandoc/Readers/Haddock/Parse.y+3−3

@@ -46,7 +46,7 @@ import Data.Sequence (viewr, ViewR(..))

46 PARA { (TokPara,_) }

47 STRING { (TokString $$,_) }

48

49−%monad { Maybe }

49+%monad { Either [LToken] }

50

51%name parseParas doc

52%name parseString seq

@@ -126,8 +126,8 @@ strings :: { String }

126 | STRING strings { $1 ++ $2 }

127

128{

129−happyError :: [LToken] -> Maybe a

129+happyError :: [LToken] -> Either [LToken] a

130−happyError toks = Nothing

130+happyError toks = Left toks

131

132para' :: Inlines -> Blocks

133para' (Many ils) =