Skip to content

Commit 7dc30b6

Browse files
committed
prepare to remove export_idents from meta type definition (+2 squashed commits)
Squashed commits: [08b6c47] prepare to add a global variable for current export idents [3da1913] add ordered_hash_set replace support
1 parent dbf8aee commit 7dc30b6

17 files changed

+1024
-470
lines changed

jscomp/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ ext/ordered_hash_set_make.ml : ext/ordered_hash_set.cppo.ml
7575
ext/ordered_hash_set_string.ml:ext/ordered_hash_set.cppo.ml
7676
cppo -D TYPE_STRING $< -o $@
7777

78+
ext/ordered_hash_set_ident.ml:ext/ordered_hash_set.cppo.ml
79+
cppo -D TYPE_IDENT $< -o $@
80+
7881
ext/string_hashtbl.ml: ext/hashtbl.cppo.ml
7982
cppo -D TYPE_STRING $< -o $@
8083
ext/int_hashtbl.ml: ext/hashtbl.cppo.ml
@@ -153,12 +156,13 @@ EXT_SRCS = ext_util\
153156
ext_marshal ext_option \
154157
ext_pervasives ext_pp ext_ref ext_sys \
155158
hash_set_gen hash_set string_hash_set int_hash_set \
159+
ext_ident\
156160
ordered_hash_set_gen\
157161
ordered_hash_set_string\
162+
ordered_hash_set_ident\
158163
ordered_hash_set_make\
159164
ordered_hash_map_gen\
160165
union_find \
161-
ext_ident\
162166
ident_map\
163167
ident_set\
164168
hashtbl_make\

jscomp/all.depend

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,19 @@ ext/string_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_string.cmx \
3333
stubs/bs_hash_stubs.cmx ext/string_hash_set.cmi
3434
ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
3535
stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
36+
ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
37+
ext/ext_string.cmx ext/ext_ident.cmi
3638
ext/ordered_hash_set_gen.cmx : ext/ext_util.cmx
3739
ext/ordered_hash_set_string.cmx : ext/ordered_hash_set_gen.cmx \
38-
ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
40+
ext/ext_util.cmx ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
3941
ext/ordered_hash_set_string.cmi
40-
ext/ordered_hash_set_make.cmx : ext/ordered_hash_set_gen.cmx
42+
ext/ordered_hash_set_ident.cmx : ext/ordered_hash_set_gen.cmx \
43+
ext/ext_util.cmx ext/ext_ident.cmx stubs/bs_hash_stubs.cmx \
44+
ext/ordered_hash_set_ident.cmi
45+
ext/ordered_hash_set_make.cmx : ext/ordered_hash_set_gen.cmx \
46+
ext/ext_util.cmx
4147
ext/ordered_hash_map_gen.cmx : ext/ext_util.cmx
4248
ext/union_find.cmx : ext/union_find.cmi
43-
ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
44-
ext/ext_string.cmx ext/ext_ident.cmi
4549
ext/ident_map.cmx : ext/map_gen.cmx ext/ext_ident.cmx ext/ident_map.cmi
4650
ext/ident_set.cmx : ext/set_gen.cmx ext/ident_set.cmi
4751
ext/hashtbl_make.cmx : ext/hashtbl_gen.cmx ext/hashtbl_make.cmi
@@ -92,9 +96,10 @@ ext/ext_sys.cmi :
9296
ext/hash_set.cmi : ext/hash_set_gen.cmx
9397
ext/string_hash_set.cmi : ext/hash_set_gen.cmx
9498
ext/int_hash_set.cmi : ext/hash_set_gen.cmx
99+
ext/ext_ident.cmi :
95100
ext/ordered_hash_set_string.cmi : ext/ordered_hash_set_gen.cmx
101+
ext/ordered_hash_set_ident.cmi : ext/ordered_hash_set_gen.cmx
96102
ext/union_find.cmi :
97-
ext/ext_ident.cmi :
98103
ext/ident_map.cmi : ext/map_gen.cmx
99104
ext/ident_set.cmi : ext/set_gen.cmx
100105
ext/hashtbl_make.cmi : ext/hashtbl_gen.cmx
@@ -302,7 +307,8 @@ core/ocaml_parse.cmx : syntax/ppx_entry.cmx common/js_config.cmx \
302307
core/lam.cmx : ext/ordered_hash_map_local_ident.cmx \
303308
core/ocaml_stdlib_slots.cmx ext/literals.cmx common/js_config.cmx \
304309
ext/int_vec_vec.cmx ext/int_vec.cmx ext/ident_set.cmx \
305-
ext/ident_hash_set.cmx ext/ext_string.cmx ext/ext_scc.cmx core/lam.cmi
310+
ext/ident_hashtbl.cmx ext/ident_hash_set.cmx ext/ext_string.cmx \
311+
ext/ext_scc.cmx core/lam.cmi
306312
core/lam_print.cmx : core/lam.cmx core/lam_print.cmi
307313
core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
308314
core/lam_beta_reduce_util.cmi

0 commit comments

Comments
 (0)