Support for mod syntax

chamelon/compat.jst.ml

@@ -2,7 +2,7 @@ open Typedtree
 open Types
 open Mode
 
-let dummy_jkind = Jkind.Primitive.value ~why:(Unknown "dummy_layout")
+let dummy_jkind = Jkind.Builtin.value ~why:(Unknown "dummy_layout")
 let dummy_value_mode = Value.disallow_right Value.legacy
 
 let dummy_alloc_mode =
@@ -102,7 +102,7 @@ let texp_function_cases_identifier_defaults =
     last_arg_exp_extra = None;
     last_arg_attributes = [];
     env = Env.empty;
-    ret_type = Ctype.newvar (Jkind.Primitive.any ~why:Dummy_jkind);
+    ret_type = Ctype.newvar (Jkind.Builtin.any ~why:Dummy_jkind);
   }
 
 let texp_function_param_identifier_defaults =

native_toplevel/opttopdirs.ml

@@ -138,7 +138,7 @@ let match_printer_type ppf desc typename =
         raise Exit
   in
   Ctype.with_local_level ~post:Ctype.generalize (fun () ->
-    let ty_arg = Ctype.newvar (Jkind.Primitive.value ~why:Debug_printer_argument) in
+    let ty_arg = Ctype.newvar (Jkind.Builtin.value ~why:Debug_printer_argument) in
     Ctype.unify !toplevel_env
       (Ctype.newconstr printer_type [ty_arg])
       (Ctype.instance desc.val_type);

ocaml/boot/menhir/parser.ml

@@ -41625,7 +41625,7 @@ module Tables = struct
 >>>>>>> origin/main
                  (
       let {txt; loc} = _1 in
-      Jane_syntax.Jkind.(Primitive_layout_or_abbreviation
+      Jane_syntax.Jkind.(Builtin_layout_or_abbreviation
         (Const.mk txt loc))
     )
 <<<<<<< HEAD

ocaml/debugger/loadprinter.ml

@@ -93,7 +93,7 @@ let eval_value_path env path =
 
 let match_printer_type desc make_printer_type =
   Ctype.with_local_level ~post:Ctype.generalize begin fun () ->
-    let ty_arg = Ctype.newvar (Jkind.Primitive.value ~why:Debug_printer_argument) in
+    let ty_arg = Ctype.newvar (Jkind.Builtin.value ~why:Debug_printer_argument) in
     Ctype.unify (Lazy.force Env.initial)
       (make_printer_type ty_arg)
       (Ctype.instance desc.val_type);

ocaml/debugger4/loadprinter.ml

@@ -93,7 +93,7 @@ let eval_value_path env path =
 
 let match_printer_type desc make_printer_type =
   Ctype.with_local_level ~post:Ctype.generalize begin fun () ->
-    let ty_arg = Ctype.newvar Jkind.Primitive.(value ~why:Debug_printer_argument) in
+    let ty_arg = Ctype.newvar Jkind.Builtin.(value ~why:Debug_printer_argument) in
     Ctype.unify (Lazy.force Env.initial)
       (make_printer_type ty_arg)
       (Ctype.instance desc.val_type);

ocaml/dune

@@ -108,7 +108,7 @@
    typedtree printtyped ctype printtyp includeclass mtype envaux includecore
    tast_iterator tast_mapper signature_group cmt_format cms_format untypeast
    includemod includemod_errorprinter
-   typemode typetexp patterns printpat parmatch stypes typedecl typeopt
+   typemode typemodifier typetexp patterns printpat parmatch stypes typedecl typeopt
    value_rec_check typecore solver_intf solver mode_intf mode uniqueness_analysis
    typeclass typemod typedecl_variance typedecl_properties
    typedecl_separability cmt2annot
@@ -334,6 +334,7 @@
     (untypeast.mli as compiler-libs/untypeast.mli)
     (includemod.mli as compiler-libs/includemod.mli)
     (typemode.mli as compiler-libs/typemode.mli)
+    (typemodifier.mli as compiler-libs/typemodifier.mli)
     (typetexp.mli as compiler-libs/typetexp.mli)
     (printpat.mli as compiler-libs/printpat.mli)
     (parmatch.mli as compiler-libs/parmatch.mli)

ocaml/lambda/translcore.ml

@@ -1086,7 +1086,7 @@ and transl_exp0 ~in_new_scope ~scopes sort e =
               (* CR layouts v3: here we allow [value_or_null] because this check
                  happens too late for the typecheker to infer [non_null]. Test that
                  nothing breaks once we have null pointers. *)
-                (Jkind.Primitive.value_or_null ~why:Probe)
+                (Jkind.Builtin.value_or_null ~why:Probe)
             with
             | Ok _ -> ()
             | Error _ -> raise (Error (e.exp_loc, Bad_probe_layout id))

ocaml/lambda/translmod.ml

@@ -300,7 +300,7 @@ let init_shape id modl =
             Tarrow(_,ty_arg,_,_) -> begin
               (* CR layouts: We should allow any representable layout here. It
                  will require reworking [camlinternalMod.init_mod]. *)
-              let jkind = Jkind.Primitive.value ~why:Recmod_fun_arg in
+              let jkind = Jkind.Builtin.value ~why:Recmod_fun_arg in
               let ty_arg = Ctype.correct_levels ty_arg in
               match Ctype.check_type_jkind env ty_arg jkind with
               | Ok _ -> const_int 0 (* camlinternalMod.Function *)

ocaml/ocamldoc/odoc_sig.ml

@@ -493,7 +493,7 @@ module Analyser =
           { Typedtree.ld_id; ld_mutable; ld_type; ld_loc; ld_attributes } =
         get_field env comments @@
         {Types.ld_id; ld_mutable; ld_modalities = Mode.Modality.Value.Const.id;
-         ld_jkind=Jkind.Primitive.any ~why:Dummy_jkind (* ignored *);
+         ld_jkind=Jkind.Builtin.any ~why:Dummy_jkind (* ignored *);
          ld_type=ld_type.Typedtree.ctyp_type;
          ld_loc; ld_attributes; ld_uid=Types.Uid.internal_not_actually_unique} in
       let open Typedtree in

ocaml/otherlibs/dynlink/dune

@@ -97,6 +97,7 @@
     zero_alloc
     types
     oprint
+    typemodifier
     jkind
     value_rec_types
     btype
@@ -195,6 +196,7 @@
 (copy_files ../../typing/jkind.ml)
 (copy_files ../../typing/jkind_intf.ml)
 (copy_files ../../typing/jkind_types.ml)
+(copy_files ../../typing/typemodifier.ml)
 (copy_files ../../typing/oprint.ml)
 (copy_files ../../typing/primitive.ml)
 (copy_files ../../typing/shape.ml)
@@ -266,6 +268,7 @@
 (copy_files ../../typing/jkind.mli)
 (copy_files ../../typing/jkind_intf.mli)
 (copy_files ../../typing/jkind_types.mli)
+(copy_files ../../typing/typemodifier.mli)
 (copy_files ../../typing/oprint.mli)
 (copy_files ../../typing/primitive.mli)
 (copy_files ../../typing/shape.mli)
@@ -390,6 +393,7 @@
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Attr_helper.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Primitive.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Oprint.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Typemodifier.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Jkind.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Btype.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Subst.cmo
@@ -475,6 +479,7 @@
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Attr_helper.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Primitive.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Oprint.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Typemodifier.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Jkind.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Btype.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Subst.cmx

ocaml/testsuite/tests/typing-immediate/immediate.ml

@@ -144,7 +144,7 @@ Line 2, characters 2-31:
 2 |   type t = string [@@immediate]
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Error: The kind of type string is immutable_data
-         because it is the primitive immutable_data type string.
+         because it is the primitive type string.
        But the kind of type string must be a subkind of immediate
          because of the definition of t at line 2, characters 2-31.
 |}];;
