Merge branch 'master' into in-operator

DZakh · web-flow · commit 635ea1cc7abd · 2025-03-14T12:23:19.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Add popover attributes to JsxDOM.domProps. https://github.com/rescript-lang/rescript/pull/7317
 - Add `inert` attribute to `JsxDOM.domProps`. https://github.com/rescript-lang/rescript/pull/7326
 - Make reanalyze exception tracking work with the new stdlib. https://github.com/rescript-lang/rescript/pull/7328
+- Fix Pervasive.max using boolean comparison for floats. https://github.com/rescript-lang/rescript/pull/7333
 - Add built-in support for the JavaScript in operator. https://github.com/rescript-lang/rescript/pull/7342
 
 #### :boom: Breaking Change
@@ -33,10 +34,12 @@
 
 - Deprecate JSON.Classify.classify. https://github.com/rescript-lang/rescript/pull/7315
 - Hide stdlib modules in output. https://github.com/rescript-lang/rescript/pull/7305
+- Deprecate unsafe host-specific bindings from stdlib. https://github.com/rescript-lang/rescript/pull/7334
 
 #### :bug: Bug fix
 
 - Fix recursive untagged variant type checking by delaying well-formedness checks until environment construction completes. [#7320](https://github.com/rescript-lang/rescript/pull/7320)
+- Fix incorrect expansion of polymorphic return types in uncurried function applications. https://github.com/rescript-lang/rescript/pull/7338
 
 # 12.0.0-alpha.9
 
diff --git a/compiler/ml/translcore.ml b/compiler/ml/translcore.ml
@@ -164,7 +164,7 @@ let comparisons_table =
           objcomp = Pobjmax;
           intcomp = Pintmax;
           boolcomp = Pboolmax;
-          floatcomp = Pboolmax;
+          floatcomp = Pfloatmax;
           stringcomp = Pstringmax;
           bigintcomp = Pbigintmax;
           simplify_constant_constructor = false;
@@ -211,16 +211,6 @@ let comparisons_table =
         } );
       (* FIXME: Core compatibility *)
       ( "%bs_min",
-        {
-          objcomp = Pobjmax;
-          intcomp = Pintmax;
-          boolcomp = Pboolmax;
-          floatcomp = Pboolmax;
-          stringcomp = Pstringmax;
-          bigintcomp = Pbigintmax;
-          simplify_constant_constructor = false;
-        } );
-      ( "%bs_max",
         {
           objcomp = Pobjmin;
           intcomp = Pintmin;
@@ -230,6 +220,16 @@ let comparisons_table =
           bigintcomp = Pbigintmin;
           simplify_constant_constructor = false;
         } );
+      ( "%bs_max",
+        {
+          objcomp = Pobjmax;
+          intcomp = Pintmax;
+          boolcomp = Pboolmax;
+          floatcomp = Pfloatmax;
+          stringcomp = Pstringmax;
+          bigintcomp = Pbigintmax;
+          simplify_constant_constructor = false;
+        } );
     |]
 
 let primitives_table =
diff --git a/compiler/ml/typecore.ml b/compiler/ml/typecore.ml
@@ -3554,7 +3554,9 @@ and type_application ?type_clash_context total_app env funct (sargs : sargs) :
         let ty_fun = expand_head env ty_fun in
         let arity_ok = List.length args < max_arity in
         match ty_fun.desc with
-        | Tvar _ ->
+        | Tvar _ when force_tvar ->
+          (* This is a total application when the toplevel type is a polymorphic variable,
+          so the function type including arity can be inferred. *)
           let t1 = newvar () and t2 = newvar () in
           if ty_fun.level >= t1.level && not_identity funct.exp_desc then
             Location.prerr_warning sarg1.pexp_loc Warnings.Unused_argument;
