elland/haddock2
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

refactor lexer #2

Merged
primrose merged 13 commits from primrose/haddock2:leana8959 into dev 2025-09-26 14:44:47 +00:00
Conversation 1 Commits 13 Files changed 3 +7 -7
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6ec47dad04 - Show all commits

10
src/Lexer.hs
View file

@ -51,8 +51,8 @@ data Token
| ParenClose | ParenClose
| BracketOpen | BracketOpen
| BracketClose | BracketClose
| MathsParenOpen | MathInlineOpen
| MathsParenClose | MathInlineClose
| MathsBracketOpen | MathsBracketOpen
| MathsBracketClose | MathsBracketClose
| NumericEntity Int | NumericEntity Int
@ -86,7 +86,7 @@ lexText = go
choice $ choice $
Parsec.try Parsec.try
<$> [ mathsBracket <$> [ mathsBracket
, mathsParens , mathInline
, escape -- maths go before escape to avoid mismatch , escape -- maths go before escape to avoid mismatch
, headers , headers
, newlineToken , newlineToken
@ -245,8 +245,8 @@ labeledLink = do
mathsBracket :: Lexer mathsBracket :: Lexer
mathsBracket = delimited "\\[" "\\]" MathsBracketOpen MathsBracketClose mathsBracket = delimited "\\[" "\\]" MathsBracketOpen MathsBracketClose
mathsParens :: Lexer mathInline :: Lexer
mathsParens = delimited "\\(" "\\)" MathsParenOpen MathsParenClose mathInline = delimited "\\(" "\\)" MathInlineOpen MathInlineClose
birdTrack :: Lexer birdTrack :: Lexer
birdTrack = delimitedNoTrailing ">> " eol BirdTrack birdTrack = delimitedNoTrailing ">> " eol BirdTrack

4
test/Spec.hs
View file

@ -98,9 +98,9 @@ maths = do
, (1, 12, MathsBracketClose) , (1, 12, MathsBracketClose)
] ]
"\\(other maths\\)" "\\(other maths\\)"
`shouldLexTo` [ (1, 1, MathsParenOpen) `shouldLexTo` [ (1, 1, MathInlineOpen)
, (1, 3, Token "other maths") , (1, 3, Token "other maths")
, (1, 14, MathsParenClose) , (1, 14, MathInlineClose)
] ]
escaping :: Expectation escaping :: Expectation