wip: fix rescript-lang#1060

Author: bobzhang

jscomp/all.depend

@@ -246,7 +246,7 @@ core/js_number.cmi :
 core/js_cmj_datasets.cmi : ext/string_map.cmi core/js_cmj_format.cmi
 core/lam_exit_code.cmi : core/lam.cmi
 core/lam_module_ident.cmi : core/js_op.cmx common/js_config.cmi core/j.cmx \
-    ext/hashtbl_gen.cmx
+    ext/hashtbl_gen.cmx ext/hash_set_gen.cmx
 core/lam_compile_util.cmi : core/js_op.cmx
 core/lam_stats.cmi : core/lam_module_ident.cmi core/lam.cmi \
     ext/int_hash_set.cmi ext/ident_set.cmi ext/ident_hashtbl.cmi
@@ -350,8 +350,8 @@ core/lam_exit_code.cmx : core/lam.cmx core/lam_exit_code.cmi
 core/j.cmx : core/js_op.cmx core/js_fun_env.cmx core/js_closure.cmx \
     core/js_call_info.cmx ext/ident_set.cmx
 core/lam_module_ident.cmx : core/js_op.cmx common/js_config.cmx core/j.cmx \
-    ext/hashtbl_make.cmx ext/ext_ident.cmx stubs/bs_hash_stubs.cmx \
-    core/lam_module_ident.cmi
+    ext/hashtbl_make.cmx ext/hash_set.cmx ext/ext_ident.cmx \
+    stubs/bs_hash_stubs.cmx core/lam_module_ident.cmi
 core/lam_compile_util.cmx : core/js_op.cmx core/lam_compile_util.cmi
 core/lam_stats.cmx : core/lam_module_ident.cmx core/lam.cmx \
     ext/int_hash_set.cmx ext/ident_set.cmx ext/ident_hashtbl.cmx \

jscomp/bin/all_ounit_tests.ml

@@ -4981,6 +4981,14 @@ module type S = sig
   val find_exn: 'a t -> key -> 'a
   val find_all: 'a t -> key -> 'a list
   val find_opt: 'a t -> key  -> 'a option
+  
+  (** return the key found in the hashtbl.
+    Use case: when you find the key existed in hashtbl, 
+    you want to use the one stored in the hashtbl. 
+    (they are semantically equivlanent, but may have other information different) 
+   *)
+  val find_key_opt: 'a t -> key -> key option 
+
   val find_default: 'a t -> key -> 'a -> 'a 
 
   val replace: 'a t -> key -> 'a -> unit
@@ -5124,6 +5132,23 @@ let rec small_bucket_opt eq key (lst : _ bucketlist) : _ option =
             if eq key k3  then Some d3 else 
               small_bucket_opt eq key rest3 
 
+
+let rec small_bucket_key_opt eq key (lst : _ bucketlist) : _ option =
+  match lst with 
+  | Empty -> None 
+  | Cons(k1,d1,rest1) -> 
+    if eq  key k1 then Some k1 else 
+      match rest1 with
+      | Empty -> None 
+      | Cons(k2,d2,rest2) -> 
+        if eq key k2 then Some k2 else 
+          match rest2 with 
+          | Empty -> None 
+          | Cons(k3,d3,rest3) -> 
+            if eq key k3  then Some k3 else 
+              small_bucket_key_opt eq key rest3
+
+
 let rec small_bucket_default eq key default (lst : _ bucketlist) =
   match lst with 
   | Empty -> default 
@@ -5258,6 +5283,10 @@ let find_exn (h : _ t) key =
 
 let find_opt (h : _ t) key =
   Hashtbl_gen.small_bucket_opt eq_key key (Array.unsafe_get h.data (key_index h key))
+
+let find_key_opt (h : _ t) key =
+  Hashtbl_gen.small_bucket_key_opt eq_key key (Array.unsafe_get h.data (key_index h key))
+  
 let find_default (h : _ t) key default = 
   Hashtbl_gen.small_bucket_default eq_key key default (Array.unsafe_get h.data (key_index h key))
 let find_all (h : _ t) key =

jscomp/bin/whole_compiler.d

@@ -198,6 +198,8 @@ bin/whole_compiler.ml : ext/ident_map.ml
 bin/whole_compiler.ml : ext/ident_map.mli
 bin/whole_compiler.ml : core/lam_analysis.ml
 bin/whole_compiler.ml : core/lam_analysis.mli
+bin/whole_compiler.ml : ext/hash_set.ml
+bin/whole_compiler.ml : ext/hash_set.mli
 bin/whole_compiler.ml : ext/hashtbl_make.ml
 bin/whole_compiler.ml : ext/hashtbl_make.mli
 bin/whole_compiler.ml : core/lam_module_ident.ml