Lattices are bi-heyting

Author: riaqn

ocaml/typing/ctype.ml

@@ -1584,8 +1584,8 @@ let prim_mode mvar = function
 let with_locality locality m =
   let m' = Alloc.newvar () in
   Locality.equate_exn (Alloc.locality m') locality;
-  Alloc.submode_exn m' (Alloc.set_locality_max m);
-  Alloc.submode_exn (Alloc.set_locality_min m) m';
+  Alloc.submode_exn m' (Alloc.join_with_locality Locality.Const.max m);
+  Alloc.submode_exn (Alloc.meet_with_locality Locality.Const.min m) m';
   m'
 
 let rec instance_prim_locals locals mvar macc finalret ty =
@@ -5574,17 +5574,17 @@ let mode_cross_left env ty mode =
   let mode = Alloc.disallow_right mode in
   let mode =
     if Locality.Const.le upper_bounds.locality Locality.Const.min
-    then Alloc.set_locality_min mode
+    then Alloc.meet_with_locality Locality.Const.min mode
     else mode
   in
   let mode =
     if Linearity.Const.le upper_bounds.linearity Linearity.Const.min
-    then Alloc.set_linearity_min mode
+    then Alloc.meet_with_linearity Linearity.Const.min mode
     else mode
   in
   let mode =
     if Uniqueness.Const.le upper_bounds.uniqueness Uniqueness.Const.min
-    then Alloc.set_uniqueness_min mode
+    then Alloc.meet_with_uniqueness Uniqueness.Const.min mode
     else mode
   in
   mode
@@ -5600,17 +5600,17 @@ let mode_cross_right env ty mode =
   let mode = Alloc.disallow_left mode in
   let mode =
     if Locality.Const.le upper_bounds.locality Locality.Const.min
-    then Alloc.set_locality_max mode
+    then Alloc.join_with_locality Locality.Const.max mode
     else mode
   in
   let mode =
     if Linearity.Const.le upper_bounds.linearity Linearity.Const.min
-    then Alloc.set_linearity_max mode
+    then Alloc.join_with_linearity Linearity.Const.max mode
     else mode
   in
   let mode =
     if Uniqueness.Const.le upper_bounds.uniqueness Uniqueness.Const.min
-    then Alloc.set_uniqueness_max mode
+    then Alloc.join_with_uniqueness Uniqueness.Const.max mode
     else mode
   in
   mode