Add located combinator; improved anchor matches with tests

src/Lexer.hs

@@ -175,22 +175,26 @@ anchors = do
   where
     anchor' = (string "#" <|> string "\\#")
 
+located :: Parser a -> Parser (SourcePos, a)
+located p = (,) <$> getPosition <*> p
+
+startPosition :: Parser a -> Parser SourcePos
+startPosition = fmap fst . located
+
 -- "Module.Name"
 -- "Module.Name#anchor"
+-- "Module.Name\#anchor" -- this has been deprecated for 9 years, thanks Ben
 modules :: Lexer
 modules = do
-    pos <- getPosition
+    startPos <- startPosition $ char '"'
-    void $ char '"'
+    (modPos, modName) <- located modId
-    pos' <- getPosition
-    modName <- modId
     anch <- option [] do
-        pos'' <- getPosition
+        anchPos <- startPosition (string "#" <|> string' "\\#")
-        void $ try (string "#" <|> string "\\#")
+        txt <- Text.pack <$> many (satisfy (\c -> c /= '"' && not (isSpace c)))
-        a <- Text.pack <$> many (satisfy (\c -> c /= '"' && not (isSpace c)))
+        pure [(anchPos, Anchor txt)]
-        pure [(pos'', Anchor a)]
 
     void $ char '"'
-    pure $ [(pos, Module), (pos', Token modName)] <> anch
+    pure $ [(startPos, Module), (modPos, Token modName)] <> anch
   where
     modId = intercalate "." <$> (fmap Text.pack <$> (conId `sepBy1` (char '.')))
 

test/Spec.hs

@@ -54,6 +54,11 @@ modules = do
                       , (1, 18, Anchor "myAnchor")
                       ]
 
+    "\"OtherModule.Name\\#myAnchor\""
+        `shouldLexTo` [ (1, 1, Module)
+                      , (1, 2, Token "OtherModule.Name")
+                      , (1, 18, Anchor "myAnchor")
+                      ]
 link :: Expectation
 link =
     "[link to](http://some.website)"