consistent naming of data collections

Author: bobzhang

.gitignore

@@ -115,23 +115,22 @@ bin/ninja.exe
 tmp/
 jscomp/ext/hash_set.ml
 jscomp/ext/hash_set_poly.ml
-jscomp/ext/hashtbl_make.ml
-jscomp/ext/ident_hash_set.ml
-jscomp/ext/ident_hashtbl.ml
-jscomp/ext/ident_map.ml
-jscomp/ext/ident_set.ml
-jscomp/ext/int_hash_set.ml
-jscomp/ext/int_hashtbl.ml
-jscomp/ext/int_map.ml
-jscomp/ext/int_vec.ml
+jscomp/ext/hash.ml
+jscomp/ext/hash_set_ident.ml
+jscomp/ext/hash_ident.ml
+jscomp/ext/map_ident.ml
+jscomp/ext/set_ident.ml
+jscomp/ext/hash_set_int.ml
+jscomp/ext/hash_int.ml
+jscomp/ext/map_int.ml
+jscomp/ext/vec_int.ml
 jscomp/ext/ordered_hash_map_local_ident.ml
-jscomp/ext/ordered_hash_set_make.ml
-jscomp/ext/resize_array.ml
+jscomp/ext/vec.ml
 jscomp/ext/set_int.ml
-jscomp/ext/string_hash_set.ml
-jscomp/ext/string_hashtbl.ml
-jscomp/ext/string_map.ml
-jscomp/ext/string_set.ml
+jscomp/ext/hash_set_string.ml
+jscomp/ext/hash_string.ml
+jscomp/ext/map_string.ml
+jscomp/ext/set_string.ml
 jscomp/syntax/reactjs_jsx_ppx_v2.ml
 jscomp/syntax/reactjs_jsx_ppx_v3.ml
 jscomp/outcome_printer/tweaked_reason_oprint.ml

jscomp/bsb/bsb.md

@@ -84,13 +84,13 @@ This file is integrity is not impacted by `.bscache`. whenever `.bscache` change
 # Appendix
 [source,ocaml]
 --------------
-module String_set = Set.Make(String)
+module Set_string = Set.Make(String)
 
-(* let v = String_set.of_list ["List" ; "Set" ; "String" ; "Test_order"] *)
-let v = String_set.of_list []
+(* let v = Set_string.of_list ["List" ; "Set" ; "String" ; "Test_order"] *)
+let v = Set_string.of_list []
 let deseralize f =
   let ichan  = open_in_bin f in
-  let v : String_set.t = input_value ichan  in
+  let v : Set_string.t = input_value ichan  in
   close_in ichan ;
   v
 
@@ -101,7 +101,7 @@ let time f arg =
   print_endline (Printf.sprintf "%f elapsed" (v1 -. v0))
 
 let deseralize_and_compare f =
-  ignore @@ String_set.equal v (deseralize f)
+  ignore @@ Set_string.equal v (deseralize f)
 
 let  seralize f =
   let ochan = open_out_bin f in

jscomp/bsb/bsb_build_util.ml

@@ -173,7 +173,7 @@ let pp_packages_rev ppf lst =
   Ext_list.rev_iter lst (fun  s ->  Format.fprintf ppf "%s " s) 
 
 let rec walk_all_deps_aux 
-  (visited : string String_hashtbl.t) 
+  (visited : string Hash_string.t) 
   (paths : string list) 
   (top : bool) 
   (dir : string) 
@@ -182,7 +182,7 @@ let rec walk_all_deps_aux
   match Ext_json_parse.parse_json_from_file bsconfig_json with
   | Obj {map; loc} ->
     let cur_package_name = 
-      match String_map.find_opt map Bsb_build_schemas.name with 
+      match Map_string.find_opt map Bsb_build_schemas.name with 
       | Some (Str {str }) -> str
       | Some _ 
       | None -> Bsb_exception.errorf ~loc "package name missing in %s/bsconfig.json" dir 
@@ -195,7 +195,7 @@ let rec walk_all_deps_aux
         Bsb_log.error "@{<error>Cyclic dependencies in package stack@}@.";
         exit 2 
       end;
-    if String_hashtbl.mem visited cur_package_name then 
+    if Hash_string.mem visited cur_package_name then 
       Bsb_log.info
         "@{<info>Visited before@} %s@." cur_package_name
     else 
@@ -221,13 +221,13 @@ let rec walk_all_deps_aux
         explore_deps Bsb_build_schemas.bs_dependencies;          
         if top then explore_deps Bsb_build_schemas.bs_dev_dependencies;
         cb {top ; proj_dir = dir};
