flambda-backend: Rename layouts.ml to jkind.ml (#1886)

Author: goldfirere

.depend

@@ -82,7 +82,7 @@ PARSING_CMI = \
 
 TYPING = \
   typing/path.cmo \
-  typing/layouts.cmo \
+  typing/jkind.cmo \
   typing/primitive.cmo \
   typing/shape.cmo \
   typing/mode.cmo \

boot/ocamlc

@@ -284,7 +284,6 @@ loadprinter.cmo : \
     ../utils/misc.cmi \
     ../parsing/longident.cmi \
     ../utils/load_path.cmi \
-    ../typing/layouts.cmi \
     ../typing/ident.cmi \
     ../typing/env.cmi \
     ../otherlibs/dynlink/dynlink.cmi \
@@ -301,7 +300,6 @@ loadprinter.cmx : \
     ../utils/misc.cmx \
     ../parsing/longident.cmx \
     ../utils/load_path.cmx \
-    ../typing/layouts.cmx \
     ../typing/ident.cmx \
     ../typing/env.cmx \
     ../otherlibs/dynlink/dynlink.cmx \

compilerlibs/Makefile.compilerlibs

@@ -17,8 +17,8 @@
 
 open Misc
 open Longident
-open Layouts
 open Types
+open Layouts
 
 (* Error report *)
 

debugger/.depend

@@ -68,7 +68,7 @@
    jane_syntax ; manual update: mli only files asttypes jane_asttypes parsetree
 
    ;; TYPING
-   ident path layouts primitive shape types btype oprint subst predef datarepr
+   ident path jkind primitive shape types btype oprint subst predef datarepr
    cmi_format persistent_env env errortrace mode
    typedtree printtyped ctype printtyp includeclass mtype envaux includecore
    tast_iterator tast_mapper signature_group cmt_format cms_format untypeast
@@ -264,7 +264,7 @@
     (parsetree.mli as compiler-libs/parsetree.mli)
     (ident.mli as compiler-libs/ident.mli)
     (path.mli as compiler-libs/path.mli)
-    (layouts.mli as compiler-libs/layouts.mli)
+    (jkind.mli as compiler-libs/jkind.mli)
     (primitive.mli as compiler-libs/primitive.mli)
     (types.mli as compiler-libs/types.mli)
     (btype.mli as compiler-libs/btype.mli)

debugger/loadprinter.ml

@@ -89,8 +89,8 @@
 
 open Misc
 open Asttypes
-open Layouts
 open Types
+open Layouts
 open Typedtree
 open Lambda
 open Parmatch

dune

@@ -22,7 +22,7 @@ open Debuginfo.Scoped_location
 (* Entry points to match compiler *)
 val for_function:
         scopes:scopes ->
-        arg_sort:Layouts.sort -> arg_layout:layout -> return_layout:layout ->
+        arg_sort:Jkind.sort -> arg_layout:layout -> return_layout:layout ->
         Location.t -> int ref option -> lambda -> (pattern * lambda) list ->
         partial ->
         lambda
@@ -31,12 +31,12 @@ val for_trywith:
         lambda -> (pattern * lambda) list ->
         lambda
 val for_let:
-        scopes:scopes -> arg_sort:Layouts.sort -> return_layout:layout ->
+        scopes:scopes -> arg_sort:Jkind.sort -> return_layout:layout ->
         Location.t -> lambda -> pattern -> lambda ->
         lambda
 val for_multiple_match:
         scopes:scopes -> return_layout:layout -> Location.t ->
-        (lambda * Layouts.sort * layout) list -> alloc_mode ->
+        (lambda * Jkind.sort * layout) list -> alloc_mode ->
         (pattern * lambda) list -> partial ->
         lambda
 

lambda/matching.ml

@@ -1,4 +1,4 @@
-open Layouts
+open Jkind
 open Lambda
 open Typedtree
 open Asttypes

lambda/matching.mli

@@ -22,7 +22,7 @@ open Debuginfo.Scoped_location
     so is parameterized by [Translcore.transl_exp], its [scopes] argument, and
     the [loc]ation. *)
 val comprehension
-  :  transl_exp:(scopes:scopes -> Layouts.sort -> expression -> lambda)
+  :  transl_exp:(scopes:scopes -> Jkind.sort -> expression -> lambda)
   -> scopes:scopes
   -> loc:scoped_location
   -> array_kind:array_kind

lambda/transl_array_comprehension.ml

@@ -1,4 +1,4 @@
-open Layouts
+open Jkind
 open Lambda
 open Typedtree
 open Asttypes
@@ -197,7 +197,7 @@ let iterator ~transl_exp ~scopes = function
       ; element
       ; element_kind =
           Typeopt.layout pattern.pat_env pattern.pat_loc