diff --git a/lib/es6/Stdlib_List.js b/lib/es6/Stdlib_List.js
@@ -896,7 +896,7 @@ function reduceReverse2(l1, l2, acc, f) {
     let a = toArray(l1);
     let b = toArray(l2);
     let r = acc;
-    let len$1 = Primitive_int.max(a.length, b.length);
+    let len$1 = Primitive_int.min(a.length, b.length);
     for (let i = len$1 - 1 | 0; i >= 0; --i) {
       r = f(r, a[i], b[i]);
     }
diff --git a/lib/js/Stdlib_List.js b/lib/js/Stdlib_List.js
@@ -896,7 +896,7 @@ function reduceReverse2(l1, l2, acc, f) {
     let a = toArray(l1);
     let b = toArray(l2);
     let r = acc;
-    let len$1 = Primitive_int.max(a.length, b.length);
+    let len$1 = Primitive_int.min(a.length, b.length);
     for (let i = len$1 - 1 | 0; i >= 0; --i) {
       r = f(r, a[i], b[i]);
     }
diff --git a/runtime/Stdlib.res b/runtime/Stdlib.res
@@ -53,8 +53,8 @@ type null<+'a> = Primitive_js_extern.null<'a>
 type undefined<+'a> = Primitive_js_extern.undefined<'a>
 type nullable<+'a> = Primitive_js_extern.nullable<'a>
 
-@val external window: Dom.window = "window"
-@val external document: Dom.document = "document"
+@deprecated("Use rescript-webapi instead") @val external window: Dom.window = "window"
+@deprecated("Use rescript-webapi instead") @val external document: Dom.document = "document"
 @val external globalThis: {..} = "globalThis"
 
 /**
diff --git a/tests/build_tests/super_errors/expected/fun_return_poly1.res.expected b/tests/build_tests/super_errors/expected/fun_return_poly1.res.expected
@@ -0,0 +1,23 @@
+
+  [1;33mWarning number 20[0m
+  [36m/.../fixtures/fun_return_poly1.res[0m:[2m3:15[0m
+
+  1 [2m│[0m let f = (_, ~def=3) => assert(false)
+  2 [2m│[0m 
+  [1;33m3[0m [2m│[0m let ok = f(1)([1;33m2[0m)
+  4 [2m│[0m let err = f(1, 2)
+  5 [2m│[0m 
+
+  this argument will not be used by the function.
+
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/fun_return_poly1.res[0m:[2m4:16[0m
+
+  2 [2m│[0m 
+  3 [2m│[0m let ok = f(1)(2)
+  [1;31m4[0m [2m│[0m let err = f(1, [1;31m2[0m)
+  5 [2m│[0m 
+
+  The function applied to this argument has type ('a, ~def: int=?) => 'b
+This argument cannot be applied without label
diff --git a/tests/build_tests/super_errors/expected/fun_return_poly2.res.expected b/tests/build_tests/super_errors/expected/fun_return_poly2.res.expected
@@ -0,0 +1,24 @@
+
+  [1;33mWarning number 20[0m
+  [36m/.../fixtures/fun_return_poly2.res[0m:[2m6:30[0m
+
+  4 [2m│[0m }
+  5 [2m│[0m 
+  [1;33m6[0m [2m│[0m let ok = r("")(~initialValue=[1;33m2[0m)
+  7 [2m│[0m let err = r("", ~initialValue=2)
+  8 [2m│[0m 
+
+  this argument will not be used by the function.
+
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/fun_return_poly2.res[0m:[2m7:31[0m
+
+  5 [2m│[0m 
+  6 [2m│[0m let ok = r("")(~initialValue=2)
+  [1;31m7[0m [2m│[0m let err = r("", ~initialValue=[1;31m2[0m)
+  8 [2m│[0m 
+
+  The function applied to this argument has type
+    (string, ~wrongLabelName: int=?) => 'a
+This argument cannot be applied with label ~initialValue
diff --git a/tests/build_tests/super_errors/fixtures/fun_return_poly1.res b/tests/build_tests/super_errors/fixtures/fun_return_poly1.res
@@ -0,0 +1,4 @@
+let f = (_, ~def=3) => assert(false)
+
+let ok = f(1)(2)
+let err = f(1, 2)
diff --git a/tests/build_tests/super_errors/fixtures/fun_return_poly2.res b/tests/build_tests/super_errors/fixtures/fun_return_poly2.res
@@ -0,0 +1,7 @@
+let r: (string, ~wrongLabelName: int=?) => 'a = (_s, ~wrongLabelName=3) => {
+  let _ = wrongLabelName
+  assert(false)
+}
+
+let ok = r("")(~initialValue=2)
+let err = r("", ~initialValue=2)
diff --git a/tests/tests/src/mario_game.mjs b/tests/tests/src/mario_game.mjs
@@ -3,7 +3,6 @@
 import * as Belt_List from "rescript/lib/es6/Belt_List.js";
 import * as Pervasives from "rescript/lib/es6/Pervasives.js";
 import * as Primitive_int from "rescript/lib/es6/Primitive_int.js";
-import * as Primitive_bool from "rescript/lib/es6/Primitive_bool.js";
 import * as Primitive_float from "rescript/lib/es6/Primitive_float.js";
 import * as Primitive_object from "rescript/lib/es6/Primitive_object.js";
 import * as Primitive_option from "rescript/lib/es6/Primitive_option.js";
@@ -979,7 +978,7 @@ function update_player(player, keys, context) {
         if (!player.jumping && player.grounded) {
           player.jumping = true;
           player.grounded = false;
-          player.vel.y = Primitive_bool.max(player.vel.y - (5.7 + Math.abs(player.vel.x) * 0.25), -6);
+          player.vel.y = Primitive_float.max(player.vel.y - (5.7 + Math.abs(player.vel.x) * 0.25), -6);
           return;
         } else {
           return;
@@ -1531,7 +1530,7 @@ function make$3(param, param$1) {
 
 function calc_viewport_point(cc, vc, mc) {
   let vc_half = vc / 2;
-  return Primitive_float.min(Primitive_bool.max(cc - vc_half, 0), Primitive_float.min(mc - vc, Math.abs(cc - vc_half)));
+  return Primitive_float.min(Primitive_float.max(cc - vc_half, 0), Primitive_float.min(mc - vc, Math.abs(cc - vc_half)));
 }
 
 function in_viewport(v, pos) {

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ function reduceReverse2(l1, l2, acc, f) {`
`896`	`896`	`let a = toArray(l1);`
`897`	`897`	`let b = toArray(l2);`
`898`	`898`	`let r = acc;`
`899`		`- let len$1 = Primitive_int.max(a.length, b.length);`
	`899`	`+ let len$1 = Primitive_int.min(a.length, b.length);`
`900`	`900`	`for (let i = len$1 - 1 \| 0; i >= 0; --i) {`
`901`	`901`	`r = f(r, a[i], b[i]);`
`902`	`902`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,23 @@ @@
++
 +  [1;33mWarning number 20[0m
 +  [36m/.../fixtures/fun_return_poly1.res[0m:[2m3:15[0m
++
 +  1 [2m│[0m let f = (_, ~def=3) => assert(false)
 +  2 [2m│[0m
 +  [1;33m3[0m [2m│[0m let ok = f(1)([1;33m2[0m)
 +  4 [2m│[0m let err = f(1, 2)
 +  5 [2m│[0m
++
 +  this argument will not be used by the function.
++
++
 +  [1;31mWe've found a bug for you![0m
 +  [36m/.../fixtures/fun_return_poly1.res[0m:[2m4:16[0m
++
 +  2 [2m│[0m
 +  3 [2m│[0m let ok = f(1)(2)
 +  [1;31m4[0m [2m│[0m let err = f(1, [1;31m2[0m)
 +  5 [2m│[0m
++
 +  The function applied to this argument has type ('a, ~def: int=?) => 'b
 +This argument cannot be applied without label