Skip to content

Commit 6b18b8a

Browse files
amiraliescristianoc
authored andcommitted
move pattern printer setup to preprocessor file
1 parent a9c5d29 commit 6b18b8a

File tree

8 files changed

+297875
-288043
lines changed

8 files changed

+297875
-288043
lines changed

jscomp/core/bs_conditional_initial.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ let setup_env () =
3636
Config.syntax_kind := `rescript;
3737
Parmatch.print_res_pat := Pattern_printer.print_pattern;
3838

39-
# 38 "core/bs_conditional_initial.pp.ml"
39+
# 39 "core/bs_conditional_initial.pp.ml"
4040
Clflags.color := Some Always;
4141

42-
# 40 "core/bs_conditional_initial.pp.ml"
42+
# 41 "core/bs_conditional_initial.pp.ml"
4343
(* default true
4444
otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
4545
*)
@@ -56,7 +56,7 @@ let setup_env () =
5656
Matching.names_from_construct_pattern :=
5757
Matching_polyfill.names_from_construct_pattern;
5858

59-
# 56 "core/bs_conditional_initial.pp.ml"
59+
# 57 "core/bs_conditional_initial.pp.ml"
6060
(let root_dir =
6161
Filename.dirname
6262
(Filename.dirname Sys.executable_name) in
@@ -66,7 +66,7 @@ let setup_env () =
6666
(root_dir//"jscomp"//"stdlib-406") ::
6767
!Clflags.include_dirs);
6868

69-
# 65 "core/bs_conditional_initial.pp.ml"
69+
# 66 "core/bs_conditional_initial.pp.ml"
7070
Rescript_cpp.replace_directive_bool "BS" true;
7171
Rescript_cpp.replace_directive_bool "JS" true;
7272
Rescript_cpp.replace_directive_string "BS_VERSION" Bs_version.version

jscomp/core/bs_conditional_initial.pp.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ let setup_env () =
3333
Ctype.variant_is_subtype := Matching_polyfill.variant_is_subtype;
3434
Clflags.dump_location := false;
3535
Config.syntax_kind := `rescript;
36+
Parmatch.print_res_pat := Pattern_printer.print_pattern;
3637
#ifdef BROWSER
3738
#else
3839
Clflags.color := Some Always;
@@ -69,4 +70,4 @@ let setup_env () =
6970

7071

7172
let () =
72-
at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())
73+
at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())

0 commit comments

Comments
 (0)