accept tests

Author: d-kalinichenko

testsuite/tests/parsetree/source_jane_street.ml

@@ -450,8 +450,8 @@ type record =
 [%%expect{|
 type record = {
   global_ field0 : int;
-  field1 : int @@ global portable contended;
-  field2 : int @@ global portable contended;
+  field1 : int @@ contended global portable;
+  field2 : int @@ contended global portable;
   normal_field : int;
 }
 |}]
@@ -473,16 +473,16 @@ type t =
 [%%expect{|
 type 'a parameterized_record = {
   global_ field0 : 'a;
-  field1 : 'a @@ global portable contended;
-  field2 : 'a @@ global portable contended;
+  field1 : 'a @@ contended global portable;
+  field2 : 'a @@ contended global portable;
   normal_field : 'a;
 }
 type t =
     Foo of global_ int * int
-  | Foo1 of int @@ global portable contended * int
-  | Foo2 of global_ int * int @@ global portable contended
-  | Foo3 of global_ int * int @@ portable contended
-  | Foo4 of (int * int) @@ global portable contended
+  | Foo1 of int @@ contended global portable * int
+  | Foo2 of global_ int * int @@ contended global portable
+  | Foo3 of global_ int * int @@ contended portable
+  | Foo4 of (int * int) @@ contended global portable
 |}]
 
 (* arrow types *)

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

