accept tests

Author: d-kalinichenko

testsuite/tests/lib-array/test_iarray.ml

@@ -32,6 +32,20 @@ let rec list_map_local_input (local_ f) (local_ list) =
 module Iarray = Stdlib_stable.Iarray
 external ( .:() ) : 'a iarray -> int -> 'a = "%array_safe_get"
 val iarray : int iarray = [:1; 2; 3; 4; 5:]
+val iarray_local : unit -> local_ int iarray @ unyielding = <fun>
+val ifarray : float iarray = [:1.5; 2.5; 3.5; 4.5; 5.5:]
+val ifarray_local : unit -> local_ float iarray @ unyielding = <fun>
+val marray : int array = [|1; 2; 3; 4; 5|]
+val mfarray : float array = [|1.5; 2.5; 3.5; 4.5; 5.5|]
+external globalize_float : local_ float -> float = "%obj_dup"
+external globalize_string : local_ string -> string = "%obj_dup"
+val globalize_int_iarray : local_ int iarray -> int iarray = <fun>
+val list_map_local_input :
+  local_ (local_ 'a -> 'b) -> local_ 'a list -> 'b list = <fun>
+|}, Principal{|
+module Iarray = Stdlib_stable.Iarray
+external ( .:() ) : 'a iarray -> int -> 'a = "%array_safe_get"
+val iarray : int iarray = [:1; 2; 3; 4; 5:]
 val iarray_local : unit -> local_ int iarray = <fun>
 val ifarray : float iarray = [:1.5; 2.5; 3.5; 4.5; 5.5:]
 val ifarray_local : unit -> local_ float iarray = <fun>

testsuite/tests/typing-jkind-bounds/basics.ml

@@ -1149,7 +1149,7 @@ Error: The kind of type "t" is value
          because it instantiates an unannotated type parameter of t,
          chosen to have kind value.
        But the kind of type "t" must be a subkind of
-         immutable_data mod global aliased
+         immutable_data mod global yielding aliased
          because of the annotation on the declaration of the type t.
 |}]
 (* CR layouts v2.8: this should be accepted *)
@@ -1164,7 +1164,7 @@ Error: The kind of type "t" is value
          because it instantiates an unannotated type parameter of t,
          chosen to have kind value.
        But the kind of type "t" must be a subkind of
-         immutable_data mod global aliased
+         immutable_data mod global yielding aliased
          because of the annotation on the declaration of the type t.
 |}]
 (* CR layouts v2.8: this should be accepted *)
@@ -1245,7 +1245,7 @@ type 'a t : value mod global = { x : 'a @@ global }
 Line 1, characters 0-51:
 1 | type 'a t : value mod global = { x : 'a @@ global }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is value
+Error: The kind of type "t" is value mod unyielding
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of value mod global
          because of the annotation on the declaration of the type t.
@@ -1424,7 +1424,7 @@ Line 1, characters 41-51:
                                              ^^^^^^^^^^
 Error: This expression has type "<  >" but an expression was expected of type
          "('a : value mod aliased)"
-       The kind of <  > is value mod global many unyielding
+       The kind of <  > is value mod global many
          because it's the type of an object.
        But the kind of <  > must be a subkind of value mod aliased
          because of the annotation on the wildcard _ at line 1, characters 19-36.
@@ -1437,7 +1437,7 @@ Line 1, characters 42-52:
                                               ^^^^^^^^^^
 Error: This expression has type "<  >" but an expression was expected of type
          "('a : value mod portable)"
-       The kind of <  > is value mod global many unyielding
+       The kind of <  > is value mod global many
          because it's the type of an object.
        But the kind of <  > must be a subkind of value mod portable
          because of the annotation on the wildcard _ at line 1, characters 19-37.
@@ -1450,7 +1450,7 @@ Line 1, characters 43-53:
                                                ^^^^^^^^^^
 Error: This expression has type "<  >" but an expression was expected of type
          "('a : value mod contended)"
-       The kind of <  > is value mod global many unyielding
+       The kind of <  > is value mod global many
          because it's the type of an object.
        But the kind of <  > must be a subkind of value mod contended
          because of the annotation on the wildcard _ at line 1, characters 19-38.
@@ -1463,7 +1463,7 @@ Line 1, characters 43-53:
                                                ^^^^^^^^^^
 Error: This expression has type "<  >" but an expression was expected of type
          "('a : value mod external_)"
