Skip to content

Commit 1220154

Browse files
committed
split js_runtime_modules
1 parent d306bd4 commit 1220154

21 files changed

+241
-412
lines changed

jscomp/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ EXT_CMXS=$(addprefix ext/, $(addsuffix .cmx, $(EXT_SRCS)))
224224
EXT_CMOS=$(addprefix ext/, $(addsuffix .cmo, $(EXT_SRCS)))
225225
COMMON_SRCS= bs_version\
226226
js_packages_info\
227-
js_config \
227+
js_config \
228228
ext_log \
229229
bs_loc \
230230
bs_warnings \
@@ -258,7 +258,8 @@ SYNTAX_SRCS= \
258258
SYNTAX_CMXS=$(addprefix syntax/, $(addsuffix .cmx, $(SYNTAX_SRCS)))
259259
DEPENDS_SRCS= bs_exception ast_extract binary_ast
260260
DEPENDS_CMXS=$(addprefix depends/, $(addsuffix .cmx, $(DEPENDS_SRCS)))
261-
CORE_SRCS= type_int_to_string type_util ocaml_stdlib_slots bs_conditional_initial ocaml_options ocaml_parse\
261+
CORE_SRCS= js_runtime_modules \
262+
type_int_to_string type_util ocaml_stdlib_slots bs_conditional_initial ocaml_options ocaml_parse\
262263
js_op\
263264
lam_module_ident\
264265
lam_arity\

jscomp/all.depend

