remove Pexp_assert

aspeddro · aspeddro · commit 1ce54a0ed1ce · 2026-04-30T12:03:15.000-03:00
diff --git a/analysis/src/DumpAst.ml b/analysis/src/DumpAst.ml
@@ -234,8 +234,6 @@ and printExprItem expr ~pos ~indentation =
     ^ "\n" ^ addIndentation indentation ^ ")"
   | Pexp_extension (({txt} as loc), _) ->
     "Pexp_extension(%" ^ (loc |> printLocDenominatorLoc ~pos) ^ txt ^ ")"
-  | Pexp_assert expr ->
-    "Pexp_assert(" ^ printExprItem expr ~pos ~indentation ^ ")"
   | Pexp_field (exp, loc) ->
     "Pexp_field("
     ^ (loc |> printLocDenominatorLoc ~pos)
diff --git a/analysis/src/Utils.ml b/analysis/src/Utils.ml
@@ -109,7 +109,6 @@ let identifyPexp pexp =
   | Pexp_send _ -> "Pexp_send"
   | Pexp_letmodule _ -> "Pexp_letmodule"
   | Pexp_letexception _ -> "Pexp_letexception"
-  | Pexp_assert _ -> "Pexp_assert"
   | Pexp_newtype _ -> "Pexp_newtype"
   | Pexp_pack _ -> "Pexp_pack"
   | Pexp_extension _ -> "Pexp_extension"
diff --git a/compiler/frontend/bs_ast_mapper.ml b/compiler/frontend/bs_ast_mapper.ml
@@ -375,7 +375,6 @@ module E = struct
       letexception ~loc ~attrs
         (sub.extension_constructor sub cd)
         (sub.expr sub e)
-    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
     | Pexp_newtype (s, e) ->
       newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
     | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
diff --git a/compiler/ml/ast_helper.ml b/compiler/ml/ast_helper.ml
@@ -189,7 +189,6 @@ module Exp = struct
   let send ?loc ?attrs a b = mk ?loc ?attrs (Pexp_send (a, b))
   let letmodule ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_letmodule (a, b, c))
   let letexception ?loc ?attrs a b = mk ?loc ?attrs (Pexp_letexception (a, b))
-  let assert_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_assert a)
   let newtype ?loc ?attrs a b = mk ?loc ?attrs (Pexp_newtype (a, b))
   let pack ?loc ?attrs a = mk ?loc ?attrs (Pexp_pack a)
   let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_open (a, b, c))
diff --git a/compiler/ml/ast_helper.mli b/compiler/ml/ast_helper.mli
@@ -212,7 +212,6 @@ module Exp : sig
     extension_constructor ->
     expression ->
     expression
-  val assert_ : ?loc:loc -> ?attrs:attrs -> expression -> expression
   val newtype : ?loc:loc -> ?attrs:attrs -> str -> expression -> expression
   val pack : ?loc:loc -> ?attrs:attrs -> module_expr -> expression
   val open_ :
diff --git a/compiler/ml/ast_helper0.ml b/compiler/ml/ast_helper0.ml
@@ -175,7 +175,6 @@ module Exp = struct
   let override ?loc ?attrs a = mk ?loc ?attrs (Pexp_override a)
   let letmodule ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_letmodule (a, b, c))
   let letexception ?loc ?attrs a b = mk ?loc ?attrs (Pexp_letexception (a, b))
-  let assert_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_assert a)
   let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_lazy a)
   let poly ?loc ?attrs a b = mk ?loc ?attrs (Pexp_poly (a, b))
   let newtype ?loc ?attrs a b = mk ?loc ?attrs (Pexp_newtype (a, b))
diff --git a/compiler/ml/ast_iterator.ml b/compiler/ml/ast_iterator.ml
@@ -360,7 +360,6 @@ module E = struct
     | Pexp_letexception (cd, e) ->
       sub.extension_constructor sub cd;
       sub.expr sub e
-    | Pexp_assert e -> sub.expr sub e
     | Pexp_newtype (_s, e) -> sub.expr sub e
     | Pexp_pack me -> sub.module_expr sub me
     | Pexp_open (_ovf, lid, e) ->
diff --git a/compiler/ml/ast_mapper.ml b/compiler/ml/ast_mapper.ml
@@ -344,7 +344,6 @@ module E = struct
       letexception ~loc ~attrs
         (sub.extension_constructor sub cd)
         (sub.expr sub e)
-    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
     | Pexp_newtype (s, e) ->
       newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
     | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
diff --git a/compiler/ml/ast_mapper_from0.ml b/compiler/ml/ast_mapper_from0.ml
@@ -624,7 +624,6 @@ module E = struct
       letexception ~loc ~attrs
         (sub.extension_constructor sub cd)
         (sub.expr sub e)
-    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
     | Pexp_lazy _ -> failwith "Pexp_lazy is no longer present in ReScript"
     | Pexp_poly _ -> failwith "Pexp_poly is no longer present in ReScript"
     | Pexp_object () -> assert false