-       The kind of <  > is value mod global many unyielding
+       The kind of <  > is value mod global many
          because it's the type of an object.
        But the kind of <  > must be a subkind of value mod external_
          because of the annotation on the wildcard _ at line 1, characters 19-38.

testsuite/tests/typing-jkind-bounds/printing.ml

@@ -164,7 +164,7 @@ Line 3, characters 11-12:
                ^
 Error: This type "a" = "int ref" should be an instance of type
          "('a : immutable_data)"
-       The kind of a is mutable_data with int @@ many.
+       The kind of a is mutable_data with int @@ unyielding many.
        But the kind of a must be a subkind of immutable_data
          because of the definition of t at line 2, characters 0-28.
 
@@ -178,7 +178,7 @@ Line 3, characters 11-12:
                ^
 Error: This type "a" = "int ref" should be an instance of type
          "('a : immutable_data)"
-       The kind of a is mutable_data with int @@ many.
+       The kind of a is mutable_data with int @@ unyielding many.
        But the kind of a must be a subkind of immutable_data
          because of the definition of t at line 2, characters 0-28.
 
@@ -343,15 +343,15 @@ Error: Signature mismatch:
        Modules do not match:
          sig type 'a t : mutable_data with 'a end
        is not included in
-         sig type 'a t : mutable_data with 'a @@ many end
+         sig type 'a t : mutable_data with 'a @@ unyielding many end
        Type declarations do not match:
          type 'a t : mutable_data with 'a
        is not included in
-         type 'a t : mutable_data with 'a @@ many
+         type 'a t : mutable_data with 'a @@ unyielding many
        The kind of the first is mutable_data with 'a
          because of the definition of t at line 4, characters 2-34.
        But the kind of the first must be a subkind of mutable_data
-         with 'a @@ many
+         with 'a @@ unyielding many
          because of the definition of t at line 2, characters 2-40.
 
        The first mode-crosses less than the second along:
@@ -423,14 +423,14 @@ Lines 3-5, characters 6-3:
 5 | end
 Error: Signature mismatch:
        Modules do not match:
-         sig type 'a t : mutable_data with 'a @@ many end
+         sig type 'a t : mutable_data with 'a @@ unyielding many end
        is not included in
          sig type 'a t : immutable_data with 'a end
        Type declarations do not match:
-         type 'a t : mutable_data with 'a @@ many
+         type 'a t : mutable_data with 'a @@ unyielding many
        is not included in
          type 'a t : immutable_data with 'a
-       The kind of the first is mutable_data with 'a @@ many
+       The kind of the first is mutable_data with 'a @@ unyielding many
          because of the definition of t at line 4, characters 2-40.
        But the kind of the first must be a subkind of immutable_data with 'a
          because of the definition of t at line 2, characters 2-56.

testsuite/tests/typing-jkind-bounds/records.ml

