Renamed more files

Author: vouillon

compiler/bin-wasm_of_ocaml/compile.ml

@@ -43,9 +43,9 @@ let update_sourcemap ~sourcemap_root ~sourcemap_don't_inline_content sourcemap_f
       else
         Some
           (List.map source_map.sources ~f:(fun file ->
-               if String.equal file Wa_source_map.blackbox_filename
+               if String.equal file Wasm_source_map.blackbox_filename
                then
-                 Some (Source_map.Source_content.create Wa_source_map.blackbox_contents)
+                 Some (Source_map.Source_content.create Wasm_source_map.blackbox_contents)
                else if Sys.file_exists file && not (Sys.is_directory file)
                then Some (Source_map.Source_content.create (Fs.read_file file))
                else None))
@@ -56,8 +56,8 @@ let update_sourcemap ~sourcemap_root ~sourcemap_don't_inline_content sourcemap_f
       ; sourceroot =
           (if Option.is_some sourcemap_root then sourcemap_root else source_map.sourceroot)
       ; ignore_list =
-          (if List.mem Wa_source_map.blackbox_filename ~set:source_map.sources
-           then [ Wa_source_map.blackbox_filename ]
+          (if List.mem Wasm_source_map.blackbox_filename ~set:source_map.sources
+           then [ Wasm_source_map.blackbox_filename ]
            else [])
       }
     in
@@ -214,7 +214,7 @@ let build_js_runtime ~primitives ?runtime_arguments () =
     | Javascript.Expression_statement e, N -> e
     | _ -> assert false
   in
-  let prelude = Wa_link.output_js always_required_js in
+  let prelude = Link.output_js always_required_js in
   let init_fun =
     match Parse_js.parse (Parse_js.Lexer.of_string Wa_runtime.js_runtime) with
     | [ (Expression_statement f, _) ] -> f
@@ -230,7 +230,7 @@ let build_js_runtime ~primitives ?runtime_arguments () =
       in
       [ Javascript.Expression_statement js, Javascript.N ]
     in
-    Wa_link.output_js js
+    Link.output_js js
   in
   prelude ^ launcher
 
@@ -241,13 +241,13 @@ let add_source_map sourcemap_don't_inline_content z opt_source_map_file =
       if not sourcemap_don't_inline_content
       then
         let sm = Source_map.of_file file in