-        String_hashtbl.add visited cur_package_name dir;
+        Hash_string.add visited cur_package_name dir;
       end
   | _ -> ()
   | exception _ -> 
     Bsb_exception.invalid_json bsconfig_json
 
 
 let walk_all_deps dir cb = 
-  let visited = String_hashtbl.create 0 in 
+  let visited = Hash_string.create 0 in 
   walk_all_deps_aux visited [] true dir cb 

jscomp/bsb/bsb_config_parse.ml

@@ -33,7 +33,7 @@ let resolve_package cwd  package_name =
     package_install_path = x // Bsb_config.lib_ocaml
   }
 
-type json_map = Ext_json_types.t String_map.t
+type json_map = Ext_json_types.t Map_string.t
 (* Key is the path *)
 let (|?)  m (key, cb) =
   m  |> Ext_json.test key cb
@@ -71,7 +71,7 @@ let extract_main_entries (map :json_map) =
         | _ -> failwith "Unrecognized object inside array 'entries' field.") 
       field in
   let entries = ref Bsb_default.main_entries in
-  begin match String_map.find_opt map Bsb_build_schemas.entries with
+  begin match Map_string.find_opt map Bsb_build_schemas.entries with
     | Some (Arr {content = s}) -> entries := extract_entries s
     | _ -> ()
   end; !entries
@@ -85,7 +85,7 @@ let package_specs_from_bsconfig () =
   begin match json with
     | Obj {map} ->
       begin 
-        match String_map.find_opt map  Bsb_build_schemas.package_specs with 
+        match Map_string.find_opt map  Bsb_build_schemas.package_specs with 
         | Some x ->
           Bsb_package_specs.from_json x
         | None -> 
@@ -104,7 +104,7 @@ let package_specs_from_bsconfig () =
 let extract_package_name_and_namespace
     (map : json_map) : string * string option =   
   let package_name = 
-    match String_map.find_opt map Bsb_build_schemas.name with 
+    match Map_string.find_opt map Bsb_build_schemas.name with 
 
     | Some (Str { str = "_" } as config)
       -> 
@@ -119,7 +119,7 @@ let extract_package_name_and_namespace
         "field name is required"
   in 
   let namespace = 
-    match String_map.find_opt map Bsb_build_schemas.namespace with 
+    match Map_string.find_opt map Bsb_build_schemas.namespace with 
     | None 
     | Some (False _) 
       -> None 
@@ -142,7 +142,7 @@ let extract_package_name_and_namespace
       (kinda check npm upgrade)
 *)
 let check_version_exit (map : json_map) stdlib_path =   
-  match String_map.find_exn map Bsb_build_schemas.version with 
+  match Map_string.find_exn map Bsb_build_schemas.version with 
   | Str {str } -> 
     if str <> Bs_version.version then 
       begin
@@ -158,7 +158,7 @@ let check_version_exit (map : json_map) stdlib_path =
   | _ -> assert false
 
 let check_stdlib (map : json_map) cwd (*built_in_package*) =  
-  match String_map.find_opt map Bsb_build_schemas.use_stdlib with      
+  match Map_string.find_opt map Bsb_build_schemas.use_stdlib with      
   | Some (False _) -> None    
   | None 
   | Some _ ->
@@ -180,7 +180,7 @@ let check_stdlib (map : json_map) cwd (*built_in_package*) =
 
     end
 let extract_bs_suffix_exn (map : json_map) =  
-  match String_map.find_opt map Bsb_build_schemas.suffix with 
+  match Map_string.find_opt map Bsb_build_schemas.suffix with 
   | None -> false  
   | Some (Str {str} as config ) -> 
     if str = Literals.suffix_js then false 
@@ -193,11 +193,11 @@ let extract_bs_suffix_exn (map : json_map) =
 
 let extract_gentype_config (map : json_map) cwd 
   : Bsb_config_types.gentype_config option = 
