AST cleanup: remove Pexp_object and Texp_object.

cristianoc · cristianoc · commit feb795a11ed0 · 2024-12-04T12:40:26.000+01:00
diff --git a/analysis/reanalyze/src/Arnold.ml b/analysis/reanalyze/src/Arnold.ml
@@ -995,9 +995,6 @@ module Compile = struct
     | Texp_lazy _ ->
       notImplemented "Texp_lazy";
       assert false
-    | Texp_object _ ->
-      notImplemented "Texp_letmodule";
-      assert false
     | Texp_pack _ ->
       notImplemented "Texp_pack";
       assert false
diff --git a/analysis/reanalyze/src/SideEffects.ml b/analysis/reanalyze/src/SideEffects.ml
@@ -66,7 +66,6 @@ let rec exprNoSideEffects (expr : Typedtree.expression) =
   | Texp_setinstvar _ -> false
   | Texp_override _ -> false
   | Texp_letexception (_ec, e) -> e |> exprNoSideEffects
-  | Texp_object _ -> true
   | Texp_pack _ -> false
   | Texp_unreachable -> false
   | Texp_extension_constructor _ when true -> true
diff --git a/analysis/src/Utils.ml b/analysis/src/Utils.ml
@@ -112,7 +112,6 @@ let identifyPexp pexp =
   | Pexp_assert _ -> "Pexp_assert"
   | Pexp_lazy _ -> "Pexp_lazy"
   | Pexp_poly _ -> "Pexp_poly"
-  | Pexp_object _ -> "Pexp_object"
   | Pexp_newtype _ -> "Pexp_newtype"
   | Pexp_pack _ -> "Pexp_pack"
   | Pexp_extension _ -> "Pexp_extension"
