small improvement

Author: riaqn

typing/ctype.ml

@@ -1665,16 +1665,14 @@ let with_locality_and_yielding (locality, yielding) m =
   let m' = Alloc.newvar () in
   Locality.equate_exn (Alloc.proj (Comonadic Areality) m') locality;
   Yielding.equate_exn (Alloc.proj (Comonadic Yielding) m') yielding;
-  Alloc.submode_exn m'
-    (Alloc.join_with
-      (Comonadic Yielding)
-      Yielding.Const.max
-      (Alloc.join_with (Comonadic Areality) Locality.Const.max m));
-  Alloc.submode_exn
-    (Alloc.meet_with
-      (Comonadic Areality)
-      Locality.Const.min
-      (Alloc.meet_with (Comonadic Yielding) Yielding.Const.min m)) m';
+  Alloc.submode_exn m' (Alloc.join_const
+    { Alloc.Const.min with
+      areality = Locality.Const.max;
+      yielding = Yielding.Const.max} m);
+  Alloc.submode_exn (Alloc.meet_const
+    { Alloc.Const.max with
+      areality = Locality.Const.min;
+      yielding = Yielding.Const.min} m) m';
   m'
 
 let curry_mode alloc arg : Alloc.Const.t =

typing/mode.ml

@@ -2188,6 +2188,12 @@ module Value_with (Areality : Areality) = struct
     let monadic = Monadic.meet_const c.monadic monadic in
     { monadic; comonadic }
 
+  let join_const c { comonadic; monadic } =
+    let c = split c in
+    let comonadic = Comonadic.join_const c.comonadic comonadic in
+    let monadic = Monadic.join_const c.monadic monadic in
+    { monadic; comonadic }
+
   let imply c { comonadic; monadic } =
     let c = split c in
     let comonadic = Comonadic.imply c.comonadic comonadic in

typing/mode_intf.mli

@@ -432,6 +432,8 @@ module type S = sig
 
     val meet_const : Const.t -> ('l * 'r) t -> ('l * 'r) t
 
+    val join_const : Const.t -> ('l * 'r) t -> ('l * 'r) t
+
     val imply : Const.t -> ('l * 'r) t -> (disallowed * 'r) t
 
     (* The following two are about the scenario where we partially apply a