Fix lexing of quoted strings in comments

ocaml · Apr 25, 2024 · f07d346 · f07d346
1 parent 1c96f66
commit f07d346
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 57 deletions.
diff --git a/src/ocaml/preprocess/lexer_raw.mll b/src/ocaml/preprocess/lexer_raw.mll
@@ -658,10 +658,8 @@ and comment state = parse
       state.buffer <- buffer;
       Buffer.add_char state.buffer '\"';
       comment state lexbuf }
-  | "{" ('%' '%'? extattrident blank*)? lowercase* "|"
+  | "{" ('%' '%'? extattrident blank*)? (lowercase* as delim) "|"
       {
-        let delim = Lexing.lexeme lexbuf in
-        let delim = String.sub delim ~pos:1 ~len:(String.length delim - 2) in
         state.string_start_loc <- Location.curr lexbuf;
         Buffer.add_string state.buffer (Lexing.lexeme lexbuf);
         (catch (quoted_string delim state lexbuf) (fun e l -> match e with

diff --git a/tests/test-dirs/errors/issue1753.t b/tests/test-dirs/errors/issue1753.t
@@ -1,34 +1,9 @@
-FIXME: should be accepted
+should be accepted
   $ $MERLIN single errors -filename main.ml <<'EOF' | \
   > jq '.value[0]'
   > (* {%ext|babar|} *)
   > EOF
-  {
-    "start": {
-      "line": 1,
-      "col": 0
-    },
-    "end": {
-      "line": 1,
-      "col": 2
-    },
-    "type": "typer",
-    "sub": [
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 1,
-          "col": 2
-        },
-        "message": "String literal begins here"
-      }
-    ],
-    "valid": true,
-    "message": "This comment contains an unterminated string literal"
-  }
+  null
 
 should fail
   $ $MERLIN single errors -filename main.ml <<'EOF' | \
@@ -62,37 +37,12 @@ should fail
     "message": "This comment contains an unterminated string literal"
   }
 
-FIXME: should accept
+should accept
   $ $MERLIN single errors -filename main.ml <<'EOF' | \
   > jq '.value[0]'
   > (* {%ext id|babar|id} *)
   > EOF
-  {
-    "start": {
-      "line": 1,
-      "col": 0
-    },
-    "end": {
-      "line": 1,
-      "col": 2
-    },
-    "type": "typer",
-    "sub": [
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 1,
-          "col": 2
-        },
-        "message": "String literal begins here"
-      }
-    ],
-    "valid": true,
-    "message": "This comment contains an unterminated string literal"
-  }
+  null
 
 should accept
   $ $MERLIN single errors -filename main.ml <<'EOF' | \