diff --git a/compiler/frontend/bs_ast_invariant.ml b/compiler/frontend/bs_ast_invariant.ml
@@ -94,7 +94,7 @@ let emit_external_warnings : iterator =
       (fun self ({pexp_loc = loc} as a) ->
         match a.pexp_desc with
         | Pexp_constant const -> check_constant loc const
-        | Pexp_object _ | Pexp_new _ ->
+        | Pexp_new _ ->
           Location.raise_errorf ~loc "OCaml style objects are not supported"
         | Pexp_variant (s, None) when Ext_string.is_valid_hash_number s -> (
           try ignore (Ext_string.hash_number_as_i32_exn s : int32)
diff --git a/compiler/frontend/bs_ast_mapper.ml b/compiler/frontend/bs_ast_mapper.ml
@@ -370,7 +370,6 @@ module E = struct
     | Pexp_lazy e -> lazy_ ~loc ~attrs (sub.expr sub e)
     | Pexp_poly (e, t) ->
       poly ~loc ~attrs (sub.expr sub e) (map_opt (sub.typ sub) t)
-    | Pexp_object () -> assert false
     | 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_iterator.ml b/compiler/ml/ast_iterator.ml
@@ -352,7 +352,6 @@ module E = struct
     | Pexp_poly (e, t) ->
       sub.expr sub e;
       iter_opt (sub.typ sub) t
-    | Pexp_object () -> ()
     | 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
@@ -333,7 +333,6 @@ module E = struct
     | Pexp_lazy e -> lazy_ ~loc ~attrs (sub.expr sub e)
     | Pexp_poly (e, t) ->
       poly ~loc ~attrs (sub.expr sub e) (map_opt (sub.typ sub) t)
-    | Pexp_object () -> assert false
     | 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_to0.ml b/compiler/ml/ast_mapper_to0.ml
@@ -339,7 +339,6 @@ module E = struct
     | Pexp_lazy e -> lazy_ ~loc ~attrs (sub.expr sub e)
     | Pexp_poly (e, t) ->
       poly ~loc ~attrs (sub.expr sub e) (map_opt (sub.typ sub) t)
-    | Pexp_object () -> assert false
     | 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
@@ -284,7 +284,6 @@ let rec add_expr bv exp =
   | Pexp_poly (e, t) ->
     add_expr bv e;
     add_opt add_type bv t
-  | Pexp_object () -> ()
   | 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
@@ -300,7 +300,6 @@ and expression_desc =
 
        Can only be used as the expression under Cfk_concrete
        for methods (not values). *)
-  | Pexp_object of unit (* dummy AST node *)
   | Pexp_newtype of string loc * expression (* fun (type t) -> E *)
   | Pexp_pack of module_expr
     (* (module ME)
diff --git a/compiler/ml/pprintast.ml b/compiler/ml/pprintast.ml
@@ -666,9 +666,7 @@ and expression ctxt f x =
 
 and expression1 ctxt f x =
   if x.pexp_attributes <> [] then expression ctxt f x
-  else match x.pexp_desc with
-    | Pexp_object () -> assert false
-    | _ -> expression2 ctxt f x
+  else expression2 ctxt f x
 (* used in [Pexp_apply] *)
 
 and expression2 ctxt f x =
diff --git a/compiler/ml/printast.ml b/compiler/ml/printast.ml
@@ -334,7 +334,6 @@ and expression i ppf x =
     line i ppf "Pexp_poly\n";
     expression i ppf e;
     option i core_type ppf cto
-  | Pexp_object () -> ()
   | Pexp_newtype (s, e) ->
     line i ppf "Pexp_newtype \"%s\"\n" s.txt;
     expression i ppf e
diff --git a/compiler/ml/printtyped.ml b/compiler/ml/printtyped.ml
@@ -372,7 +372,6 @@ and expression i ppf x =
   | Texp_lazy e ->
     line i ppf "Texp_lazy";
     expression i ppf e
-  | Texp_object () -> ()
   | Texp_pack me ->
     line i ppf "Texp_pack";
     module_expr i ppf me
diff --git a/compiler/ml/rec_check.ml b/compiler/ml/rec_check.ml
@@ -198,8 +198,8 @@ let rec classify_expression : Typedtree.expression -> sd =
   | Texp_ident _ | Texp_for _ | Texp_constant _ | Texp_new _ | Texp_instvar _
   | Texp_tuple _ | Texp_array _ | Texp_construct _ | Texp_variant _
   | Texp_record _ | Texp_setfield _ | Texp_while _ | Texp_setinstvar _
-  | Texp_pack _ | Texp_object _ | Texp_function _ | Texp_lazy _
-  | Texp_unreachable | Texp_extension_constructor _ ->
+  | Texp_pack _ | Texp_function _ | Texp_lazy _ | Texp_unreachable
+  | Texp_extension_constructor _ ->
     Static
   | Texp_apply ({exp_desc = Texp_ident (_, _, vd)}, _) when is_ref vd -> Static
   | Texp_apply _ | Texp_match _ | Texp_ifthenelse _ | Texp_send _ | Texp_field _
@@ -289,7 +289,6 @@ let rec expression : Env.env -> Typedtree.expression -> Use.t =
   | Texp_letexception (_, e) -> expression env e
   | Texp_assert e -> Use.inspect (expression env e)
   | Texp_pack m -> modexp env m
-  | Texp_object () -> assert false
   | Texp_try (e, cases) ->
     (* This is more permissive than the old check. *)
     let case env {Typedtree.c_rhs} = expression env c_rhs in
diff --git a/compiler/ml/tast_iterator.ml b/compiler/ml/tast_iterator.ml
@@ -210,7 +210,6 @@ let expr sub {exp_extra; exp_desc; exp_env; _} =
     sub.expr sub exp
   | Texp_assert exp -> sub.expr sub exp
   | Texp_lazy exp -> sub.expr sub exp
-  | Texp_object _ -> ()
   | Texp_pack mexpr -> sub.module_expr sub mexpr
   | Texp_unreachable -> ()
   | Texp_extension_constructor _ -> ()
diff --git a/compiler/ml/tast_mapper.ml b/compiler/ml/tast_mapper.ml
@@ -250,7 +250,6 @@ let expr sub x =
       Texp_letexception (sub.extension_constructor sub cd, sub.expr sub exp)
     | Texp_assert exp -> Texp_assert (sub.expr sub exp)
     | Texp_lazy exp -> Texp_lazy (sub.expr sub exp)
-    | Texp_object () -> Texp_object ()
     | Texp_pack mexpr -> Texp_pack (sub.module_expr sub mexpr)
     | Texp_unreachable -> Texp_unreachable
     | Texp_extension_constructor _ as e -> e
diff --git a/compiler/ml/translcore.ml b/compiler/ml/translcore.ml
@@ -986,7 +986,6 @@ and transl_exp0 (e : Typedtree.expression) : Lambda.lambda =
        optimize the translation just as Lazy.lazy_from_val would
        do *)
     Lprim (Pmakeblock Blk_lazy_general, [transl_exp e], e.exp_loc)
-  | Texp_object () -> assert false
   | Texp_unreachable -> raise (Error (e.exp_loc, Unreachable_reached))
 
 and transl_list expr_list = List.map transl_exp expr_list
diff --git a/compiler/ml/typecore.ml b/compiler/ml/typecore.ml
@@ -183,7 +183,6 @@ let iter_expression f e =
     | Pexp_letmodule (_, me, e) ->
       expr e;
       module_expr me
-    | Pexp_object _ -> assert false
     | Pexp_pack me -> module_expr me
     | Pexp_unreachable -> ()
   and case {pc_lhs = _; pc_guard; pc_rhs} =
@@ -1853,7 +1852,6 @@ let rec is_nonexpansive exp =
   | Texp_new _ -> assert false
   (* Note: nonexpansive only means no _observable_ side effects *)
   | Texp_lazy e -> is_nonexpansive e
-  | Texp_object () -> assert false
   | Texp_letmodule (_, _, mexp, e) ->
     is_nonexpansive_mod mexp && is_nonexpansive e
   | Texp_pack mexp -> is_nonexpansive_mod mexp
@@ -3156,7 +3154,6 @@ and type_expect_ ?type_clash_context ?in_function ?(recarg = Rejected) env sexp
         exp_attributes = sexp.pexp_attributes;
         exp_env = env;
       }