diff --git a/compiler/ml/ast_mapper_to0.ml b/compiler/ml/ast_mapper_to0.ml
@@ -504,7 +504,6 @@ module E = struct
       letexception ~loc ~attrs
         (sub.extension_constructor sub cd)
         (sub.expr sub e)
-    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
     | Pexp_newtype (s, e) ->
       newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
     | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
diff --git a/compiler/ml/depend.ml b/compiler/ml/depend.ml
@@ -283,7 +283,6 @@ let rec add_expr bv exp =
     let b = add_module_binding bv m in
     add_expr (StringMap.add id.txt b bv) e
   | Pexp_letexception (_, e) -> add_expr bv e
-  | Pexp_assert e -> add_expr bv e
   | Pexp_newtype (_, e) -> add_expr bv e
   | Pexp_pack m -> add_module bv m
   | Pexp_open (_ovf, m, e) ->
diff --git a/compiler/ml/parsetree.ml b/compiler/ml/parsetree.ml
@@ -303,10 +303,6 @@ and expression_desc =
     (* let module M = ME in E *)
   | Pexp_letexception of extension_constructor * expression
     (* let exception C in E *)
-  | Pexp_assert of expression
-    (* assert E
-       Note: "assert false" is treated in a special way by the
-       type-checker. *)
   | Pexp_newtype of string loc * expression (* fun (type t) -> E *)
   | Pexp_pack of module_expr
     (* (module ME)
diff --git a/compiler/ml/parsetree0.ml b/compiler/ml/parsetree0.ml
@@ -289,10 +289,6 @@ and expression_desc =
     (* let module M = ME in E *)
   | Pexp_letexception of extension_constructor * expression
     (* let exception C in E *)
-  | Pexp_assert of expression
-    (* assert E
-       Note: "assert false" is treated in a special way by the
-       type-checker. *)
   | Pexp_lazy of expression (* lazy E *)
   | Pexp_poly of expression * core_type option
     (* Used for method bodies.
diff --git a/compiler/ml/pprintast.ml b/compiler/ml/pprintast.ml
@@ -718,7 +718,6 @@ and expression ctxt f x =
       pp f "@[<hov2>let@ exception@ %a@ in@ %a@]"
         (extension_constructor ctxt)
         cd (expression ctxt) e
-    | Pexp_assert e -> pp f "@[<hov2>assert@ %a@]" (simple_expr ctxt) e
     | Pexp_open (ovf, lid, e) ->
       pp f "@[<2>let open%s %a in@;%a@]" (override ovf) longident_loc lid
         (expression ctxt) e
diff --git a/compiler/ml/printast.ml b/compiler/ml/printast.ml
@@ -347,9 +347,6 @@ and expression i ppf x =
     line i ppf "Pexp_letexception\n";
     extension_constructor i ppf cd;
     expression i ppf e
-  | Pexp_assert e ->
-    line i ppf "Pexp_assert\n";
-    expression i ppf e
   | Pexp_newtype (s, e) ->
     line i ppf "Pexp_newtype \"%s\"\n" s.txt;
     expression i ppf e
diff --git a/compiler/ml/typecore.ml b/compiler/ml/typecore.ml
@@ -186,7 +186,6 @@ let iter_expression f e =
       List.iter (fun {x = e} -> expr e) iel
     | Pexp_open (_, _, e)
     | Pexp_newtype (_, e)
-    | Pexp_assert e
     | Pexp_send (e, _)
     | Pexp_constraint (e, _)
     | Pexp_coerce (e, _, _)
@@ -3360,24 +3359,6 @@ and type_expect_ ?deprecated_context ~context ?in_function ?(recarg = Rejected)
         exp_attributes = sexp.pexp_attributes;
         exp_env = env;
       }
-  | Pexp_assert e ->
-    let cond =
-      type_expect ~context:(Some AssertCondition) env e Predef.type_bool
-    in
-    let exp_type =
-      match cond.exp_desc with
-      | Texp_construct (_, {cstr_name = "false"}, _) -> instance env ty_expected
-      | _ -> instance_def Predef.type_unit
-    in
-    rue
-      {
-        exp_desc = Texp_assert cond;
-        exp_loc = loc;
-        exp_extra = [];
-        exp_type;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env;
-      }
   | Pexp_newtype ({txt = name}, sbody) ->
     let ty = newvar () in
     (* remember original level *)
diff --git a/compiler/syntax/src/res_ast_debugger.ml b/compiler/syntax/src/res_ast_debugger.ml
@@ -703,7 +703,6 @@ module SexpAst = struct
             extension_constructor ext_constr;
             expression expr;
           ]
-      | Pexp_assert expr -> Sexp.list [Sexp.atom "Pexp_assert"; expression expr]
       | Pexp_newtype (lbl, expr) ->
         Sexp.list
           [Sexp.atom "Pexp_newtype"; string lbl.Asttypes.txt; expression expr]