+30-28
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ core/lam_coercion.cmi : core/lam_stats.cmi core/lam_group.cmi core/lam.cmi \
364364
core/lam_compile_group.cmi : core/j.cmx
365365
core/js_implementation.cmi :
366366
core/ocaml_batch_compile.cmi :
367+
core/js_runtime_modules.cmx :
367368
core/type_int_to_string.cmx :
368369
core/type_util.cmx : core/type_int_to_string.cmx common/ext_log.cmx \
369370
core/type_util.cmi
@@ -414,9 +415,9 @@ core/lam_compile_defs.cmx : core/lam_stats.cmx core/lam.cmx core/j.cmx \
414415
ext/ident_map.cmx core/lam_compile_defs.cmi
415416
core/js_map.cmx : core/j.cmx
416417
core/js_fold.cmx : core/j.cmx
417-
core/js_fold_basic.cmx : core/lam_module_ident.cmx core/js_fold.cmx \
418-
common/js_config.cmx core/j.cmx ext/ident_set.cmx ext/ext_ident.cmx \
419-
core/js_fold_basic.cmi
418+
core/js_fold_basic.cmx : core/lam_module_ident.cmx \
419+
core/js_runtime_modules.cmx core/js_fold.cmx core/j.cmx ext/ident_set.cmx \
420+
ext/ext_ident.cmx core/js_fold_basic.cmi
420421
core/js_pass_scope.cmx : core/js_fun_env.cmx core/js_fold.cmx \
421422
core/js_closure.cmx ext/ident_set.cmx common/ext_log.cmx \
422423
core/js_pass_scope.cmi
@@ -426,19 +427,19 @@ core/js_analyzer.cmx : core/js_fun_env.cmx core/js_fold.cmx core/j.cmx \
426427
core/js_shake.cmx : core/js_analyzer.cmx core/j.cmx ext/ident_set.cmx \
427428
ext/ext_string.cmx common/ext_log.cmx core/js_shake.cmi
428429
core/js_exp_make.cmx : ext/literals.cmx core/lam_compile_util.cmx \
429-
core/js_op_util.cmx core/js_fun_env.cmx common/js_config.cmx \
430+
core/js_runtime_modules.cmx core/js_op_util.cmx core/js_fun_env.cmx \
430431
core/js_call_info.cmx core/js_analyzer.cmx core/j.cmx ext/ext_string.cmx \
431432
ext/ext_pervasives.cmx ext/ext_ident.cmx core/js_exp_make.cmi
432-
core/js_long.cmx : core/js_exp_make.cmx common/js_config.cmx \
433+
core/js_long.cmx : core/js_runtime_modules.cmx core/js_exp_make.cmx \
433434
core/js_analyzer.cmx core/j.cmx core/js_long.cmi
434-
core/js_of_lam_exception.cmx : ext/literals.cmx core/js_exp_make.cmx \
435-
common/js_config.cmx core/j.cmx core/js_of_lam_exception.cmi
435+
core/js_of_lam_exception.cmx : ext/literals.cmx core/js_runtime_modules.cmx \
436+
core/js_exp_make.cmx core/j.cmx core/js_of_lam_exception.cmi
436437
core/js_of_lam_module.cmx : core/js_exp_make.cmx core/j.cmx \
437438
core/js_of_lam_module.cmi
438439
core/js_of_lam_array.cmx : core/js_exp_make.cmx core/js_of_lam_array.cmi
439440
core/js_of_lam_block.cmx : core/js_of_lam_array.cmx core/js_exp_make.cmx \
440441
core/js_of_lam_block.cmi
441-
core/js_of_lam_string.cmx : core/js_exp_make.cmx common/js_config.cmx \
442+
core/js_of_lam_string.cmx : core/js_runtime_modules.cmx core/js_exp_make.cmx \
442443
core/j.cmx ext/ext_string.cmx core/js_of_lam_string.cmi
443444
core/js_of_lam_tuple.cmx : core/js_exp_make.cmx core/j.cmx \
444445
core/js_of_lam_tuple.cmi
@@ -515,16 +516,16 @@ core/js_program_loader.cmx : core/lam_module_ident.cmx \
515516
ext/ext_filename.cmx core/config_util.cmx depends/bs_exception.cmx \
516517
core/js_program_loader.cmi
517518
core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
518-
core/js_stmt_make.cmx core/js_program_loader.cmx \
519-
common/js_packages_info.cmx core/js_op_util.cmx core/js_op.cmx \
520-
core/js_number.cmx core/js_fun_env.cmx core/js_exp_make.cmx \
521-
common/js_config.cmx core/js_closure.cmx core/j.cmx ext/ident_set.cmx \
522-
ext/ext_string.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx ext/ext_list.cmx \
523-
ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
519+
core/js_stmt_make.cmx core/js_runtime_modules.cmx \
520+
core/js_program_loader.cmx common/js_packages_info.cmx \
521+
core/js_op_util.cmx core/js_op.cmx core/js_number.cmx core/js_fun_env.cmx \
522+
core/js_exp_make.cmx common/js_config.cmx core/js_closure.cmx core/j.cmx \
523+
ext/ident_set.cmx ext/ext_string.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx \
524+
ext/ext_list.cmx ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
524525
core/js_pass_debug.cmx : core/js_dump.cmx common/js_config.cmx core/j.cmx \
525526
ext/ext_pervasives.cmx common/ext_log.cmx ext/ext_filename.cmx \
526527
core/js_pass_debug.cmi
527-
core/js_of_lam_option.cmx : core/js_exp_make.cmx common/js_config.cmx \
528+
core/js_of_lam_option.cmx : core/js_runtime_modules.cmx core/js_exp_make.cmx \
528529
core/js_analyzer.cmx core/j.cmx core/js_of_lam_option.cmi
529530
core/js_output.cmx : core/lam_compile_defs.cmx core/lam_analysis.cmx \
530531
core/lam.cmx core/js_stmt_make.cmx core/js_exp_make.cmx core/js_dump.cmx \
@@ -534,10 +535,10 @@ core/lam_compile_global.cmx : core/type_util.cmx core/lam_module_ident.cmx \
534535
core/js_output.cmx core/js_of_lam_module.cmx core/js_exp_make.cmx \
535536
core/j.cmx ext/ext_list.cmx core/lam_compile_global.cmi
536537
core/lam_dispatch_primitive.cmx : core/js_stmt_make.cmx \
537-
core/js_of_lam_tuple.cmx core/js_of_lam_exception.cmx \
538-
core/js_of_lam_array.cmx core/js_long.cmx core/js_exp_make.cmx \
539-
common/js_config.cmx core/js_analyzer.cmx core/j.cmx common/ext_log.cmx \
540-
ext/ext_list.cmx core/lam_dispatch_primitive.cmi
538+
core/js_runtime_modules.cmx core/js_of_lam_tuple.cmx \
539+
core/js_of_lam_exception.cmx core/js_of_lam_array.cmx core/js_long.cmx \
540+
core/js_exp_make.cmx common/js_config.cmx core/js_analyzer.cmx core/j.cmx \
541+
common/ext_log.cmx ext/ext_list.cmx core/lam_dispatch_primitive.cmi
541542
core/lam_bounded_vars.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
542543
core/lam_bounded_vars.cmi
543544
core/lam_beta_reduce.cmx : core/lam_util.cmx core/lam_stats.cmx \
@@ -547,19 +548,20 @@ core/lam_beta_reduce.cmx : core/lam_util.cmx core/lam_stats.cmx \
547548
ext/ident_hashtbl.cmx core/lam_beta_reduce.cmi
548549
core/lam_compile_external_call.cmx : core/lam_compile_env.cmx \
549550
core/lam_compile_defs.cmx core/lam_compile_const.cmx \
550-
core/js_of_lam_variant.cmx core/js_of_lam_option.cmx core/js_exp_make.cmx \
551-
common/js_config.cmx core/js_arr.cmx core/js_analyzer.cmx core/j.cmx \
552-
ext/ext_list.cmx ext/ext_ident.cmx syntax/ast_ffi_types.cmx \
553-
syntax/ast_arg.cmx core/lam_compile_external_call.cmi
551+
core/js_runtime_modules.cmx core/js_of_lam_variant.cmx \
552+
core/js_of_lam_option.cmx core/js_exp_make.cmx core/js_arr.cmx \
553+
core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx ext/ext_ident.cmx \
554+
syntax/ast_ffi_types.cmx syntax/ast_arg.cmx \
555+
core/lam_compile_external_call.cmi
554556
core/lam_compile_external_obj.cmx : core/lam_compile_external_call.cmx \
555557
core/lam_compile_const.cmx core/js_stmt_make.cmx core/js_op.cmx \
556558
core/js_exp_make.cmx core/js_ast_util.cmx core/js_analyzer.cmx core/j.cmx \
557559
ext/ext_list.cmx ext/ext_ident.cmx syntax/ast_arg.cmx \
558560
core/lam_compile_external_obj.cmi
559561
core/lam_compile_primitive.cmx : core/lam_util.cmx \
560562
core/lam_dispatch_primitive.cmx core/lam_compile_external_call.cmx \
561-
core/lam_compile_defs.cmx core/lam.cmx core/js_op_util.cmx \
562-
core/js_of_lam_string.cmx core/js_of_lam_record.cmx \
563+
core/lam_compile_defs.cmx core/lam.cmx core/js_runtime_modules.cmx \
564+
core/js_op_util.cmx core/js_of_lam_string.cmx core/js_of_lam_record.cmx \
563565
core/js_of_lam_option.cmx core/js_of_lam_float_record.cmx \
564566
core/js_of_lam_exception.cmx core/js_of_lam_block.cmx \
565567
core/js_of_lam_array.cmx core/js_long.cmx core/js_exp_make.cmx \
@@ -572,8 +574,8 @@ core/lam_compile.cmx : ext/literals.cmx core/lam_util.cmx \
572574
core/lam_compile_env.cmx core/lam_compile_defs.cmx \
573575
core/lam_compile_const.cmx core/lam_closure.cmx core/lam_beta_reduce.cmx \
574576
core/lam_arity.cmx core/lam_analysis.cmx core/lam.cmx \
575-
core/js_stmt_make.cmx core/js_output.cmx core/js_of_lam_record.cmx \
576-
core/js_of_lam_array.cmx core/js_exp_make.cmx common/js_config.cmx \
577+
core/js_stmt_make.cmx core/js_runtime_modules.cmx core/js_output.cmx \
578+
core/js_of_lam_record.cmx core/js_of_lam_array.cmx core/js_exp_make.cmx \
577579
core/js_call_info.cmx core/js_ast_util.cmx core/js_arr.cmx \
578580
core/js_analyzer.cmx core/j.cmx ext/ident_set.cmx ext/ident_map.cmx \
579581
ext/ext_string.cmx ext/ext_list.cmx ext/ext_ident.cmx \
@@ -608,7 +610,7 @@ core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
608610
core/lam_module_ident.cmx core/lam_group.cmx core/lam_compile_env.cmx \
609611
core/lam_compile_defs.cmx core/lam_compile.cmx core/lam_coercion.cmx \
610612
core/lam_analysis.cmx core/lam.cmx core/js_stmt_make.cmx \
611-
core/js_shake.cmx core/js_program_loader.cmx \
613+
core/js_shake.cmx core/js_runtime_modules.cmx core/js_program_loader.cmx \
612614
core/js_pass_tailcall_inline.cmx core/js_pass_scope.cmx \
613615
core/js_pass_flatten_and_mark_dead.cmx core/js_pass_flatten.cmx \
614616
core/js_pass_debug.cmx core/js_output.cmx core/js_fold_basic.cmx \

