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 c4d59d3236 - Show all commits

10
src/Lexer.hs
View file

@ -53,8 +53,8 @@ data Token
| BracketClose | BracketClose
| MathInlineOpen | MathInlineOpen
| MathInlineClose | MathInlineClose
| MathsBracketOpen | MathMultilineOpen
| MathsBracketClose | MathMultilineClose
| NumericEntity Int | NumericEntity Int
| Module Text | Module Text
| QuoteOpen | QuoteOpen
@ -85,7 +85,7 @@ lexText = go
toks <- toks <-
choice $ choice $
Parsec.try Parsec.try
<$> [ mathsBracket <$> [ mathMultiline
, mathInline , mathInline
, escape -- maths go before escape to avoid mismatch , escape -- maths go before escape to avoid mismatch
, headers , headers
@ -242,8 +242,8 @@ labeledLink = do
, (pos8, LabeledLinkClose) , (pos8, LabeledLinkClose)
] ]
mathsBracket :: Lexer mathMultiline :: Lexer
mathsBracket = delimited "\\[" "\\]" MathsBracketOpen MathsBracketClose mathMultiline = delimited "\\[" "\\]" MathMultilineOpen MathMultilineClose
mathInline :: Lexer mathInline :: Lexer
mathInline = delimited "\\(" "\\)" MathInlineOpen MathInlineClose mathInline = delimited "\\(" "\\)" MathInlineOpen MathInlineClose

4
test/Spec.hs
View file

@ -93,9 +93,9 @@ anchors =
maths :: IO () maths :: IO ()
maths = do maths = do
"\\[some math\\]" "\\[some math\\]"
`shouldLexTo` [ (1, 1, MathsBracketOpen) `shouldLexTo` [ (1, 1, MathMultilineOpen)
, (1, 3, Token "some math") , (1, 3, Token "some math")
, (1, 12, MathsBracketClose) , (1, 12, MathMultilineClose)
] ]
"\\(other maths\\)" "\\(other maths\\)"
`shouldLexTo` [ (1, 1, MathInlineOpen) `shouldLexTo` [ (1, 1, MathInlineOpen)