strict_formats, strict_sequence enabled

Author: bobzhang

jscomp/common/bs_version.ml

@@ -22,7 +22,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "7.4.0-dev.1"
+let version = "8.0.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

jscomp/core/bs_conditional_initial.ml

@@ -44,7 +44,8 @@ let setup_env () =
   Clflags.debug := true;
   Clflags.record_event_when_debug := false;
   Clflags.binary_annotations := true;
-  (* Clflags.strict_sequence := true; *)
+  Clflags.strict_sequence := true;
+  Clflags.strict_formats := true;
   (* Turn on [-no-alias-deps] by default -- double check *)
   Oprint.out_ident := Outcome_printer_ns.out_ident;
   Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

jscomp/core/ocaml_options.ml

@@ -134,10 +134,6 @@ let mk_short_paths f =
   "-stdin", Arg.Unit f, " Read script from standard input"
 ;; *)
 
-let mk_strict_sequence f =
-  "-strict-sequence", Arg.Unit f,
-  " Left-hand part of a sequence must have type unit"
-;;
 
 let mk_unsafe f =
   "-unsafe", Arg.Unit f,
@@ -235,14 +231,6 @@ let mk_dlambda f =
   \     (reduces necessary recompilation on module change)"
 ;; *)
 
-let mk_strict_formats f =
-  "-strict-formats", Arg.Unit f,
-  " Reject invalid formats accepted by legacy implementations\n\
-  \     (Warning: Invalid formats may behave differently from\n\
-  \      previous OCaml versions, and will become always-rejected\n\
-  \      in future OCaml versions. You should use this flag\n\
-  \      to detect and fix invalid formats.)"
-;;
 
 (* let mk__ f =
   "-", Arg.String f,
@@ -309,8 +297,6 @@ let ocaml_options =
   let _rectypes = set Clflags.recursive_types in 
   (* let _safe_string = unset unsafe_string in  *)
   let _short_paths = unset Clflags.real_paths in 
-  let _strict_sequence = set Clflags.strict_sequence in 
-  let _strict_formats = set Clflags.strict_formats in 
   let _unsafe = set Clflags.fast in 
   (* let _unsafe_string = set unsafe_string in  *)
   (* let _v () = print_version_and_library "compiler" in  *)
@@ -359,8 +345,6 @@ let ocaml_options =
     mk_rectypes _rectypes;
     (* mk_safe_string _safe_string; *)
     mk_short_paths _short_paths;
-    mk_strict_sequence _strict_sequence;
-    mk_strict_formats _strict_formats;
     mk_unsafe _unsafe;
     mk_v _v;
     mk_verbose _verbose;

jscomp/test/caml_format_test.js

@@ -980,7 +980,7 @@ var formatter_suites_001 = /* :: */[
                                           ])
                                       ])
                                   ]),
-                                "@[%23d %2i %3u %4n %0xl %0xL %N %03x %X %o %s %S %c %C %3f %2F %2e %E %g %G %B %b %ld %li %lu %lx %lX %lo %nd %ni %nu %nx %nx %no  @]"
+                                "@[%23d %2i %3u %n %0xl %0xL %N %03x %X %o %s %S %c %C %3f %2F %2e %E %g %G %B %b %ld %li %lu %lx %lX %lo %nd %ni %nu %nx %nx %no  @]"
                               ]), [
                             1,
                             2,

jscomp/test/caml_format_test.ml

@@ -80,7 +80,7 @@ let formatter_suites = Mt.[
     "fmt_gen",
     (fun _ -> Eq(Format.asprintf ("%s %03d %L" ^^ "%S %03d %L %a" ) "32" 33 33 "a" 33 3 (Format.pp_print_list Format.pp_print_int) [1;2;3], "32 033 33\"a\" 033 3 12\n3"));
     "long_fmt", (fun _ -> Eq(Format.asprintf "%d %i %u %n %l %L %N %x %X %o %s %S %c %C %f %F %e %E %g %G %B %b %ld %li %lu %lx %lX %lo %nd %ni %nu %nx %nx %no  " 1 2 3 4 5 6 7 8 9 10 "a" "b" 'c' 'd' 1. 2. 3. 4. 5. 6. true false 0l 1l 2l 3l 4l 5l 6n 7n 8n 9n 10n 11n  , "1 2 3 4 5 6 7 8 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "));
-    "long_fmt_2", (fun _ -> Eq(Format.asprintf "@[%23d %2i %3u %4n %0xl %0xL %N %03x %X %o %s %S %c %C %3f %2F %2e %E %g %G %B %b %ld %li %lu %lx %lX %lo %nd %ni %nu %nx %nx %no  @]" 1 2 3 4 5 6 7 8 9 10 "a" "b" 'c' 'd' 1. 2. 3. 4. 5. 6. true false 0l 1l 2l 3l 4l 5l 6n 7n 8n 9n 10n 11n, "                      1  2   3 4 5l 6L 7 008 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "));
+    "long_fmt_2", (fun _ -> Eq(Format.asprintf "@[%23d %2i %3u %n %0xl %0xL %N %03x %X %o %s %S %c %C %3f %2F %2e %E %g %G %B %b %ld %li %lu %lx %lX %lo %nd %ni %nu %nx %nx %no  @]" 1 2 3 4 5 6 7 8 9 10 "a" "b" 'c' 'd' 1. 2. 3. 4. 5. 6. true false 0l 1l 2l 3l 4l 5l 6n 7n 8n 9n 10n 11n, "                      1  2   3 4 5l 6L 7 008 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "));
     "width_1", (fun _ -> Eq(Format.asprintf "%014d" 32, "00000000000032"));
     "width_2", (fun _ -> Eq(Format.asprintf "%10.3f" 32333.02, " 32333.020"));
     "alternate_1", (fun _ -> Eq(Format.asprintf "%0x" 32333, "7e4d"));

lib/4.06.1/unstable/js_compiler.ml

@@ -78157,7 +78157,8 @@ let setup_env () =
   Clflags.debug := true;
   Clflags.record_event_when_debug := false;
   Clflags.binary_annotations := true;
-  (* Clflags.strict_sequence := true; *)
+  Clflags.strict_sequence := true;
+  Clflags.strict_formats := true;
   (* Turn on [-no-alias-deps] by default -- double check *)
   Oprint.out_ident := Outcome_printer_ns.out_ident;
   Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -371483,7 +371483,8 @@ let setup_env () =
   Clflags.debug := true;
   Clflags.record_event_when_debug := false;
   Clflags.binary_annotations := true;
-  (* Clflags.strict_sequence := true; *)
+  Clflags.strict_sequence := true;
+  Clflags.strict_formats := true;
   (* Turn on [-no-alias-deps] by default -- double check *)
   Oprint.out_ident := Outcome_printer_ns.out_ident;
   Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

lib/4.06.1/whole_compiler.ml

@@ -347290,7 +347290,7 @@ and type_format loc str env =
              in formats parsed from strings. *)
           assert false
       in
-      let legacy_behavior = not !Clflags.strict_formats in
+      let legacy_behavior = not true in
       let Fmt_EBB fmt = fmt_ebb_of_string ~legacy_behavior str in
       mk_constr "Format" [ mk_fmt fmt; mk_string str ]
     ))