@@ -206,7 +206,7 @@ type ('a : value mod global) t : value mod global = { x : 'a }
 Line 1, characters 0-62:
 1 | type ('a : value mod global) t : value mod global = { x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is value
+Error: The kind of type "t" is value mod unyielding
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of value mod global
          because of the annotation on the declaration of the type t.

testsuite/tests/typing-jkind-bounds/subsumption/basics.ml

@@ -176,15 +176,15 @@ Error: Signature mismatch:
        Modules do not match:
          sig type 'a t : mutable_data with 'a end
        is not included in
-         sig type 'a t : mutable_data with 'a @@ many end
+         sig type 'a t : mutable_data with 'a @@ unyielding many end
        Type declarations do not match:
          type 'a t : mutable_data with 'a
        is not included in
-         type 'a t : mutable_data with 'a @@ many
+         type 'a t : mutable_data with 'a @@ unyielding many
        The kind of the first is mutable_data with 'a
          because of the definition of t at line 4, characters 2-34.
        But the kind of the first must be a subkind of mutable_data
-         with 'a @@ many
+         with 'a @@ unyielding many
          because of the definition of t at line 2, characters 2-40.
 
        The first mode-crosses less than the second along:
@@ -198,7 +198,7 @@ end = struct
   type 'a t : mutable_data with 'a @@ many unyielding
 end
 [%%expect {|
-module M : sig type 'a t : mutable_data with 'a @@ many end
+module M : sig type 'a t : mutable_data with 'a @@ unyielding many end
 |}]
 
 (* CR layouts v2.8: 'a u's kind should get normalized to just immutable_data *)

testsuite/tests/typing-jkind-bounds/subsumption/constraint.ml

@@ -145,7 +145,7 @@ Error: Signature mismatch:
          type 'a t = Foo of 'a constraint 'a = 'b ref
        is not included in
          type 'a t : immutable_data with 'b constraint 'a = 'b ref
-       The kind of the first is mutable_data with 'b @@ many
+       The kind of the first is mutable_data with 'b @@ unyielding many
          because of the definition of t at line 4, characters 2-46.
        But the kind of the first must be a subkind of immutable_data with 'b
          because of the definition of t at line 2, characters 2-59.

testsuite/tests/typing-jkind-bounds/subsumption/functors.ml

@@ -58,7 +58,8 @@ module Ref : sig type 'a t = 'a ref end
 Line 4, characters 0-48:
 4 | type 'a t : immutable_data with 'a = 'a F(Ref).t
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "'a F(Ref).t" is mutable_data with 'a @@ many
+Error: The kind of type "'a F(Ref).t" is mutable_data
+         with 'a @@ unyielding many
          because of the definition of t at line 2, characters 2-40.
        But the kind of type "'a F(Ref).t" must be a subkind of immutable_data
          with 'a

testsuite/tests/typing-jkind-bounds/subsumption/modalities.ml

@@ -124,8 +124,7 @@ end = struct
   type 'a t : immediate with 'a @@ aliased many contended global portable
 end
 [%%expect {|
-module M :
-  sig type 'a t : value mod global aliased many contended portable end
+module M : sig type 'a t : immutable_data mod global yielding aliased end
 |}]
 
 module M : sig

testsuite/tests/typing-jkind-bounds/variants.ml

@@ -210,7 +210,7 @@ type ('a : value mod global) t : value mod global = Foo of 'a
 Line 1, characters 0-61:
 1 | type ('a : value mod global) t : value mod global = Foo of 'a
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is value
+Error: The kind of type "t" is value mod unyielding
          because it's a boxed variant type.
        But the kind of type "t" must be a subkind of value mod global
          because of the annotation on the declaration of the type t.

testsuite/tests/typing-layouts/allow_any.ml

@@ -313,7 +313,7 @@ module B = struct
   let a t = t.a
 end
 [%%expect{|
-module A : sig type t : mutable_data mod global external_ end
+module A : sig type t : mutable_data mod global yielding external_ end
 module B :
   sig
     type t : value mod contended portable = { a : A.t; }

testsuite/tests/typing-local/exclave.ml

@@ -19,7 +19,7 @@ let foo () =
     let local_ y = Some 42 in
     y
 [%%expect{|
-val foo : unit -> local_ int option = <fun>
+val foo : unit -> local_ int option @ unyielding = <fun>
 |}]
 (* sidenote: in the above,
    y escapes the function even though local_
@@ -140,6 +140,9 @@ let foo (local_ x) =
 
 [%%expect{|
 type t = { x : int option; }
+val foo : local_ int option -> local_ int option @ unyielding = <fun>
+|}, Principal{|
+type t = { x : int option; }
 val foo : local_ int option -> local_ int option = <fun>
 |}]
 

testsuite/tests/typing-local/local.ml

@@ -378,7 +378,9 @@ val foo : ?x:local_ 'a -> unit -> local_ 'a option = <fun>
 
 let foo ?(local_ x = "hello") () = x;;
 [%%expect{|
-val foo : ?x:local_ string -> unit -> local_ string @ unyielding = <fun>
+val foo :
+  ?x:local_ string -> local_
+  (unit -> local_ string @ unyielding) @ unyielding = <fun>
 |}, Principal{|
 val foo : ?x:local_ string -> unit -> local_ string = <fun>
 |}]
@@ -966,15 +968,15 @@ let foo x = exclave_
   let r = local_ { contents = x } in
   r
 [%%expect{|
-val foo : 'a -> local_ 'a ref = <fun>
+val foo : 'a -> local_ 'a ref @ unyielding = <fun>
 |}]
 
 let foo p x = exclave_
   let r = local_ { contents = x } in
   if p then r
   else r
 [%%expect{|
-val foo : bool -> 'a -> local_ 'a ref = <fun>
+val foo : bool -> 'a -> local_ 'a ref @ unyielding = <fun>
 |}]
 
 (* Non-local regional values can be passed to tail calls *)
@@ -1768,7 +1770,7 @@ let testbool1 f = let local_ r = ref 42 in (f r || false) && true
 
 let testbool2 f = let local_ r = ref 42 in true && (false || f r)
 [%%expect{|
-val testbool1 : (local_ int ref -> bool) -> bool = <fun>
+val testbool1 : (local_ int ref @ unyielding -> bool) -> bool = <fun>
 Line 3, characters 63-64:
 3 | let testbool2 f = let local_ r = ref 42 in true && (false || f r)
                                                                    ^
@@ -1855,14 +1857,15 @@ let f g n =
   ()
 let z : (int list -> unit) -> int -> unit = f
 [%%expect{|
-val f : (local_ int list -> unit) -> int -> unit = <fun>
+val f : (local_ int list @ unyielding -> unit) -> int -> unit = <fun>
 Line 5, characters 44-45:
 5 | let z : (int list -> unit) -> int -> unit = f
                                                 ^
-Error: This expression has type "(local_ int list -> unit) -> int -> unit"
+Error: This expression has type
+         "(local_ int list @ unyielding -> unit) -> int -> unit"
        but an expression was expected of type
          "(int list -> unit) -> int -> unit"
-       Type "local_ int list -> unit" is not compatible with type
+       Type "local_ int list @ unyielding -> unit" is not compatible with type
          "int list -> unit"
 |}]
 
@@ -1877,10 +1880,11 @@ end
 Line 6, characters 46-47:
 6 |   let z : (int list -> unit) -> int -> unit = f
                                                   ^
-Error: This expression has type "(local_ int list -> unit) -> int -> unit"
+Error: This expression has type
+         "(local_ int list @ unyielding -> unit) -> int -> unit"
        but an expression was expected of type
          "(int list -> unit) -> int -> unit"
-       Type "local_ int list -> unit" is not compatible with type
+       Type "local_ int list @ unyielding -> unit" is not compatible with type
          "int list -> unit"
 |}]
 

testsuite/tests/typing-modes/modes.ml

@@ -392,13 +392,21 @@ type r = { mutable x : string; }
 
 (* patterns *)
 
-let foo ?(local_ x @ unique once = 42) () = ()
+let foo ?(x @ local unique once = 42) () = ()
 [%%expect{|
+val foo :
+  ?x:local_ int @ once unique -> local_ (unit -> unit) @ once unyielding =
+  <fun>
+|}, Principal{|
 val foo : ?x:local_ int @ once unique -> unit -> unit = <fun>
 |}]
 
 let foo ?(local_ x : _ @@ unique once = 42) () = ()
 [%%expect{|
+val foo :
+  ?x:local_ int @ once unique -> local_ (unit -> unit) @ once unyielding =
+  <fun>
+|}, Principal{|
 val foo : ?x:local_ int @ once unique -> unit -> unit = <fun>
 |}]
 

testsuite/tests/typing-modes/yielding.ml

@@ -155,8 +155,8 @@ type w2 : value mod global unyielding
 
 [%%expect{|
 type ('a : value mod global) u1
-type ('a : value mod global) u2
-type w1 : value mod global
+type ('a : value mod global yielding) u2
+type w1 : value mod global yielding
 type w2 : value mod global
 |}]
 
@@ -167,7 +167,7 @@ Line 1, characters 11-13:
 1 | type _z1 = w1 u1
                ^^
 Error: This type "w1" should be an instance of type "('a : value mod global)"
-       The kind of w1 is value mod global
+       The kind of w1 is value mod global yielding
          because of the definition of w1 at line 5, characters 0-35.
        But the kind of w1 must be a subkind of value mod global
          because of the definition of u1 at line 1, characters 0-31.

testsuite/tests/typing-unique/unique.ml

@@ -385,6 +385,8 @@ let rec bar =
   | Some () -> ()
   | None -> bar (local_ Some ()) [@nontail]
 [%%expect{|
+val bar : local_ unit option @ unique unyielding -> unit = <fun>
+|}, Principal{|
 val bar : local_ unit option @ unique -> unit = <fun>
 |}]