-            Layouts.Sort.for_list_element pattern.pat_type
+            Sort.for_list_element pattern.pat_type
       ; add_bindings =
           (* CR layouts: to change when we allow non-values in sequences *)
           Matching.for_let

lambda/transl_array_comprehension.mli

@@ -15,7 +15,7 @@ open Debuginfo.Scoped_location
     so is parameterized by [Translcore.transl_exp], its [scopes] argument, and
     the [loc]ation. *)
 val comprehension
-  :  transl_exp:(scopes:scopes -> Layouts.sort -> expression -> lambda)
+  :  transl_exp:(scopes:scopes -> Jkind.sort -> expression -> lambda)
   -> scopes:scopes
   -> loc:scoped_location
   -> comprehension

lambda/transl_list_comprehension.ml

@@ -14,8 +14,8 @@
 (**************************************************************************)
 
 open Asttypes
-open Layouts
 open Types
+open Layouts
 open Typedtree
 open Lambda
 open Translobj

lambda/transl_list_comprehension.mli

@@ -19,8 +19,8 @@
 open Misc
 open Asttypes
 open Primitive
-open Layouts
 open Types
+open Layouts
 open Typedtree
 open Typeopt
 open Lambda

lambda/translclass.ml

@@ -24,7 +24,7 @@ open Debuginfo.Scoped_location
 val pure_module : module_expr -> let_kind
 
 (* Used for translating Alloc_heap values in classes and modules. *)
-val transl_exp: scopes:scopes -> Layouts.sort -> expression -> lambda
+val transl_exp: scopes:scopes -> Jkind.sort -> expression -> lambda
 val transl_apply: scopes:scopes
                   -> ?tailcall:tailcall_attribute
                   -> ?inlined:inlined_attribute
@@ -42,13 +42,13 @@ val transl_extension_constructor: scopes:scopes ->
   Env.t -> Longident.t option ->
   extension_constructor -> lambda
 
-val transl_scoped_exp : scopes:scopes -> Layouts.sort -> expression -> lambda
+val transl_scoped_exp : scopes:scopes -> Jkind.sort -> expression -> lambda
 
 type error =
     Free_super_var
   | Unreachable_reached
   | Bad_probe_layout of Ident.t
-  | Illegal_record_field of Layouts.Sort.const
+  | Illegal_record_field of Jkind.Sort.const
   | Void_sort of Types.type_expr
 
 exception Error of Location.t * error

lambda/translcore.ml

@@ -18,8 +18,8 @@
 
 open Misc
 open Asttypes
-open Layouts
 open Types
+open Layouts
 open Typedtree
 open Lambda
 open Translobj

lambda/translcore.mli

@@ -53,7 +53,7 @@ type unsafe_info =
 type error =
   Circular_dependency of (Ident.t * unsafe_info) list
 | Conflicting_inline_attributes
-| Non_value_layout of Types.type_expr * Layouts.Layout.Violation.t
+| Non_value_layout of Types.type_expr * Jkind.Layout.Violation.t
 
 exception Error of Location.t * error
 

lambda/translmod.ml

@@ -159,8 +159,8 @@ let convert (prim : Lambda.primitive) : Clambda_primitives.primitive =
       ~effects:Only_generative_effects
       ~coeffects:Has_coeffects
       ~native_name:"caml_obj_dup"
-      ~native_repr_args:[P.Prim_global, P.Same_as_ocaml_repr Layouts.Sort.Value]
-      ~native_repr_res:(P.Prim_global, P.Same_as_ocaml_repr Layouts.Sort.Value))
+      ~native_repr_args:[P.Prim_global, P.Same_as_ocaml_repr Jkind.Sort.Value]
+      ~native_repr_res:(P.Prim_global, P.Same_as_ocaml_repr Jkind.Sort.Value))
   | Punbox_float -> Punbox_float
   | Pbox_float m -> Pbox_float m
   | Punbox_int bi -> Punbox_int bi

lambda/translmod.mli

@@ -665,7 +665,6 @@ odoc_sig.cmo : \
     odoc_class.cmo \
     ../parsing/longident.cmi \
     ../parsing/location.cmi \
-    ../typing/layouts.cmi \
     ../parsing/jane_syntax.cmi \
     ../typing/ident.cmi \
     ../typing/ctype.cmi \
@@ -691,7 +690,6 @@ odoc_sig.cmx : \
     odoc_class.cmx \
     ../parsing/longident.cmx \
     ../parsing/location.cmx \
-    ../typing/layouts.cmx \
     ../parsing/jane_syntax.cmx \
     ../typing/ident.cmx \
     ../typing/ctype.cmx \

middle_end/convert_primitives.ml

@@ -16,8 +16,8 @@
 (** Analysis of interface files. *)
 
 open Asttypes
-open Layouts
 open Types
+open Layouts
 open Odoc_parameter
 open Odoc_value
 open Odoc_type

ocamldoc/.depend

