Fix lexing of cinaps comments starting with (*$<symbol-char>

OCamlPro · Sep 25, 2019 · 3ce84f2 · 3ce84f2
1 parent 77c98a8
commit 3ce84f2
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/approx_lexer.mll b/src/approx_lexer.mll
@@ -366,14 +366,6 @@ rule parse_token = parse
       comment_stack := Comment :: !comment_stack;
       rewind lexbuf 1;
       COMMENT }
-  | '$'
-    { if !entering_inline_code_block then begin
-        entering_inline_code_block := false;
-        comment_stack := Code :: !comment_stack;
-        OCAMLDOC_CODE
-      end
-      else INFIXOP0(Lexing.lexeme lexbuf)
-    }
   | "(*"
     {
       let comment_start = lexbuf.lex_start_p in
@@ -504,7 +496,17 @@ rule parse_token = parse
     { check_commentclose lexbuf (fun s -> PREFIXOP s) }
   | ['~' '?'] symbolchar + ')'?
     { check_commentclose lexbuf (fun s -> PREFIXOP s) }
-  | ['=' '<' '>' '|' '&' '$'] symbolchar * ')'?
+  | '$' symbolchar * ')'?
+    { if !entering_inline_code_block then begin
+        entering_inline_code_block := false;
+        comment_stack := Code :: !comment_stack;
+        rewind lexbuf
+          (Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf - 1);
+        OCAMLDOC_CODE
+      end
+      else check_commentclose lexbuf (fun s -> INFIXOP0 s)
+    }
+  | ['=' '<' '>' '|' '&'] symbolchar * ')'?
     { check_commentclose lexbuf (fun s -> INFIXOP0 s) }
   | ['@' '^'] symbolchar * ')'?
     { check_commentclose lexbuf (fun s -> INFIXOP1 s) }