Skip to content

Commit c8c0baf

Browse files
bobzhangbobzhang
committed
snapshot
1 parent 2ed9241 commit c8c0baf

File tree

6 files changed

+72
-36
lines changed

6 files changed

+72
-36
lines changed

‎lib/4.06.1/unstable/bspack.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3467,7 +3467,7 @@ val mk_lazy: (unit -> 'a) -> 'a Lazy.t
34673467
the warning settings at the time [mk_lazy] is called. *)
34683468

34693469

3470-
val disabled : bool ref
3470+
val nerrors : int ref
34713471
val message : t -> string
34723472
val number: t -> int
34733473
val super_report :

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3734,7 +3734,7 @@ val mk_lazy: (unit -> 'a) -> 'a Lazy.t
37343734
the warning settings at the time [mk_lazy] is called. *)
37353735

37363736

3737-
val disabled : bool ref
3737+
val nerrors : int ref
37383738
val message : t -> string
37393739
val number: t -> int
37403740
val super_report :
@@ -399998,7 +399998,6 @@ let compile
399998399998
Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
399999399999
)
400000400000
in
400001-
Warnings.check_fatal ();
400002400001
let effect =
400003400002
Lam_stats_export.get_dependent_module_effect
400004400003
maybe_pure external_module_ids in
@@ -400030,23 +400029,36 @@ let lambda_as_module
400030400029
(if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
400031400030
in
400032400031
let package_info = Js_packages_state.get_packages_info () in
400033-
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then
400034-
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
400035-
else
400032+
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin
400033+
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout;
400034+
if !Warnings.nerrors > 0 then begin
400035+
Warnings.nerrors := 0;
400036+
exit 77
400037+
end
400038+
end else
400036400039
Js_packages_info.iter package_info (fun {module_system; path = _path} ->
400037400040
let output_chan chan =
400038400041
Js_dump_program.dump_deps_program ~output_prefix
400039400042
module_system
400040400043
lambda_output
400041400044
chan in
400045+
let target_file =
400046+
(Lazy.force Ext_path.package_dir //
400047+
_path //
400048+
basename
400049+
(* #913 only generate little-case js file *)
400050+
) in
400051+
if !Warnings.nerrors > 0 then begin
400052+
Warnings.nerrors := 0 ;
400053+
if Sys.file_exists target_file then Sys.remove target_file;
400054+
exit 77
400055+
(* don't write js file, we need remove js files
400056+
otherwise the js files are out-of-date
400057+
exit 177 *)
400058+
end else
400042400059
if not @@ !Clflags.dont_write_files then
400043400060
Ext_pervasives.with_file_as_chan
400044-
400045-
(Lazy.force Ext_path.package_dir //
400046-
_path //
400047-
basename
400048-
(* #913 only generate little-case js file *)
400049-
) output_chan )
400061+
target_file output_chan )
400050400062

400051400063

400052400064

‎lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3734,7 +3734,7 @@ val mk_lazy: (unit -> 'a) -> 'a Lazy.t
37343734
the warning settings at the time [mk_lazy] is called. *)
37353735

37363736

3737-
val disabled : bool ref
3737+
val nerrors : int ref
37383738
val message : t -> string
37393739
val number: t -> int
37403740
val super_report :
@@ -399998,7 +399998,6 @@ let compile
399998399998
Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
399999399999
)
400000400000
in
400001-
Warnings.check_fatal ();
400002400001
let effect =
400003400002
Lam_stats_export.get_dependent_module_effect
400004400003
maybe_pure external_module_ids in
@@ -400030,23 +400029,36 @@ let lambda_as_module
400030400029
(if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
400031400030
in
400032400031
let package_info = Js_packages_state.get_packages_info () in
400033-
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then
400034-
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
400035-
else
400032+
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin
400033+
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout;
400034+
if !Warnings.nerrors > 0 then begin
400035+
Warnings.nerrors := 0;
400036+
exit 77
400037+
end
400038+
end else
400036400039
Js_packages_info.iter package_info (fun {module_system; path = _path} ->
400037400040
let output_chan chan =
400038400041
Js_dump_program.dump_deps_program ~output_prefix
400039400042
module_system
400040400043
lambda_output
400041400044
chan in
400045+
let target_file =
400046+
(Lazy.force Ext_path.package_dir //
400047+
_path //
400048+
basename
400049+
(* #913 only generate little-case js file *)
400050+
) in
400051+
if !Warnings.nerrors > 0 then begin
400052+
Warnings.nerrors := 0 ;
400053+
if Sys.file_exists target_file then Sys.remove target_file;
400054+
exit 77
400055+
(* don't write js file, we need remove js files
400056+
otherwise the js files are out-of-date
400057+
exit 177 *)
400058+
end else
400042400059
if not @@ !Clflags.dont_write_files then
400043400060
Ext_pervasives.with_file_as_chan
400044-
400045-
(Lazy.force Ext_path.package_dir //
400046-
_path //
400047-
basename
400048-
(* #913 only generate little-case js file *)
400049-
) output_chan )
400061+
target_file output_chan )
400050400062

400051400063

400052400064

‎lib/4.06.1/unstable/native_ppx.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3467,7 +3467,7 @@ val mk_lazy: (unit -> 'a) -> 'a Lazy.t
34673467
the warning settings at the time [mk_lazy] is called. *)
34683468

34693469

3470-
val disabled : bool ref
3470+
val nerrors : int ref
34713471
val message : t -> string
34723472
val number: t -> int
34733473
val super_report :

‎lib/4.06.1/whole_compiler.ml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3405,7 +3405,7 @@ val mk_lazy: (unit -> 'a) -> 'a Lazy.t
34053405
the warning settings at the time [mk_lazy] is called. *)
34063406

34073407

3408-
val disabled : bool ref
3408+
val nerrors : int ref
34093409
val message : t -> string
34103410
val number: t -> int
34113411
val super_report :
@@ -402854,7 +402854,6 @@ let compile
402854402854
Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
402855402855
)
402856402856
in
402857-
Warnings.check_fatal ();
402858402857
let effect =
402859402858
Lam_stats_export.get_dependent_module_effect
402860402859
maybe_pure external_module_ids in
@@ -402886,23 +402885,36 @@ let lambda_as_module
402886402885
(if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
402887402886
in
402888402887
let package_info = Js_packages_state.get_packages_info () in
402889-
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then
402890-
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
402891-
else
402888+
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin
402889+
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout;
402890+
if !Warnings.nerrors > 0 then begin
402891+
Warnings.nerrors := 0;
402892+
exit 77
402893+
end
402894+
end else
402892402895
Js_packages_info.iter package_info (fun {module_system; path = _path} ->
402893402896
let output_chan chan =
402894402897
Js_dump_program.dump_deps_program ~output_prefix
402895402898
module_system
402896402899
lambda_output
402897402900
chan in
402901+
let target_file =
402902+
(Lazy.force Ext_path.package_dir //
402903+
_path //
402904+
basename
402905+
(* #913 only generate little-case js file *)
402906+
) in
402907+
if !Warnings.nerrors > 0 then begin
402908+
Warnings.nerrors := 0 ;
402909+
if Sys.file_exists target_file then Sys.remove target_file;
402910+
exit 77
402911+
(* don't write js file, we need remove js files
402912+
otherwise the js files are out-of-date
402913+
exit 177 *)
402914+
end else
402898402915
if not @@ !Clflags.dont_write_files then
402899402916
Ext_pervasives.with_file_as_chan
402900-
402901-
(Lazy.force Ext_path.package_dir //
402902-
_path //
402903-
basename
402904-
(* #913 only generate little-case js file *)
402905-
) output_chan )
402917+
target_file output_chan )
402906402918

402907402919

402908402920

‎ocaml

0 commit comments

Comments
 (0)