@@ -112,7 +112,7 @@ COMPILERLIBS_SOURCES=\
   typing/mode.ml \
   typing/path.ml \
   typing/shape.ml \
-  typing/layouts.ml \
+  typing/jkind.ml \
   typing/primitive.ml \
   typing/types.ml \
   typing/btype.ml \

ocamldoc/odoc_sig.ml

@@ -55,7 +55,7 @@
     ident
     path
     shape
-    layouts
+    jkind
     primitive
     mode
     types
@@ -143,7 +143,7 @@
 (copy_files ../../parsing/builtin_attributes.ml)
 (copy_files ../../typing/ident.ml)
 (copy_files ../../typing/path.ml)
-(copy_files ../../typing/layouts.ml)
+(copy_files ../../typing/jkind.ml)
 (copy_files ../../typing/primitive.ml)
 (copy_files ../../typing/shape.ml)
 (copy_files ../../typing/mode.ml)
@@ -203,7 +203,7 @@
 (copy_files ../../parsing/builtin_attributes.mli)
 (copy_files ../../typing/ident.mli)
 (copy_files ../../typing/path.mli)
-(copy_files ../../typing/layouts.mli)
+(copy_files ../../typing/jkind.mli)
 (copy_files ../../typing/primitive.mli)
 (copy_files ../../typing/shape.mli)
 (copy_files ../../typing/mode.mli)
@@ -301,7 +301,7 @@
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Builtin_attributes.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Load_path.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ast_mapper.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Layouts.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Jkind.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Mode.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Types.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Btype.cmo
@@ -376,7 +376,7 @@
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ast_iterator.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Builtin_attributes.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ast_mapper.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Layouts.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Jkind.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Mode.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Types.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Btype.cmx

otherlibs/dynlink/Makefile

@@ -221,7 +221,7 @@ stdlib.cmx: stdlib.ml
 
 
 # special cases to add the extension flag when compiling float_u
-# CR layouts: eventually these can be just [-extension layouts]
+# CR jkind: eventually these can be just [-extension layouts]
 stdlib__Float_u.cmi:
 	$(CAMLC) $(COMPFLAGS) -extension layouts_alpha \
 	         -o $@ -c $(filter %.mli, $^)

otherlibs/dynlink/dune

@@ -33,13 +33,11 @@ cvt_emit.cmx :
 debug_printers.cmo : \
     ../typing/printtyp.cmi \
     ../typing/path.cmi \
-    ../typing/layouts.cmi \
     ../typing/ident.cmi \
     ../typing/ctype.cmi
 debug_printers.cmx : \
     ../typing/printtyp.cmx \
     ../typing/path.cmx \
-    ../typing/layouts.cmx \
     ../typing/ident.cmx \
     ../typing/ctype.cmx
 dumpobj.cmo : \

stdlib/Makefile

@@ -19,8 +19,8 @@ open Misc
 open Format
 open Longident
 open Path
-open Layouts
 open Types
+open Layouts
 open Outcometree
 module Out_name = Printtyp.Out_name
 

tools/.depend

@@ -49,7 +49,7 @@ val record_backtrace : unit -> unit
 
 val find_eval_phrase :
   Typedtree.structure ->
-    (Typedtree.expression * Layouts.sort * Typedtree.attributes * Location.t) option
+    (Typedtree.expression * Jkind.sort * Typedtree.attributes * Location.t) option
 
 val max_printer_depth: int ref
 val max_printer_steps: int ref

toplevel/genprintval.ml

@@ -18,8 +18,8 @@
 open Format
 open Misc
 open Longident
-open Layouts
 open Types
+open Layouts
 open Toploop
 
 let error_fmt () =

toplevel/topcommon.mli

@@ -16,8 +16,8 @@
 (* Basic operations on core types *)
 
 open Asttypes
-open Layouts
 open Types
+open Layouts
 
 (**** Sets, maps and hashtables of types ****)
 

toplevel/topdirs.ml

@@ -17,8 +17,8 @@
 
 open Misc
 open Asttypes
-open Layouts
 open Types
+open Layouts
 open Btype
 open Errortrace
 

typing/btype.mli

@@ -16,8 +16,8 @@
 (* Operations on core types *)
 
 open Asttypes
-open Layouts
 open Types
+open Layouts
 
 exception Unify    of Errortrace.unification_error
 exception Equality of Errortrace.equality_error

typing/ctype.ml

@@ -17,8 +17,8 @@
    determining their representation. *)
 
 open Asttypes
-open Layouts
 open Types
+open Layouts
 open Btype
 
 (* Simplified version of Ctype.free_vars *)

typing/ctype.mli

@@ -15,8 +15,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open Layouts
 open Types
+open Layouts
 open Format
 
 type position = First | Second

typing/datarepr.ml

@@ -15,8 +15,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open Layouts
 open Types
+open Layouts
 
 type position = First | Second