-  | Pexp_object _ -> assert false
   | Pexp_poly (sbody, sty) ->
     let ty, cty =
       match sty with
diff --git a/compiler/ml/typedtree.ml b/compiler/ml/typedtree.ml
@@ -116,7 +116,6 @@ and expression_desc =
   | Texp_letexception of extension_constructor * expression
   | Texp_assert of expression
   | Texp_lazy of expression
-  | Texp_object of unit
   | Texp_pack of module_expr
   | Texp_unreachable
   | Texp_extension_constructor of Longident.t loc * Path.t
diff --git a/compiler/ml/typedtree.mli b/compiler/ml/typedtree.mli
@@ -218,7 +218,6 @@ and expression_desc =
   | Texp_letexception of extension_constructor * expression
   | Texp_assert of expression
   | Texp_lazy of expression
-  | Texp_object of unit
   | Texp_pack of module_expr
   | Texp_unreachable
   | Texp_extension_constructor of Longident.t loc * Path.t
diff --git a/compiler/ml/typedtreeIter.ml b/compiler/ml/typedtreeIter.ml
@@ -296,7 +296,6 @@ end = struct
       iter_expression exp
     | Texp_assert exp -> iter_expression exp
     | Texp_lazy exp -> iter_expression exp
-    | Texp_object () -> ()
     | Texp_pack mexpr -> iter_module_expr mexpr
     | Texp_unreachable -> ()
     | Texp_extension_constructor _ -> ());
diff --git a/compiler/ml/untypeast.ml b/compiler/ml/untypeast.ml
@@ -394,7 +394,6 @@ let expression sub exp =
       Pexp_letexception (sub.extension_constructor sub ext, sub.expr sub exp)
     | Texp_assert exp -> Pexp_assert (sub.expr sub exp)
     | Texp_lazy exp -> Pexp_lazy (sub.expr sub exp)
-    | Texp_object () -> assert false
     | Texp_pack mexpr -> Pexp_pack (sub.module_expr sub mexpr)
     | Texp_unreachable -> Pexp_unreachable
     | Texp_extension_constructor (lid, _) ->
diff --git a/compiler/syntax/src/res_ast_debugger.ml b/compiler/syntax/src/res_ast_debugger.ml
@@ -702,7 +702,6 @@ module SexpAst = struct
       | Pexp_assert expr -> Sexp.list [Sexp.atom "Pexp_assert"; expression expr]
       | Pexp_lazy expr -> Sexp.list [Sexp.atom "Pexp_lazy"; expression expr]
       | Pexp_poly _ -> Sexp.list [Sexp.atom "Pexp_poly"]
-      | Pexp_object _ -> Sexp.list [Sexp.atom "Pexp_object"]
       | Pexp_newtype (lbl, expr) ->
         Sexp.list
           [Sexp.atom "Pexp_newtype"; string lbl.Asttypes.txt; expression expr]
diff --git a/compiler/syntax/src/res_printer.ml b/compiler/syntax/src/res_printer.ml
@@ -3420,7 +3420,6 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
     | Pexp_setinstvar _ -> Doc.text "Pexp_setinstvar not implemented in printer"
     | Pexp_override _ -> Doc.text "Pexp_override not implemented in printer"
     | Pexp_poly _ -> Doc.text "Pexp_poly not implemented in printer"
-    | Pexp_object _ -> Doc.text "Pexp_object not implemented in printer"
   in
   let expr_with_await =
     if ParsetreeViewer.has_await_attribute e.pexp_attributes then
diff --git a/tests/tools_tests/ppx/TestPpx.res b/tests/tools_tests/ppx/TestPpx.res
@@ -4,3 +4,11 @@ type t = [#A | #B]
 
 let a: t = #A
 let b: t = #B
+
+module M = {
+  let v = 10
+}
+
+open M
+
+let vv = v
diff --git a/tests/tools_tests/src/expected/TestPpx.res.jsout b/tests/tools_tests/src/expected/TestPpx.res.jsout
@@ -6,10 +6,18 @@ console.log("ppx test");
 
 console.log("ppx test");
 
+let M = {
+  v: 10
+};
+
 let a = "A";
 
 let b = "B";
 
+let vv = 10;
+
 exports.a = a;
 exports.b = b;
+exports.M = M;
+exports.vv = vv;
 /*  Not a pure module */