@@ -347726,7 +347726,7 @@ and type_statement env sexp =
   let ty = expand_head env exp.exp_type and tv = newvar() in
   if is_Tvar ty && ty.level > tv.level then
       Location.prerr_warning loc Warnings.Nonreturning_statement;
-  if !Clflags.strict_sequence then
+  if true then
     let expected_ty = instance_def Predef.type_unit in
     unify_exp env exp expected_ty;
     exp
@@ -361720,7 +361720,8 @@ let setup_env () =
   Clflags.debug := true;
   Clflags.record_event_when_debug := false;
   Clflags.binary_annotations := true;
-  (* Clflags.strict_sequence := true; *)
+  Clflags.strict_sequence := true;
+  Clflags.strict_formats := true;
   (* Turn on [-no-alias-deps] by default -- double check *)
   Oprint.out_ident := Outcome_printer_ns.out_ident;
   Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;
@@ -417945,10 +417946,6 @@ let mk_short_paths f =
   "-stdin", Arg.Unit f, " Read script from standard input"
 ;; *)
 
-let mk_strict_sequence f =
-  "-strict-sequence", Arg.Unit f,
-  " Left-hand part of a sequence must have type unit"
-;;
 
 let mk_unsafe f =
   "-unsafe", Arg.Unit f,
@@ -418046,14 +418043,6 @@ let mk_dlambda f =
   \     (reduces necessary recompilation on module change)"
 ;; *)
 
-let mk_strict_formats f =
-  "-strict-formats", Arg.Unit f,
-  " Reject invalid formats accepted by legacy implementations\n\
-  \     (Warning: Invalid formats may behave differently from\n\
-  \      previous OCaml versions, and will become always-rejected\n\
-  \      in future OCaml versions. You should use this flag\n\
-  \      to detect and fix invalid formats.)"
-;;
 
 (* let mk__ f =
   "-", Arg.String f,
@@ -418118,8 +418107,6 @@ let ocaml_options =
   let _rectypes = set Clflags.recursive_types in 
   (* let _safe_string = unset unsafe_string in  *)
   let _short_paths = unset Clflags.real_paths in 
-  let _strict_sequence = set Clflags.strict_sequence in 
-  let _strict_formats = set Clflags.strict_formats in 
   let _unsafe = set Clflags.fast in 
   (* let _unsafe_string = set unsafe_string in  *)
   (* let _v () = print_version_and_library "compiler" in  *)
@@ -418168,8 +418155,6 @@ let ocaml_options =
     mk_rectypes _rectypes;
     (* mk_safe_string _safe_string; *)
     mk_short_paths _short_paths;
-    mk_strict_sequence _strict_sequence;
-    mk_strict_formats _strict_formats;
     mk_unsafe _unsafe;
     mk_v _v;
     mk_verbose _verbose;

scripts/buckle_lto.js

@@ -10,17 +10,19 @@ var pairs = [
   ["no_std_include", "true"],
   ["Clflags.use_threads", "false"],
   ["Clflags.use_vmthreads", "false"],
-  ["Clflags.no_implicit_current_dir","true"]
+  ["Clflags.no_implicit_current_dir", "true"],
+  ["Clflags.strict_sequence", "true"],
+  ["Clflags.strict_formats", "true"],
 ];
 
-var regexp = RegExp(`${pairs.map(x => "!" + x[0]).join("|")}`, "g");
+var regexp = RegExp(`${pairs.map((x) => "!" + x[0]).join("|")}`, "g");
 
 /**
  *
  * @param {string} s
  */
 function transform(s) {
-  return s.replace(regexp, s => {
+  return s.replace(regexp, (s) => {
     for (let [k, v] of pairs) {
       if (s.includes(k)) {
         return v;