jscomp/bin/bsdep.ml

+1-63
Original file line numberDiff line numberDiff line change
@@ -26184,36 +26184,7 @@ val set_no_any_assert : unit -> unit
2618426184
val get_no_any_assert : unit -> bool
2618526185

2618626186

26187-
val block : string
26188-
val int32 : string
26189-
val gc : string
26190-
val backtrace : string
26191-
26192-
val builtin_exceptions : string
26193-
val exceptions : string
26194-
val io : string
26195-
val oo : string
26196-
val sys : string
26197-
val lexer : string
26198-
val parser : string
26199-
val obj_runtime : string
26200-
val array : string
26201-
val format : string
26202-
val string : string
26203-
val bytes : string
26204-
val float : string
26205-
val curry : string
26206-
val caml_oo_curry : string
26207-
(* val bigarray : string *)
26208-
(* val unix : string *)
26209-
val int64 : string
26210-
val md5 : string
26211-
val hash : string
26212-
val weak : string
26213-
val js_primitive : string
26214-
val module_ : string
26215-
val missing_polyfill : string
26216-
val exn : string
26187+
2621726188
(** Debugging utilies *)
2621826189
val set_current_file : string -> unit
2621926190
val get_current_file : unit -> string
@@ -26263,11 +26234,6 @@ end = struct
2626326234