@@ -990,7 +990,7 @@ type ('a : immediate) t : value mod global = { mutable x : 'a }
 Line 1, characters 0-63:
 1 | type ('a : immediate) t : value mod global = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          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.
@@ -1004,7 +1004,7 @@ type ('a : immediate) t : value mod aliased = { mutable x : 'a }
 Line 1, characters 0-64:
 1 | type ('a : immediate) t : value mod aliased = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of value mod aliased
          because of the annotation on the declaration of the type t.
@@ -1018,7 +1018,7 @@ type ('a : immediate) t : value mod contended = { mutable x : 'a }
 Line 1, characters 0-66:
 1 | type ('a : immediate) t : value mod contended = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of value mod contended
          because of the annotation on the declaration of the type t.
@@ -1032,7 +1032,7 @@ type ('a : immediate) t : value mod external_ = { mutable x : 'a }
 Line 1, characters 0-66:
 1 | type ('a : immediate) t : value mod external_ = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of value mod external_
          because of the annotation on the declaration of the type t.
@@ -1046,7 +1046,7 @@ type ('a : immediate) t : value mod external64 = { mutable x : 'a }
 Line 1, characters 0-67:
 1 | type ('a : immediate) t : value mod external64 = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of value mod external64
          because of the annotation on the declaration of the type t.
@@ -1157,7 +1157,7 @@ Error: The kind of type "t" is value
 type 'a t : value mod global portable contended many aliased unyielding =
   { x : 'a @@ global portable contended many aliased } [@@unboxed]
 [%%expect {|
-type 'a t = { x : 'a @@ global many aliased portable contended; } [@@unboxed]
+type 'a t = { x : 'a @@ aliased contended global many portable; } [@@unboxed]
 |}]
 (* CR layouts v2.8: this could be accepted, if we infer ('a : value mod
    unyielding). We do not currently do this, because we finish inference of the

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

@@ -189,7 +189,7 @@ Line 1, characters 13-20:
 1 | let foo (t : int ref t @ contended) = use_uncontended t
                  ^^^^^^^
 Error: This type "int ref" should be an instance of type "('a : immutable_data)"
-       The kind of int ref is mutable_data with int @@ many unyielding.
+       The kind of int ref is mutable_data with int @@ unyielding many.
        But the kind of int ref must be a subkind of immutable_data
          because of the definition of t at line 1, characters 0-46.
 
@@ -341,7 +341,7 @@ Line 1, characters 13-20:
 1 | let foo (t : int ref t @ contended) = use_uncontended t
                  ^^^^^^^
 Error: This type "int ref" should be an instance of type "('a : immutable_data)"
-       The kind of int ref is mutable_data with int @@ many unyielding.
+       The kind of int ref is mutable_data with int @@ unyielding many.
        But the kind of int ref must be a subkind of immutable_data
          because of the definition of t at line 1, characters 0-73.
 

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

@@ -176,7 +176,7 @@ type 'a t : mutable_data = 'a ref
 Line 1, characters 0-33:
 1 | type 'a t : mutable_data = 'a ref
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "'a ref" is mutable_data with 'a @@ many unyielding.
+Error: The kind of type "'a ref" is mutable_data with 'a @@ unyielding many.
        But the kind of type "'a ref" must be a subkind of mutable_data
          because of the definition of t at line 1, characters 0-33.
 
@@ -199,7 +199,7 @@ Line 1, characters 14-21:
                   ^^^^^^^
 Error: This type "int ref" should be an instance of type
          "('a : value mod portable)"
-       The kind of int ref is mutable_data with int @@ many unyielding.
+       The kind of int ref is mutable_data with int @@ unyielding many.
        But the kind of int ref must be a subkind of value mod portable
          because of the definition of require_portable at line 10, characters 0-47.
 
@@ -223,7 +223,7 @@ Line 1, characters 14-21:
                   ^^^^^^^
 Error: This type "int ref" should be an instance of type
          "('a : value mod contended)"
-       The kind of int ref is mutable_data with int @@ many unyielding.
+       The kind of int ref is mutable_data with int @@ unyielding many.
        But the kind of int ref must be a subkind of value mod contended
          because of the definition of require_contended at line 9, characters 0-49.
 

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

@@ -90,14 +90,14 @@ Lines 3-5, characters 6-3:
 5 | end
 Error: Signature mismatch:
        Modules do not match:
-         sig type 'a t = Foo of 'a @@ many contended end
+         sig type 'a t = Foo of 'a @@ contended many end
        is not included in
          sig type 'a t : immutable_data end
        Type declarations do not match:
-         type 'a t = Foo of 'a @@ many contended
+         type 'a t = Foo of 'a @@ contended many
        is not included in
          type 'a t : immutable_data
-       The kind of the first is immutable_data with 'a @@ many contended
+       The kind of the first is immutable_data with 'a @@ contended many
          because of the definition of t at line 4, characters 2-41.
        But the kind of the first must be a subkind of immutable_data
          because of the definition of t at line 2, characters 2-28.
@@ -179,7 +179,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 unyielding.
+       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 unyielding 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 unyielding
+         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 unyielding
+         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 unyielding 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 unyielding
+         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 unyielding
+       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

@@ -128,7 +128,7 @@ type 'a t : immutable_data = { mutable x : 'a }
 Line 1, characters 0-47:
 1 | type 'a t : immutable_data = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of immutable_data
          because of the annotation on the declaration of the type t.
@@ -270,7 +270,7 @@ type 'a t : immutable_data with 'a = { mutable x : 'a }
 Line 1, characters 0-55:
 1 | type 'a t : immutable_data with 'a = { mutable x : 'a }
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is mutable_data with 'a @@ many unyielding
+Error: The kind of type "t" is mutable_data with 'a @@ unyielding many
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of immutable_data with 'a
          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 unyielding 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 unyielding
+         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 unyielding
+         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 unyielding 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

@@ -141,7 +141,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 unyielding
+       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

@@ -59,7 +59,7 @@ 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 unyielding
+         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
@@ -80,7 +80,7 @@ Line 4, characters 0-38:
 4 | type 'a t : mutable_data = 'a F(Ref).t
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Error: The kind of type "'a F(Ref).t" is mutable_data
-         with 'a @@ many unyielding
+         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 mutable_data
          because of the definition of t at line 4, characters 0-38.

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

@@ -269,15 +269,15 @@ Error: Signature mismatch:
        Modules do not match:
          sig type 'a t : immutable_data with 'a end
        is not included in
-         sig type 'a t : immutable_data with 'a @@ portable contended end
+         sig type 'a t : immutable_data with 'a @@ contended portable end
        Type declarations do not match:
          type 'a t : immutable_data with 'a
        is not included in
-         type 'a t : immutable_data with 'a @@ portable contended
+         type 'a t : immutable_data with 'a @@ contended portable
        The kind of the first is immutable_data with 'a
          because of the definition of t at line 4, characters 2-69.
        But the kind of the first must be a subkind of immutable_data
-         with 'a @@ portable contended
+         with 'a @@ contended portable
          because of the definition of t at line 2, characters 2-58.
 
        The first mode-crosses less than the second along:
@@ -367,6 +367,21 @@ end = struct
   type 'a t : immutable_data with 'a @@ portable contended portable
 end
 [%%expect {|
+Line 4, characters 40-48:
+4 |   type 'a t : immutable_data with 'a @@ portable contended portable
+                                            ^^^^^^^^
+Warning 213: This portability is overriden by meet_with(portable) later.
+
+Line 4, characters 40-48:
+4 |   type 'a t : immutable_data with 'a @@ portable contended portable
+                                            ^^^^^^^^
+Warning 213: This portability is overriden by meet_with(portable) later.
+
+Line 4, characters 40-48:
+4 |   type 'a t : immutable_data with 'a @@ portable contended portable
+                                            ^^^^^^^^
+Warning 213: This portability is overriden by meet_with(portable) later.
+
 module M : sig type 'a t : immutable_data with 'a @@ portable end
 |}]