Remove obsolete string constant delimiter argument

Signed-off-by: Christoph Knittel <ck@cca.io>

Author: cknitt

compiler/ml/lambda.ml

@@ -440,7 +440,7 @@ and lambda_switch = t switch
 *)
 let const_int (i : int) = Const_int (Int32.of_int i)
 
-let const_string s _delim = Const_string s
+let const_string s = Const_string s
 
 let const_of_typed (c : Asttypes.constant) : structured_constant =
   match c with
@@ -1476,8 +1476,7 @@ let rec transl_normal_path = function
   | Path.Pident id ->
     (* A predefined exception is its own name at runtime, so the reference is
        that string rather than a module. *)
-    if Ident.is_predef_exn id then
-      Lconst (Const_string id.name)
+    if Ident.is_predef_exn id then Lconst (Const_string id.name)
     else if Ident.global id then Lglobal_module id
     else Lvar id
   | Pdot (p, s, pos) ->

compiler/ml/lambda.mli

@@ -436,7 +436,7 @@ and lambda_switch = t switch
 val make_key : t -> t option
 
 val const_int : int -> structured_constant
-val const_string : string -> string option -> structured_constant
+val const_string : string -> structured_constant
 val const_of_typed : constant -> structured_constant
 val const_unit : structured_constant
 val const_constructor : Variant_runtime.tag -> structured_constant

compiler/ml/matching.ml

@@ -2625,8 +2625,7 @@ let partial_function loc () =
               const
                 (Const_block
                    ( Blk_tuple,
-                     [const_string fname None; const_int line; const_int char]
-                   ));
+                     [const_string fname; const_int line; const_int char] ));
             ]
           loc;
       ]

compiler/ml/transl_recmodule.ml

@@ -14,12 +14,11 @@ let undefined_location loc =
   let fname = Filename.basename fname in
   const
     (Const_block
-       ( Lambda.Blk_tuple,
-         [const_string fname None; const_int line; const_int char] ))
+       (Lambda.Blk_tuple, [const_string fname; const_int line; const_int char]))
 
 let init_shape modl =
   let add_name x id =
-    Const_block (Blk_tuple, [x; const_string (Ident.name id) None])
+    Const_block (Blk_tuple, [x; const_string (Ident.name id)])
   in
   let module_tag_info : Lambda.tag_info =
     Blk_constructor

compiler/ml/translcore.ml

@@ -734,23 +734,19 @@ let lam_of_loc kind loc =
     const
       (Const_block
          ( Blk_tuple,
-           [
-             const_string file None;
-             const_int lnum;
-             const_int cnum;
-             const_int enum;
-           ] ))
-  | Loc_FILE -> const (const_string file None)
+           [const_string file; const_int lnum; const_int cnum; const_int enum]
+         ))
+  | Loc_FILE -> const (const_string file)
   | Loc_MODULE ->
     let filename = Filename.basename file in
     let name = Env.get_unit_name () in
     let module_name = if name = "" then "//" ^ filename ^ "//" else name in
-    const (const_string module_name None)
+    const (const_string module_name)
   | Loc_LOC ->
     let loc =
       Printf.sprintf "File %S, line %d, characters %d-%d" file lnum cnum enum
     in
-    const (const_string loc None)
+    const (const_string loc)
   | Loc_LINE -> const (const_int lnum)
 
 (* Eta-expand a primitive *)
@@ -895,8 +891,7 @@ let assert_failed exp =
               const
                 (Const_block
                    ( Blk_tuple,
-                     [const_string fname None; const_int line; const_int char]
-                   ));
+                     [const_string fname; const_int line; const_int char] ));
             ]
           exp.exp_loc;
       ]
@@ -1043,7 +1038,8 @@ and transl_exp0 (e : Typedtree.expression) : Lambda.t =
     function_ ~loc ~attr ~params ~body:lbody
   | Texp_tagged_template {tag; raw_sources; values} ->
     prim ~primitive:(Ptagged_template raw_sources)
-      ~args:(transl_exp tag :: transl_list values) e.exp_loc
+      ~args:(transl_exp tag :: transl_list values)
+      e.exp_loc
   | Texp_template {segments; values} ->
     prim ~primitive:(Ptemplate segments) ~args:(transl_list values) e.exp_loc
   | Texp_apply

tests/ounit_tests/ounit_lambda_constant_tests.ml

@@ -6,5 +6,5 @@ let suites =
   __FILE__
   >::: [
          ( "typed string constants" >:: fun _ ->
-           Lambda.const_string "value" None =~ Lambda.Const_string "value" );
+           Lambda.const_string "value" =~ Lambda.Const_string "value" );
        ]

tests/ounit_tests/ounit_string_literal_tests.ml

@@ -216,8 +216,7 @@ let assert_lam_int expected = function
   | _ -> OUnit.assert_failure "expected a folded Lambda integer"
 
 let assert_lam_char expected = function
-  | Lambda.Lconst (Lambda.Const_char actual) ->
-    assert_int_equal expected actual
+  | Lambda.Lconst (Lambda.Const_char actual) -> assert_int_equal expected actual
   | _ -> OUnit.assert_failure "expected a folded Lambda character"
 
 let typed_string s =
@@ -246,10 +245,8 @@ let assert_typed_template ~source_segments ~expected_semantics =
   end;
   match Translcore.transl_exp typed with
   | Lprim
-      {
-        primitive = Ptemplate segments;
-        args = [Lconst (Const_string "value")];
-      } ->
+      {primitive = Ptemplate segments; args = [Lconst (Const_string "value")]}
+    ->
     OUnit.assert_equal ~printer:Ext_obj.dump source_segments
       (List.map (fun ({source} : Asttypes.template_segment) -> source) segments);
     OUnit.assert_equal ~printer:Ext_obj.dump expected_semantics
@@ -497,8 +494,8 @@ let suites =
            let semantic =
              convert_typed_constant (Asttypes.Const_string "a\n😀")
            in
-           OUnit.assert_equal ~printer:Ext_obj.dump
-             (Lambda.Const_string "a\n😀") semantic );
+           OUnit.assert_equal ~printer:Ext_obj.dump (Lambda.Const_string "a\n😀")
+             semantic );
          ( "JavaScript IR distinguishes strings and template literals"
          >:: fun _ ->
            assert_js_string ~expected:"a\n😀" (Lambda.Const_string "a\n😀");