@@ -214,7 +214,7 @@ Error: Signature mismatch:
        is not included in
          type t : immediate
        The kind of the first is immutable_data
-         because it is the primitive immutable_data type string.
+         because it is the primitive type string.
        But the kind of the first must be a subkind of immediate
          because of the definition of t at line 1, characters 15-35.
 |}];;
@@ -232,7 +232,7 @@ Error: Signature mismatch:
        is not included in
          type t : immediate
        The kind of the first is immutable_data
-         because it is the primitive immutable_data type string.
+         because it is the primitive type string.
        But the kind of the first must be a subkind of immediate
          because of the definition of t at line 1, characters 20-40.
 |}];;
@@ -249,7 +249,7 @@ Error: Modules do not match: sig type t = string end is not included in
      is not included in
        type t : immediate
      The kind of the first is immutable_data
-       because it is the primitive immutable_data type string.
+       because it is the primitive type string.
      But the kind of the first must be a subkind of immediate
        because of the definition of t at line 1, characters 20-40.
 |}];;
@@ -264,7 +264,7 @@ Line 2, characters 2-26:
 2 |   type t = s [@@immediate]
       ^^^^^^^^^^^^^^^^^^^^^^^^
 Error: The kind of type s is immutable_data
-         because it is the primitive immutable_data type string.
+         because it is the primitive type string.
        But the kind of type s must be a subkind of immediate
          because of the definition of t at line 2, characters 2-26.
 |}];;