2626426235

2626526236

26266-
26267-
26268-
(*let get_ext () = !ext*)
26269-
26270-
2627126237
let packages_info =
2627226238
ref (Empty : Js_packages_info.t )
2627326239

@@ -26333,34 +26299,6 @@ let no_warn_ffi_type = ref false
2633326299
let no_warn_unused_bs_attribute = ref false
2633426300
let no_error_unused_bs_attribute = ref false
2633526301

26336-
let builtin_exceptions = "Caml_builtin_exceptions"
26337-
let exceptions = "Caml_exceptions"
26338-
let io = "Caml_io"
26339-
let sys = "Caml_sys"
26340-
let lexer = "Caml_lexer"
26341-
let parser = "Caml_parser"
26342-
let obj_runtime = "Caml_obj"
26343-
let array = "Caml_array"
26344-
let format = "Caml_format"
26345-
let string = "Caml_string"
26346-
let bytes = "Caml_bytes"
26347-
let float = "Caml_float"
26348-
let hash = "Caml_hash"
26349-
let oo = "Caml_oo"
26350-
let curry = "Curry"
26351-
let caml_oo_curry = "Caml_oo_curry"
26352-
let int64 = "Caml_int64"
26353-
let md5 = "Caml_md5"
26354-
let weak = "Caml_weak"
26355-
let backtrace = "Caml_backtrace"
26356-
let gc = "Caml_gc"
26357-
let int32 = "Caml_int32"
26358-
let block = "Block"
26359-
let js_primitive = "Js_primitive"
26360-
let module_ = "Caml_module"
26361-
let missing_polyfill = "Caml_missing_polyfill"
26362-
let exn = "Js_exn"
26363-
2636426302
let current_file = ref ""
2636526303
let debug_file = ref ""
2636626304