-        Wa_source_map.iter_sources sm (fun i j file ->
+        Wasm_source_map.iter_sources sm (fun i j file ->
             if Sys.file_exists file && not (Sys.is_directory file)
             then
               let sm = Fs.read_file file in
               Zip.add_entry
                 z
-                ~name:(Wa_link.source_name i j file)
+                ~name:(Link.source_name i j file)
                 ~contents:(Yojson.Basic.to_string (`String sm))))
     opt_source_map_file
 
@@ -348,8 +348,8 @@ let run
      link_runtime ~profile runtime_wasm_files tmp_wasm_file;
      let primitives =
        tmp_wasm_file
-       |> (fun file -> Wa_link.Wasm_binary.read_imports ~file)
-       |> List.filter_map ~f:(fun { Wa_link.Wasm_binary.module_; name; _ } ->
+       |> (fun file -> Link.Wasm_binary.read_imports ~file)
+       |> List.filter_map ~f:(fun { Link.Wasm_binary.module_; name; _ } ->
               if String.equal module_ "js" then Some name else None)
        |> StringSet.of_list
      in
@@ -358,7 +358,7 @@ let run
      Zip.add_file z ~name:"runtime.wasm" ~file:tmp_wasm_file;
      Zip.add_entry z ~name:"runtime.js" ~contents:js_runtime;
      let predefined_exceptions = build_prelude z in
-     Wa_link.add_info
+     Link.add_info
        z
        ~predefined_exceptions
        ~build_info:(Build_info.create `Runtime)
@@ -405,7 +405,7 @@ let run
            ~opt_output_sourcemap:opt_tmp_map_file
            ~input_file:wat_file
            ~output_file:tmp_wasm_file;
-         { Wa_link.unit_name; unit_info; strings; fragments }
+         { Link.unit_name; unit_info; strings; fragments }
        in
        cont unit_data unit_name tmp_wasm_file opt_tmp_map_file
      in
@@ -425,7 +425,7 @@ let run
          Fs.gen_file (Filename.chop_extension output_file ^ ".wat")
          @@ fun wat_file ->
          let dir = Filename.chop_extension output_file ^ ".assets" in
-         Wa_link.gen_dir dir
+         Link.gen_dir dir
          @@ fun tmp_dir ->
          Sys.mkdir tmp_dir 0o777;
          let opt_sourcemap =
@@ -455,21 +455,21 @@ let run
          if enable_source_maps
          then (
            Sys.rename (Filename.concat tmp_dir "code.wasm.map") (tmp_wasm_file' ^ ".map");
-           Wa_link.Wasm_binary.append_source_map_section
+           Link.Wasm_binary.append_source_map_section
              ~file:tmp_wasm_file'
              ~url:(wasm_name ^ ".wasm.map"));
          let js_runtime =
            let missing_primitives =
-             let l = Wa_link.Wasm_binary.read_imports ~file:tmp_wasm_file' in
+             let l = Link.Wasm_binary.read_imports ~file:tmp_wasm_file' in
              List.filter_map
-               ~f:(fun { Wa_link.Wasm_binary.module_; name; _ } ->
+               ~f:(fun { Link.Wasm_binary.module_; name; _ } ->
                  if String.equal module_ "env" then Some name else None)
                l
            in
            build_js_runtime
              ~primitives
              ~runtime_arguments:
-               (Wa_link.build_runtime_arguments
+               (Link.build_runtime_arguments
                   ~missing_primitives
                   ~wasm_dir:dir
                   ~link_spec:[ wasm_name, None ]
@@ -492,7 +492,7 @@ let run
                unit_data)
          in
          let unit_data = [ compile_cmo' z cmo ] in
-         Wa_link.add_info z ~build_info:(Build_info.create `Cmo) ~unit_data ();
+         Link.add_info z ~build_info:(Build_info.create `Cmo) ~unit_data ();
          Zip.close_out z
      | `Cma cma ->
          Fs.gen_file output_file
@@ -531,7 +531,7 @@ let run
                List.map ~f:(fun (unit_data, _, _, _) -> unit_data) l)
              []
          in
-         Wa_link.add_info z ~build_info:(Build_info.create `Cma) ~unit_data ();
+         Link.add_info z ~build_info:(Build_info.create `Cma) ~unit_data ();
          Zip.close_out z);
      close_ic ());
   Debug.stop_profiling ()

compiler/bin-wasm_of_ocaml/link.ml

@@ -81,7 +81,7 @@ let options =
 let f { common; output_file; files; linkall; enable_source_maps; mklib } =
   Js_of_ocaml_compiler.Config.set_target `Wasm;
   Jsoo_cmdline.Arg.eval common;
-  Wa_link.link ~output_file ~linkall ~mklib ~enable_source_maps ~files
+  Link.link ~output_file ~linkall ~mklib ~enable_source_maps ~files
 
 let info =
   Info.make

compiler/lib-wasm/wa_code_generation.ml renamed to compiler/lib-wasm/code_generation.ml

@@ -292,7 +292,7 @@ let event loc : unit t =
     | Event _ :: instrs | instrs -> { st with instrs = Event loc :: instrs } )
 
 let hidden_location =
-  { Parse_info.src = Some Wa_source_map.blackbox_filename
+  { Parse_info.src = Some Wasm_source_map.blackbox_filename
   ; name = None
   ; col = 0
   ; line = 1

compiler/lib-wasm/wa_code_generation.mli renamed to compiler/lib-wasm/code_generation.mli

@@ -19,7 +19,7 @@
 open! Stdlib
 open Code
 module W = Wasm_ast
-open Wa_code_generation
+open Code_generation
 
 module Make (Target : Wa_target_sig.S) = struct
   open Target

compiler/lib-wasm/curry.ml

@@ -17,5 +17,5 @@
  *)
 
 module Make (_ : Wa_target_sig.S) : sig
-  val f : context:Wa_code_generation.context -> unit
+  val f : context:Code_generation.context -> unit
 end

compiler/lib-wasm/curry.mli

@@ -585,7 +585,7 @@ let extract_source_map ~dir ~name z =
           | Some map -> Build_path_prefix_map.rewrite map path
           | None -> path
       in
-      Wa_source_map.insert_source_contents ~rewrite_path sm (fun i j file ->
+      Wasm_source_map.insert_source_contents ~rewrite_path sm (fun i j file ->
           let name = source_name i j file in
           if Zip.has_entry z ~name then Some (Zip.read_entry z ~name) else None)
     in
@@ -861,10 +861,10 @@ let rec get_source_map_files files src_index =
   then
     let data = Zip.read_entry z ~name:"source_map.map" in
     let sm = Source_map.of_string data in
-    if not (Wa_source_map.is_empty sm)
+    if not (Wasm_source_map.is_empty sm)
     then (
       let l = ref [] in
-      Wa_source_map.iter_sources sm (fun i j file -> l := source_name i j file :: !l);
+      Wasm_source_map.iter_sources sm (fun i j file -> l := source_name i j file :: !l);
       if not (List.is_empty !l)
       then z, Array.of_list (List.rev !l)
       else (
@@ -888,7 +888,7 @@ let add_source_map files z opt_source_map_file =
         | Some (_, (z', _)) -> Zip.close_in z'
         | None -> ()
       in
-      Wa_source_map.iter_sources sm (fun i j file ->
+      Wasm_source_map.iter_sources sm (fun i j file ->
           let z', files =
             match !st with
             | Some (i', st) when Poly.equal i i' -> st