Merge pull request #6699 from cknitt/11-to-master

Merge changes from 11.0_release into master

Author: cknitt

CHANGELOG.md

@@ -27,6 +27,16 @@
 
 - Make the `--help` arg be prioritized in the CLI, so correctly prints help message and skip other commands. https://github.com/rescript-lang/rescript-compiler/pull/6667
 
+# 11.1.0-rc.6
+
+#### :rocket: New Feature
+
+- Add experimental BigInt support. https://github.com/rescript-lang/rescript-compiler/pull/6670, https://github.com/rescript-lang/rescript-compiler/pull/6696
+
+#### :bug: Bug Fix
+
+- Fix mishandling of uncurried functions in super errors. https://github.com/rescript-lang/rescript-compiler/pull/6694
+
 # 11.1.0-rc.5
 
 #### :bug: Bug Fix

jscomp/bsc/rescript_compiler_main.ml

@@ -106,6 +106,48 @@ let process_file sourcefile ?(kind ) ppf =
   in
   Config.uncurried := uncurried;
   res
+
+let reprint_source_file sourcefile = 
+  let uncurried = !Config.uncurried in
+  let kind = Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile) in
+  let sourcefile = set_abs_input_name sourcefile in
+  let res = match kind with 
+  | Res -> 
+    let parseResult =
+      Res_driver.parsingEngine.parseImplementation ~forPrinter:true ~filename:sourcefile
+    in
+    if parseResult.invalid then (
+      Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
+      exit 1
+    );
+    Res_compmisc.init_path ();
+    parseResult.parsetree 
+    |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name Ml
+    |> Ppx_entry.rewrite_implementation
+    |> Res_printer.printImplementation ~width:100 ~comments:parseResult.comments 
+    |> print_endline
+  | Resi ->   
+    let parseResult =
+      Res_driver.parsingEngine.parseInterface ~forPrinter:true ~filename:sourcefile
+    in
+    if parseResult.invalid then (
+      Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
+      exit 1
+    );
+    Res_compmisc.init_path ();
+    parseResult.parsetree 
+    |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name Mli
+    |> Ppx_entry.rewrite_signature
+    |> Res_printer.printInterface ~width:100 ~comments:parseResult.comments 
+    |> print_endline
+  | _ 
+    ->     
+    print_endline ("Invalid input for reprinting ReScript source. Must be a ReScript file: " ^ sourcefile);
+    exit 2
+  in
+  Config.uncurried := uncurried;
+  res
+
 let usage = "Usage: bsc <options> <files>\nOptions are:"
 
 let ppf = Format.err_formatter
@@ -390,6 +432,9 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "-dsource", set Clflags.dump_source, 
     "*internal* print source";
 
+    "-reprint-source", string_call reprint_source_file, 
+    "*internal* transform the target ReScript file using PPXes provided, and print the transformed ReScript code to stdout";
+
     "-format", string_call format_file,
     "*internal* Format as Res syntax";
 

jscomp/build_tests/super_errors/expected/UncurriedArgsNotApplied.res.expected

@@ -0,0 +1,15 @@
+
+  We've found a bug for you!
+  /.../fixtures/UncurriedArgsNotApplied.res:3:15-21
+
+  1 │ let apply = (fn: (. unit) => option<int>) => fn(. ())
+  2 │ 
+  3 │ let _ = apply(Some(1))
+  4 │ 
+
+  This value might need to be wrapped in a function that takes an extra
+  parameter of type unit
+  
+  Here's the original error message
+  This has type: option<'a>
+  But it's expected to have type: (. unit) => option<int>

jscomp/build_tests/super_errors/expected/bigint_match_literal.res.expected

@@ -0,0 +1,11 @@
+
+  Warning number 11
+  /.../fixtures/bigint_match_literal.res:3:3-4
+
+  1 │ let m1 = switch 1n {
+  2 │ | 0001n => 1
+  3 │ | 1n => 1
+  4 │ | -0001n => -1
+  5 │ | _ => 0
+
+  this match case is unused.

jscomp/build_tests/super_errors/expected/variant_coercion_bigint.res.expected

@@ -0,0 +1,10 @@
+
+  We've found a bug for you!
+  /.../fixtures/variant_coercion_bigint.res:5:10-20
+
+  3 │ let x = One(true)
+  4 │ 
+  5 │ let y = (x :> bigint)
+  6 │ 
+
+  Type x is not a subtype of bigint

jscomp/build_tests/super_errors/expected/variant_coercion_bigint_as.res.expected

@@ -0,0 +1,10 @@
+
+  We've found a bug for you!
+  /.../fixtures/variant_coercion_bigint_as.res:5:10-20
+
+  3 │ let x = One
+  4 │ 
+  5 │ let y = (x :> bigint)
+  6 │ 
+
+  Type x is not a subtype of bigint

jscomp/build_tests/super_errors/expected/warnings4.res.expected

@@ -10,4 +10,4 @@
   14 │ 
 
   You forgot to handle a possible case here, for example: 
-  | #second(_) | #fourth | #third
+  | #second(_) | #fourth | #third

jscomp/build_tests/super_errors/expected/warnings5.res.expected

@@ -187,4 +187,4 @@ Either bind these labels explicitly or add ', _' to the pattern.
   60 │ 
 
   You forgot to handle a possible case here, for example: 
-  | (_, true)
+  | (_, true)

jscomp/build_tests/super_errors/fixtures/UncurriedArgsNotApplied.res

@@ -0,0 +1,3 @@
+let apply = (fn: (. unit) => option<int>) => fn(. ())
+
+let _ = apply(Some(1))

jscomp/build_tests/super_errors/fixtures/bigint_match_literal.res

@@ -0,0 +1,6 @@
+let m1 = switch 1n {
+| 0001n => 1
+| 1n => 1
+| -0001n => -1
+| _ => 0
+}