ocaml/testsuite/tests/typing-layouts-arrays/basics.ml

@@ -89,7 +89,7 @@ Line 1, characters 27-28:
 Error: This expression has type float# array
        but an expression was expected of type 'a array
        The layout of float# is float64
-         because it is the primitive float64 type float#.
+         because it is the primitive type float#.
        But the layout of float# must be a sublayout of value
          because of layout requirements from an imported definition.
 |}];;
@@ -102,7 +102,7 @@ Line 1, characters 40-41:
 Error: This expression has type float# array
        but an expression was expected of type 'a array
        The layout of float# is float64
-         because it is the primitive float64 type float#.
+         because it is the primitive type float#.
        But the layout of float# must be a sublayout of value
          because of layout requirements from an imported definition.
 |}];;
@@ -255,7 +255,7 @@ Line 11, characters 79-82:
 Error: This expression has type int64# but an expression was expected of type
          ('a : bits32)
        The layout of int64# is bits64
-         because it is the primitive bits64 type int64#.
+         because it is the primitive type int64#.
        But the layout of int64# must be a sublayout of bits32
          because of the definition of get_third at lines 4-7, characters 16-23.
 |}]
@@ -280,7 +280,7 @@ Line 9, characters 24-35:
 Error: This expression has type ('a : float64)
        but an expression was expected of type int32#
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of float64
          because of the definition of arr at line 6, characters 12-16.
 |}]

ocaml/testsuite/tests/typing-layouts-arrays/basics_alpha.ml

@@ -86,7 +86,7 @@ Line 1, characters 27-28:
 Error: This expression has type float# array
        but an expression was expected of type 'a array
        The layout of float# is float64
-         because it is the primitive float64 type float#.
+         because it is the primitive type float#.
        But the layout of float# must be a sublayout of value
          because of layout requirements from an imported definition.
 |}];;
@@ -99,7 +99,7 @@ Line 1, characters 40-41:
 Error: This expression has type float# array
        but an expression was expected of type 'a array
        The layout of float# is float64
-         because it is the primitive float64 type float#.
+         because it is the primitive type float#.
        But the layout of float# must be a sublayout of value
          because of layout requirements from an imported definition.
 |}];;
@@ -253,7 +253,7 @@ Line 11, characters 79-82:
 Error: This expression has type int64# but an expression was expected of type
          ('a : bits32)
        The layout of int64# is bits64
-         because it is the primitive bits64 type int64#.
+         because it is the primitive type int64#.
        But the layout of int64# must be a sublayout of bits32
          because of the definition of get_third at lines 4-7, characters 16-23.
 |}]