-  match String_map.find_opt map Bsb_build_schemas.gentypeconfig with 
+  match Map_string.find_opt map Bsb_build_schemas.gentypeconfig with 
   | None -> None
   | Some (Obj {map = obj}) -> 
     Some { path = 
-             match String_map.find_opt obj Bsb_build_schemas.path with
+             match Map_string.find_opt obj Bsb_build_schemas.path with
              | None -> 
                (Bsb_build_util.resolve_bsb_magic_file
                  ~cwd ~desc:"gentype.exe"
@@ -215,7 +215,7 @@ let extract_gentype_config (map : json_map) cwd
       config "gentypeconfig expect an object"  
 
 let extract_refmt (map : json_map) cwd : Bsb_config_types.refmt =      
-  match String_map.find_opt map Bsb_build_schemas.refmt with 
+  match Map_string.find_opt map Bsb_build_schemas.refmt with 
   | Some (Flo {flo} as config) -> 
     begin match flo with 
       | "3" -> Bsb_config_types.Refmt_v3
@@ -232,14 +232,14 @@ let extract_refmt (map : json_map) cwd : Bsb_config_types.refmt =
     Refmt_none 
 
 let extract_string (map : json_map) (field : string) cb = 
-  match String_map.find_opt map field with 
+  match Map_string.find_opt map field with 
   | None -> None 
   | Some (Str{str}) -> cb str 
   | Some config -> 
     Bsb_exception.config_error config (field ^ " expect a string" )
 
 let extract_boolean (map : json_map) (field : string) (default : bool) : bool = 
-  match String_map.find_opt map field with 
+  match Map_string.find_opt map field with 
   | None -> default 
   | Some (True _ ) -> true
   | Some (False _) -> false 
@@ -250,7 +250,7 @@ let extract_reason_react_jsx (map : json_map) =
   let default : Bsb_config_types.reason_react_jsx option ref = ref None in 
   map
   |? (Bsb_build_schemas.reason, `Obj begin fun m -> 
-      match String_map.find_opt m Bsb_build_schemas.react_jsx with 
+      match Map_string.find_opt m Bsb_build_schemas.react_jsx with 
       | Some (Flo{loc; flo}) -> 
         begin match flo with 
           | "2" -> 
@@ -267,32 +267,32 @@ let extract_reason_react_jsx (map : json_map) =
   !default
 
 let extract_warning (map : json_map) = 
-  match String_map.find_opt map Bsb_build_schemas.warnings with 
+  match Map_string.find_opt map Bsb_build_schemas.warnings with 
   | None -> None 
   | Some (Obj {map }) -> Bsb_warning.from_map map 
   | Some config -> Bsb_exception.config_error config "expect an object"
 
 let extract_ignored_dirs (map : json_map) =   
-  match String_map.find_opt map Bsb_build_schemas.ignored_dirs with 
-  | None -> String_set.empty
+  match Map_string.find_opt map Bsb_build_schemas.ignored_dirs with 
+  | None -> Set_string.empty
   | Some (Arr {content}) -> 
-    String_set.of_list (Bsb_build_util.get_list_string content)
+    Set_string.of_list (Bsb_build_util.get_list_string content)
   | Some config -> 
     Bsb_exception.config_error config "expect an array of string"  
 
 let extract_generators (map : json_map) = 
-  let generators = ref String_map.empty in 
-  (match String_map.find_opt map Bsb_build_schemas.generators with 
+  let generators = ref Map_string.empty in 
+  (match Map_string.find_opt map Bsb_build_schemas.generators with 
    | None -> ()
    | Some (Arr {content = s}) -> 
      generators :=
-       Ext_array.fold_left s String_map.empty (fun acc json -> 
+       Ext_array.fold_left s Map_string.empty (fun acc json -> 
            match json with 
            | Obj {map = m ; loc}  -> 
-             begin match String_map.find_opt  m Bsb_build_schemas.name,
-                         String_map.find_opt  m Bsb_build_schemas.command with 
+             begin match Map_string.find_opt  m Bsb_build_schemas.name,
+                         Map_string.find_opt  m Bsb_build_schemas.command with 
              | Some (Str {str = name}), Some ( Str {str = command}) -> 
-               String_map.add acc name command 
+               Map_string.add acc name command 
              | _, _ -> 
                Bsb_exception.errorf ~loc {| generators exepect format like { "name" : "cppo",  "command"  : "cppo $in -o $out"} |}
              end
@@ -305,7 +305,7 @@ let extract_generators (map : json_map) =
 
 let extract_dependencies (map : json_map) cwd (field : string )
   : Bsb_config_types.dependencies =   
-  match String_map.find_opt map field with 
+  match Map_string.find_opt map field with 
   | None -> []
   | Some (Arr ({content = s})) -> 
     Ext_list.map (Bsb_build_util.get_list_string s) (fun s -> resolve_package cwd (Bsb_pkg_types.string_as_package s))
@@ -315,7 +315,7 @@ let extract_dependencies (map : json_map) cwd (field : string )
 
 (* return an empty array if not found *)     
 let extract_string_list (map : json_map) (field : string) : string list = 
-  match String_map.find_opt map field with 
+  match Map_string.find_opt map field with 
   | None -> []
   | Some (Arr {content = s}) -> 
     Bsb_build_util.get_list_string s 
@@ -326,7 +326,7 @@ let extract_ppx
   (map : json_map) 
   (field : string) 
   ~(cwd : string) : Bsb_config_types.ppx list =     
-  match String_map.find_opt map field with 
+  match Map_string.find_opt map field with 
   | None -> []
   | Some (Arr {content }) -> 
     let resolve s = 
@@ -406,7 +406,7 @@ let interpret_json
     (* The default situation is empty *)
     let built_in_package = check_stdlib map per_proj_dir in
     let package_specs =     
-      match String_map.find_opt map Bsb_build_schemas.package_specs with 
+      match Map_string.find_opt map Bsb_build_schemas.package_specs with 
       | Some x ->
         Bsb_package_specs.from_json x 
       | None ->  Bsb_package_specs.default_package_specs 
@@ -425,7 +425,7 @@ let interpret_json
       if toplevel then 
         extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dev_dependencies
       else [] in 
-    begin match String_map.find_opt map Bsb_build_schemas.sources with 
+    begin match Map_string.find_opt map Bsb_build_schemas.sources with 
       | Some sources -> 
         let cut_generators = 
           extract_boolean map Bsb_build_schemas.cut_generators false in 
@@ -465,7 +465,7 @@ let interpret_json
              | None ->  package_specs
              | Some x -> x );          
           file_groups = groups; 
-          files_to_install = String_hash_set.create 96;
+          files_to_install = Hash_set_string.create 96;
           built_in_dependency = built_in_package;
           generate_merlin = 
             extract_boolean map Bsb_build_schemas.generate_merlin true;

jscomp/bsb/bsb_config_types.ml

@@ -75,11 +75,11 @@ type t =
     js_post_build_cmd : string option;
     package_specs : Bsb_package_specs.t ; 
     file_groups : Bsb_file_groups.t;
-    files_to_install : String_hash_set.t ;
+    files_to_install : Hash_set_string.t ;
     generate_merlin : bool ; 
     reason_react_jsx : reason_react_jsx option; (* whether apply PPX transform or not*)
     entries : entries_t list ;
-    generators : command String_map.t ; 
+    generators : command Map_string.t ; 
     cut_generators : bool; (* note when used as a dev mode, we will always ignore it *)
     bs_suffix : bool ; (* true means [.bs.js] we should pass [-bs-suffix] flag *)
     gentype_config : gentype_config option;

jscomp/bsb/bsb_db_encode.ml

@@ -64,24 +64,24 @@ let make_encoding length buf =
 *)
 let encode_single (db : Bsb_db.t) (buf : Ext_buffer.t) =    
   nl buf ; (* module name section *)
-  let len = String_map.cardinal db in 
+  let len = Map_string.cardinal db in 
   Ext_buffer.add_string_char buf (string_of_int len) '\n';
-  let mapping = String_hashtbl.create 50 in 
-  String_map.iter db (fun name {dir} ->  
+  let mapping = Hash_string.create 50 in 
+  Map_string.iter db (fun name {dir} ->  
       Ext_buffer.add_string_char buf name '\n'; 
-      if not (String_hashtbl.mem mapping dir) then
-        String_hashtbl.add mapping dir (String_hashtbl.length mapping)
+      if not (Hash_string.mem mapping dir) then
+        Hash_string.add mapping dir (Hash_string.length mapping)
     ); 
-  let length = String_hashtbl.length mapping in   
+  let length = Hash_string.length mapping in   
   let rev_mapping = Array.make length "" in 
-  String_hashtbl.iter mapping (fun k i -> Array.unsafe_set rev_mapping i k);
+  Hash_string.iter mapping (fun k i -> Array.unsafe_set rev_mapping i k);
   (* directory name section *)
   Ext_array.iter rev_mapping (fun s -> Ext_buffer.add_string_char buf s '\t');
   nl buf; (* module name info section *)
   let len_encoding = make_encoding length buf in 
-  String_map.iter db (fun _ module_info ->       
+  Map_string.iter db (fun _ module_info ->       
       len_encoding buf 
-        (String_hashtbl.find_exn  mapping module_info.dir lsl 1 + Obj.magic module_info.case ))      
+        (Hash_string.find_exn  mapping module_info.dir lsl 1 + Obj.magic module_info.case ))      
 
 let encode (dbs : Bsb_db.ts) buf =