diff --git a/compiler/syntax/src/res_comments_table.ml b/compiler/syntax/src/res_comments_table.ml
@@ -1191,13 +1191,6 @@ and walk_expression expr t comments =
       attach t.leading expr2.pexp_loc leading;
       walk_expression expr2 t inside;
       attach t.trailing expr2.pexp_loc trailing
-  | Pexp_assert expr ->
-    if is_block_expr expr then walk_expression expr t comments
-    else
-      let leading, inside, trailing = partition_by_loc comments expr.pexp_loc in
-      attach t.leading expr.pexp_loc leading;
-      walk_expression expr t inside;
-      attach t.trailing expr.pexp_loc trailing
   | Pexp_coerce (expr, (), typexpr) ->
     let leading, inside, trailing = partition_by_loc comments expr.pexp_loc in
     attach t.leading expr.pexp_loc leading;
diff --git a/compiler/syntax/src/res_parens.ml b/compiler/syntax/src/res_parens.ml
@@ -50,9 +50,9 @@ let call_expr expr =
       Nothing
     | {
      pexp_desc =
-       ( Pexp_assert _ | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _
-       | Pexp_setfield _ | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
-       | Pexp_for_of _ | Pexp_for_await_of _ | Pexp_ifthenelse _ );
+       ( Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _
+       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_for_of _
+       | Pexp_for_await_of _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
     | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
@@ -101,16 +101,16 @@ let unary_expr_operand expr =
       Nothing
     | {
      pexp_desc =
-       ( Pexp_assert _ | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _
-       | Pexp_setfield _ | Pexp_extension _ (* readability? maybe remove *)
-       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_for_of _
+       ( Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _
+       | Pexp_extension _ (* readability? maybe remove *) | Pexp_match _
+       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_for_of _
        | Pexp_for_await_of _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
     | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | _ -> Nothing)
 
-let binary_expr_operand ~is_lhs expr =
+let binary_expr_operand expr =
   let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
   match opt_braces with
   | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
@@ -129,7 +129,6 @@ let binary_expr_operand ~is_lhs expr =
     | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
     | expr when ParsetreeViewer.is_binary_expression expr -> Parenthesized
     | expr when ParsetreeViewer.is_ternary_expr expr -> Parenthesized
-    | {pexp_desc = Pexp_assert _} when is_lhs -> Parenthesized
     | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | {Parsetree.pexp_attributes = attrs} ->
       if ParsetreeViewer.has_printable_attributes attrs then Parenthesized
@@ -220,9 +219,9 @@ let assert_or_await_expr_rhs ?(in_await = false) expr =
       Nothing
     | {
      pexp_desc =
-       ( Pexp_assert _ | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _
-       | Pexp_setfield _ | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
-       | Pexp_for_of _ | Pexp_for_await_of _ | Pexp_ifthenelse _ );
+       ( Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _
+       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_for_of _
+       | Pexp_for_await_of _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
     | _ when (not in_await) && ParsetreeViewer.expr_is_await expr ->
@@ -265,9 +264,9 @@ let field_expr expr =
       Nothing
     | {
      pexp_desc =
-       ( Pexp_assert _ | Pexp_extension _ (* %extension.x vs (%extension).x *)
-       | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _
-       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_for_of _
+       ( Pexp_extension _ (* %extension.x vs (%extension).x *) | Pexp_fun _
+       | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _
+       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_for_of _
        | Pexp_for_await_of _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
diff --git a/compiler/syntax/src/res_parens.mli b/compiler/syntax/src/res_parens.mli
@@ -5,7 +5,7 @@ val structure_expr : Parsetree.expression -> kind
 
 val unary_expr_operand : Parsetree.expression -> kind
 
-val binary_expr_operand : is_lhs:bool -> Parsetree.expression -> kind
+val binary_expr_operand : Parsetree.expression -> kind
 val sub_binary_expr_operand : string -> string -> bool
 val rhs_binary_expr_operand : string -> Parsetree.expression -> bool
 val flatten_operand_rhs : string -> Parsetree.expression -> bool
diff --git a/compiler/syntax/src/res_printer.ml b/compiler/syntax/src/res_printer.ml
@@ -3753,9 +3753,6 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
       print_expression_block ~state ~braces:true e cmt_tbl
     | Pexp_letexception (_extensionConstructor, _expr) ->
       print_expression_block ~state ~braces:true e cmt_tbl
-    | Pexp_assert expr ->
-      let expr = print_expression_with_comments ~state expr cmt_tbl in
-      Doc.concat [Doc.text "assert("; expr; Doc.text ")"]
     | Pexp_open (_overrideFlag, _longidentLoc, _expr) ->
       print_expression_block ~state ~braces:true e cmt_tbl
     | Pexp_pack mod_expr ->
@@ -4259,7 +4256,7 @@ and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
           if is_lhs then add_parens doc else doc
         | _ -> (
           let doc = print_expression_with_comments ~state expr cmt_tbl in
-          match Parens.binary_expr_operand ~is_lhs expr with
+          match Parens.binary_expr_operand expr with
           | Parens.Parenthesized -> add_parens doc
           | Braced braces -> print_braces doc expr braces
           | Nothing -> doc)
