Get typedtree building

janestreet · Nov 9, 2023 · 058dd1e · 058dd1e
1 parent 126213a
commit 058dd1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/ocaml/typing/typedtree.ml b/src/ocaml/typing/typedtree.ml
@@ -237,13 +237,7 @@ and 'k case =
     }
 
 and record_label_definition =
-<<<<<<< HEAD
-  | Kept of Types.type_expr * unique_use
-||||||| b01e78e20
-  | Kept of Types.type_expr
-=======
-  | Kept of Types.type_expr * mutable_flag
->>>>>>> ups/501
+  | Kept of Types.type_expr * mutable_flag * unique_use
   | Overridden of Longident.t loc * expression
 
 and binding_op =
@@ -1043,9 +1037,10 @@ let rec exp_is_nominal exp =
   | _ when exp.exp_attributes <> [] -> false
   | Texp_ident _ | Texp_instvar _ | Texp_constant _
   | Texp_variant (_, None)
-  | Texp_construct (_, _, []) ->
+  | Texp_construct (_, _, [], _) ->
       true
-  | Texp_field (parent, _, _) | Texp_send (parent, _) -> exp_is_nominal parent
+  | Texp_field (parent, _, _, _, _) | Texp_send (parent, _, _) ->
+      exp_is_nominal parent
   | _ -> false
 
 (* Merlin specific *)

diff --git a/src/ocaml/typing/typedtree.mli b/src/ocaml/typing/typedtree.mli
@@ -428,7 +428,7 @@ and 'k case =
     }
 
 and record_label_definition =
-  | Kept of Types.type_expr * unique_use * mutable_flag
+  | Kept of Types.type_expr * mutable_flag * unique_use
   | Overridden of Longident.t loc * expression
 
 and binding_op =