jscomp/bin/bsppx.ml

+1-63
Original file line numberDiff line numberDiff line change
@@ -8132,36 +8132,7 @@ val set_no_any_assert : unit -> unit
81328132
val get_no_any_assert : unit -> bool
81338133

81348134

8135-
val block : string
8136-
val int32 : string
8137-
val gc : string
8138-
val backtrace : string
8139-
8140-
val builtin_exceptions : string
8141-
val exceptions : string
8142-
val io : string
8143-
val oo : string
8144-
val sys : string
8145-
val lexer : string
8146-
val parser : string
8147-
val obj_runtime : string
8148-
val array : string
8149-
val format : string
8150-
val string : string
8151-
val bytes : string
8152-
val float : string
8153-
val curry : string
8154-
val caml_oo_curry : string
8155-
(* val bigarray : string *)
8156-
(* val unix : string *)
8157-
val int64 : string
8158-
val md5 : string
8159-
val hash : string
8160-
val weak : string
8161-
val js_primitive : string
8162-
val module_ : string
8163-
val missing_polyfill : string
8164-
val exn : string
8135+
81658136
(** Debugging utilies *)
81668137
val set_current_file : string -> unit
81678138
val get_current_file : unit -> string
@@ -8211,11 +8182,6 @@ end = struct
82118182

82128183

82138184

8214-
8215-
8216-
(*let get_ext () = !ext*)
8217-
8218-
82198185
let packages_info =
82208186
ref (Empty : Js_packages_info.t )
82218187

@@ -8281,34 +8247,6 @@ let no_warn_ffi_type = ref false
82818247
let no_warn_unused_bs_attribute = ref false
82828248
let no_error_unused_bs_attribute = ref false
82838249

8284-
let builtin_exceptions = "Caml_builtin_exceptions"
8285-
let exceptions = "Caml_exceptions"
8286-
let io = "Caml_io"
8287-
let sys = "Caml_sys"
8288-
let lexer = "Caml_lexer"
8289-
let parser = "Caml_parser"
8290-
let obj_runtime = "Caml_obj"
8291-
let array = "Caml_array"
8292-
let format = "Caml_format"
8293-
let string = "Caml_string"
8294-
let bytes = "Caml_bytes"
8295-
let float = "Caml_float"
8296-
let hash = "Caml_hash"
8297-
let oo = "Caml_oo"
8298-
let curry = "Curry"
8299-
let caml_oo_curry = "Caml_oo_curry"
8300-
let int64 = "Caml_int64"
8301-
let md5 = "Caml_md5"
8302-
let weak = "Caml_weak"
8303-
let backtrace = "Caml_backtrace"
8304-
let gc = "Caml_gc"
8305-
let int32 = "Caml_int32"
8306-
let block = "Block"
8307-
let js_primitive = "Js_primitive"
8308-
let module_ = "Caml_module"
8309-
let missing_polyfill = "Caml_missing_polyfill"
8310-
let exn = "Js_exn"
8311-
83128250
let current_file = ref ""
83138251
let debug_file = ref ""
83148252

jscomp/bin/whole_compiler.d

+1
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ bin/whole_compiler.ml : common/js_packages_info.ml
339339
bin/whole_compiler.ml : core/js_implementation.mli
340340
bin/whole_compiler.ml : core/js_of_lam_variant.mli
341341
bin/whole_compiler.ml : core/js_program_loader.mli
342+
bin/whole_compiler.ml : core/js_runtime_modules.ml
342343
bin/whole_compiler.ml : core/lam_compile_const.mli
343344
bin/whole_compiler.ml : core/lam_compile_global.ml
344345
bin/whole_compiler.ml : core/lam_compile_group.mli

0 commit comments

Comments
 (0)