@@ -278,7 +278,7 @@ Line 9, characters 24-35:
 Error: This expression has type ('a : float64)
        but an expression was expected of type int32#
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of float64
          because of the definition of arr at line 6, characters 12-16.
 |}]

ocaml/testsuite/tests/typing-layouts-arrays/exp_and_pat_failing.ml

@@ -53,7 +53,7 @@ Line 25, characters 13-29:
 Error: This expression has type Float_u.t = float#
        but an expression was expected of type ('a : value)
        The layout of Float_u.t is float64
-         because it is the primitive float64 type float#.
+         because it is the primitive type float#.
        But the layout of Float_u.t must be a sublayout of value
          because it's the element type of array comprehension.
 |}];;

ocaml/testsuite/tests/typing-layouts-bits32/basics.ml

@@ -142,7 +142,7 @@ Line 1, characters 24-25:
 Error: This expression has type int32# but an expression was expected of type
          ('a : value)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of a tuple element.
 |}];;
@@ -166,7 +166,7 @@ Line 1, characters 18-24:
                       ^^^^^^
 Error: Tuple element types must have layout value.
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of a tuple element.
 |}];;
@@ -306,7 +306,7 @@ Line 1, characters 31-37:
                                    ^^^^^^
 Error: This type signature for x is not a value type.
        The layout of type int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of type int32# must be a sublayout of value
          because it's the type of something stored in a module structure.
 |}];;
@@ -348,7 +348,7 @@ Line 1, characters 27-28:
 Error: This expression has type int32# but an expression was expected of type
          ('a : value)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of the field of a polymorphic variant.
 |}];;
@@ -426,7 +426,7 @@ Line 1, characters 20-36:
 Error: This expression has type int32# but an expression was expected of type
          ('a : value)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because of the definition of id_value at line 5, characters 13-18.
 |}];;
@@ -631,7 +631,7 @@ Line 1, characters 26-43:
                               ^^^^^^^^^^^^^^^^^
 Error: The method x has type int32# but is expected to have type ('a : value)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of an object field.
 |}];;
@@ -643,7 +643,7 @@ Line 1, characters 26-40:
                               ^^^^^^^^^^^^^^
 Error: Variables bound in a class must have layout value.
        The layout of x is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of x must be a sublayout of value
          because it's the type of an instance variable.
 |}];;

ocaml/testsuite/tests/typing-layouts-bits32/basics_alpha.ml

@@ -140,7 +140,7 @@ Line 1, characters 24-25:
 Error: This expression has type int32# but an expression was expected of type
          ('a : value_or_null)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of a tuple element.
 |}];;
@@ -164,7 +164,7 @@ Line 1, characters 18-24:
                       ^^^^^^
 Error: Tuple element types must have layout value.
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of a tuple element.
 |}];;
@@ -295,7 +295,7 @@ Line 1, characters 31-37:
                                    ^^^^^^
 Error: This type signature for x is not a value type.
        The layout of type int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of type int32# must be a sublayout of value
          because it's the type of something stored in a module structure.
 |}];;
@@ -337,7 +337,7 @@ Line 1, characters 27-28:
 Error: This expression has type int32# but an expression was expected of type
          ('a : value_or_null)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of the field of a polymorphic variant.
 |}];;
@@ -415,7 +415,7 @@ Line 1, characters 20-36:
 Error: This expression has type int32# but an expression was expected of type
          ('a : value_or_null)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because of the definition of id_value at line 5, characters 13-18.
 |}];;
@@ -620,7 +620,7 @@ Line 1, characters 26-43:
                               ^^^^^^^^^^^^^^^^^
 Error: The method x has type int32# but is expected to have type ('a : value)
        The layout of int32# is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of int32# must be a sublayout of value
          because it's the type of an object field.
 |}];;
@@ -632,7 +632,7 @@ Line 1, characters 26-40:
                               ^^^^^^^^^^^^^^
 Error: Variables bound in a class must have layout value.
        The layout of x is bits32
-         because it is the primitive bits32 type int32#.
+         because it is the primitive type int32#.
        But the layout of x must be a sublayout of value
          because it's the type of an instance variable.
 |}];;