From 6ec47dad043d4dd7f59d5ff03a54b4dae8ad1c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 24 Sep 2025 21:31:26 +0800 Subject: [PATCH 1/2] ref(lexer): rename MathParen -> MathInline --- src/Lexer.hs | 10 +++++----- test/Spec.hs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Lexer.hs b/src/Lexer.hs index 436ebfe..c2a7f01 100644 --- a/src/Lexer.hs +++ b/src/Lexer.hs @@ -51,8 +51,8 @@ data Token | ParenClose | BracketOpen | BracketClose - | MathsParenOpen - | MathsParenClose + | MathInlineOpen + | MathInlineClose | MathsBracketOpen | MathsBracketClose | NumericEntity Int @@ -86,7 +86,7 @@ lexText = go choice $ Parsec.try <$> [ mathsBracket - , mathsParens + , mathInline , escape -- maths go before escape to avoid mismatch , headers , newlineToken @@ -245,8 +245,8 @@ labeledLink = do mathsBracket :: Lexer mathsBracket = delimited "\\[" "\\]" MathsBracketOpen MathsBracketClose -mathsParens :: Lexer -mathsParens = delimited "\\(" "\\)" MathsParenOpen MathsParenClose +mathInline :: Lexer +mathInline = delimited "\\(" "\\)" MathInlineOpen MathInlineClose birdTrack :: Lexer birdTrack = delimitedNoTrailing ">> " eol BirdTrack diff --git a/test/Spec.hs b/test/Spec.hs index a09489e..21f5d36 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -98,9 +98,9 @@ maths = do , (1, 12, MathsBracketClose) ] "\\(other maths\\)" - `shouldLexTo` [ (1, 1, MathsParenOpen) + `shouldLexTo` [ (1, 1, MathInlineOpen) , (1, 3, Token "other maths") - , (1, 14, MathsParenClose) + , (1, 14, MathInlineClose) ] escaping :: Expectation From bd07547e26b167f1907cbcb66ea39e9d6fb346ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 24 Sep 2025 21:33:20 +0800 Subject: [PATCH 2/2] ref(lexer): rename MathsBracket -> MathsMultiline --- src/Lexer.hs | 10 +++++----- test/Spec.hs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Lexer.hs b/src/Lexer.hs index c2a7f01..b4ad0b8 100644 --- a/src/Lexer.hs +++ b/src/Lexer.hs @@ -53,8 +53,8 @@ data Token | BracketClose | MathInlineOpen | MathInlineClose - | MathsBracketOpen - | MathsBracketClose + | MathsMultilineOpen + | MathsMultilineClose | NumericEntity Int | Module Text | QuoteOpen @@ -85,7 +85,7 @@ lexText = go toks <- choice $ Parsec.try - <$> [ mathsBracket + <$> [ mathMultiline , mathInline , escape -- maths go before escape to avoid mismatch , headers @@ -242,8 +242,8 @@ labeledLink = do , (pos8, LabeledLinkClose) ] -mathsBracket :: Lexer -mathsBracket = delimited "\\[" "\\]" MathsBracketOpen MathsBracketClose +mathMultiline :: Lexer +mathMultiline = delimited "\\[" "\\]" MathsMultilineOpen MathsMultilineClose mathInline :: Lexer mathInline = delimited "\\(" "\\)" MathInlineOpen MathInlineClose diff --git a/test/Spec.hs b/test/Spec.hs index 21f5d36..656159e 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -93,9 +93,9 @@ anchors = maths :: IO () maths = do "\\[some math\\]" - `shouldLexTo` [ (1, 1, MathsBracketOpen) + `shouldLexTo` [ (1, 1, MathsMultilineOpen) , (1, 3, Token "some math") - , (1, 12, MathsBracketClose) + , (1, 12, MathsMultilineClose) ] "\\(other maths\\)" `shouldLexTo` [ (1, 1, MathInlineOpen)