From 326c7b681cd602dbe725a111efc0254f3700b44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 24 Sep 2025 22:19:37 +0800 Subject: [PATCH] fix(lexer): old anchor is only used in moduleName --- Grammar.ebnf | 2 +- src/Lexer.hs | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Grammar.ebnf b/Grammar.ebnf index bff331d..2404a67 100644 --- a/Grammar.ebnf +++ b/Grammar.ebnf @@ -12,7 +12,7 @@ bold ::= '__' text_no_newline '__' monospace ::= '@' text_content '@' link ::= module_link | hyperlink | markdown_link -module_link ::= '"' module_name ( '#' anchor_name )? '"' +module_link ::= '"' module_name ( ('#' | '\#') anchor_name )? '"' hyperlink ::= '<' url ( ' ' link_text )? '>' markdown_link ::= '[' link_text '](' ( url | module_link ) ')' diff --git a/src/Lexer.hs b/src/Lexer.hs index 04fa84f..9b33f03 100644 --- a/src/Lexer.hs +++ b/src/Lexer.hs @@ -94,7 +94,7 @@ lexText = go , link , labeledLink , modules - , anchors + , anchor , textElement , quotes , birdTrack @@ -152,9 +152,6 @@ delimitedSymmetric s t1 t2 = delimited s s t1 t2 eol :: Parser () eol = void "\n" <|> void "\r\n" <|> Parsec.eof -anchorHash :: Parser Text -anchorHash = "#" <|> try "\\#" - header1 :: Lexer header1 = delimitedNoTrailing "= " eol (Header One) @@ -174,11 +171,10 @@ header6 :: Lexer header6 = delimitedNoTrailing "====== " eol (Header Six) -- #anchors# -anchors :: Lexer -anchors = - tokenise - [ between anchorHash anchorHash (Anchor <$> anyUntil anchorHash) - ] +anchor :: Lexer +anchor = do + x <- located $ between "#" "#" (Anchor <$> anyUntil "#") + pure [x] moduleNames :: Parser Text @@ -192,7 +188,7 @@ identifierChar = satisfy (\c -> isAlphaNum c || c == '_') -- "Module.Name" -- "Module.Name#anchor" --- "Module.Name\#anchor" -- this has been deprecated for 9 years, thanks Ben +-- "Module.Name\#anchor" -- known as "old anchor". this has been deprecated for 9 years, thanks Ben modules :: Lexer modules = between (char '"') (char '"') inner where @@ -203,6 +199,9 @@ modules = between (char '"') (char '"') inner Just anchor -> [module_, anchor] Nothing -> [module_] + anchorHash :: Parser Text + anchorHash = "#" <|> try "\\#" + anchorText :: Parser Text anchorText = Text.pack <$> many (satisfy (\c -> c /= '"' && not (isSpace c)))