Cleanup: remove Ptyp_class and Ttyp_class.

cristianoc · cristianoc · commit 86f02aab4b50 · 2024-12-04T08:28:27.000+01:00
diff --git a/compiler/frontend/bs_ast_mapper.ml b/compiler/frontend/bs_ast_mapper.ml
@@ -107,7 +107,6 @@ module T = struct
       constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
     | Ptyp_object (l, o) ->
       object_ ~loc ~attrs (List.map (object_field sub) l) o
-    | Ptyp_class () -> assert false
     | Ptyp_alias (t, s) -> alias ~loc ~attrs (sub.typ sub t) s
     | Ptyp_variant (rl, b, ll) ->
       variant ~loc ~attrs (List.map (row_field sub) rl) b ll
diff --git a/compiler/gentype/TranslateCoreType.ml b/compiler/gentype/TranslateCoreType.ml
@@ -269,7 +269,7 @@ and translateCoreType_ ~config ~type_vars_gen
         type_;
       }
     | None -> {dependencies = []; type_ = unknown})
-  | Ttyp_any | Ttyp_class _ -> {dependencies = []; type_ = unknown}
+  | Ttyp_any -> {dependencies = []; type_ = unknown}
 
 and translateCoreTypes_ ~config ~type_vars_gen ~type_env type_exprs :
     translation list =
diff --git a/compiler/ml/ast_helper.ml b/compiler/ml/ast_helper.ml
@@ -90,7 +90,6 @@ module Typ = struct
         | Ptyp_constr (longident, lst) ->
           Ptyp_constr (longident, List.map loop lst)
         | Ptyp_object (lst, o) -> Ptyp_object (List.map loop_object_field lst, o)
-        | Ptyp_class () -> assert false
         | Ptyp_alias (core_type, string) ->
           check_variable var_names t.ptyp_loc string;
           Ptyp_alias (loop core_type, string)
diff --git a/compiler/ml/ast_iterator.ml b/compiler/ml/ast_iterator.ml
@@ -104,7 +104,6 @@ module T = struct
       iter_loc sub lid;
       List.iter (sub.typ sub) tl
     | Ptyp_object (ol, _o) -> List.iter (object_field sub) ol
-    | Ptyp_class () -> ()
     | Ptyp_alias (t, _) -> sub.typ sub t
     | Ptyp_variant (rl, _b, _ll) -> List.iter (row_field sub) rl
     | Ptyp_poly (_, t) -> sub.typ sub t
diff --git a/compiler/ml/ast_mapper.ml b/compiler/ml/ast_mapper.ml
@@ -99,7 +99,6 @@ module T = struct
       constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
     | Ptyp_object (l, o) ->
       object_ ~loc ~attrs (List.map (object_field sub) l) o
-    | Ptyp_class () -> assert false
     | Ptyp_alias (t, s) -> alias ~loc ~attrs (sub.typ sub t) s
     | Ptyp_variant (rl, b, ll) ->
       variant ~loc ~attrs (List.map (row_field sub) rl) b ll
diff --git a/compiler/ml/depend.ml b/compiler/ml/depend.ml
@@ -118,7 +118,6 @@ let rec add_type bv ty =
         | Otag (_, _, t) -> add_type bv t
         | Oinherit t -> add_type bv t)
       fl
-  | Ptyp_class () -> ()
   | Ptyp_alias (t, _) -> add_type bv t
   | Ptyp_variant (fl, _, _) ->
     List.iter
diff --git a/compiler/ml/parsetree.ml b/compiler/ml/parsetree.ml
@@ -95,7 +95,6 @@ and core_type_desc =
     (* < l1:T1; ...; ln:Tn >     (flag = Closed)
        < l1:T1; ...; ln:Tn; .. > (flag = Open)
     *)
-  | Ptyp_class of unit (* dummy AST node *)
   | Ptyp_alias of core_type * string (* T as 'a *)
   | Ptyp_variant of row_field list * closed_flag * label list option
     (* [ `A|`B ]         (flag = Closed; labels = None)
@@ -652,7 +651,6 @@ module Legacy = struct
     | Ptyp_constr (lid, tl) -> Ptyp_constr (lid, List.map core_type tl)
     | Ptyp_object (fields, closed) ->
       Ptyp_object (List.map object_field fields, closed)
-    | Ptyp_class () -> Ptyp_class ()
     | Ptyp_alias (t, lid) -> Ptyp_alias (core_type t, lid)
     | Ptyp_variant (row_fields, closed, labels) ->
       Ptyp_variant (List.map row_field row_fields, closed, labels)
diff --git a/compiler/ml/pprintast.ml b/compiler/ml/pprintast.ml
@@ -321,7 +321,6 @@ and core_type1 ctxt f x =
         in
         pp f "@[<hov2><@ %a%a@ > @]" (list core_field_type ~sep:";") l
           field_var o (* Cf #7200 *)
-    | Ptyp_class () -> ()
     | Ptyp_package (lid, cstrs) ->
         let aux f (s, ct) =
           pp f "type %a@ =@ %a" longident_loc s (core_type ctxt) ct  in
diff --git a/compiler/ml/printast.ml b/compiler/ml/printast.ml
@@ -150,7 +150,6 @@ let rec core_type i ppf x =
           line i ppf "Oinherit\n";
           core_type (i + 1) ppf ct)
       l
-  | Ptyp_class () -> ()
   | Ptyp_alias (ct, s) ->
     line i ppf "Ptyp_alias \"%s\"\n" s;
     core_type i ppf ct
diff --git a/compiler/ml/printtyped.ml b/compiler/ml/printtyped.ml
@@ -179,7 +179,6 @@ let rec core_type i ppf x =
           line i ppf "OTinherit\n";
           core_type (i + 1) ppf ct)
       l
-  | Ttyp_class () -> ()
   | Ttyp_alias (ct, s) ->
     line i ppf "Ttyp_alias \"%s\"\n" s;
     core_type i ppf ct
diff --git a/compiler/ml/tast_iterator.ml b/compiler/ml/tast_iterator.ml
@@ -303,7 +303,6 @@ let typ sub {ctyp_desc; ctyp_env; _} =
   | Ttyp_tuple list -> List.iter (sub.typ sub) list
   | Ttyp_constr (_, _, list) -> List.iter (sub.typ sub) list
   | Ttyp_object (list, _) -> List.iter (sub.object_field sub) list
-  | Ttyp_class () -> ()
   | Ttyp_alias (ct, _) -> sub.typ sub ct
   | Ttyp_variant (list, _, _) -> List.iter (sub.row_field sub) list
   | Ttyp_poly (_, ct) -> sub.typ sub ct
diff --git a/compiler/ml/tast_mapper.ml b/compiler/ml/tast_mapper.ml
@@ -370,7 +370,6 @@ let typ sub x =
       Ttyp_constr (path, lid, List.map (sub.typ sub) list)
     | Ttyp_object (list, closed) ->
       Ttyp_object (List.map (sub.object_field sub) list, closed)
-    | Ttyp_class () -> Ttyp_class ()
     | Ttyp_alias (ct, s) -> Ttyp_alias (sub.typ sub ct, s)
     | Ttyp_variant (list, closed, labels) ->
       Ttyp_variant (List.map (sub.row_field sub) list, closed, labels)
diff --git a/compiler/ml/typedecl.ml b/compiler/ml/typedecl.ml
@@ -158,7 +158,6 @@ let is_fixed_type sd =
   let rec has_row_var sty =
     match sty.ptyp_desc with
     | Ptyp_alias (sty, _) -> has_row_var sty
-    | Ptyp_class _
     | Ptyp_object (_, Open)
     | Ptyp_variant (_, Open, _)
     | Ptyp_variant (_, Closed, Some _) ->
diff --git a/compiler/ml/typedtree.ml b/compiler/ml/typedtree.ml
@@ -314,7 +314,6 @@ and core_type_desc =
   | Ttyp_tuple of core_type list
   | Ttyp_constr of Path.t * Longident.t loc * core_type list
   | Ttyp_object of object_field list * closed_flag
-  | Ttyp_class of unit (* dummy AST node *)
   | Ttyp_alias of core_type * string
   | Ttyp_variant of row_field list * closed_flag * label list option
   | Ttyp_poly of string list * core_type
diff --git a/compiler/ml/typedtree.mli b/compiler/ml/typedtree.mli
@@ -420,7 +420,6 @@ and core_type_desc =
   | Ttyp_tuple of core_type list
   | Ttyp_constr of Path.t * Longident.t loc * core_type list
   | Ttyp_object of object_field list * closed_flag
-  | Ttyp_class of unit (* dummy AST node *)
   | Ttyp_alias of core_type * string
   | Ttyp_variant of row_field list * closed_flag * label list option
   | Ttyp_poly of string list * core_type
diff --git a/compiler/ml/typedtreeIter.ml b/compiler/ml/typedtreeIter.ml
@@ -391,7 +391,6 @@ end = struct
     | Ttyp_tuple list -> List.iter iter_core_type list
     | Ttyp_constr (_path, _, list) -> List.iter iter_core_type list
     | Ttyp_object (list, _o) -> List.iter iter_object_field list
-    | Ttyp_class () -> ()
     | Ttyp_alias (ct, _s) -> iter_core_type ct
     | Ttyp_variant (list, _bool, _labels) -> List.iter iter_row_field list
     | Ttyp_poly (_list, ct) -> iter_core_type ct
diff --git a/compiler/ml/typetexp.ml b/compiler/ml/typetexp.ml
@@ -379,7 +379,6 @@ and transl_type_aux env policy styp =
   | Ptyp_object (fields, o) ->
     let ty, fields = transl_fields env policy o fields in
     ctyp (Ttyp_object (fields, o)) (newobj ty)
-  | Ptyp_class () -> assert false
   | Ptyp_alias (st, alias) ->
     let cty =
       try
diff --git a/compiler/ml/untypeast.ml b/compiler/ml/untypeast.ml
@@ -519,7 +519,6 @@ let core_type sub ct =
       Ptyp_constr (map_loc sub lid, List.map (sub.typ sub) list)
     | Ttyp_object (list, o) ->
       Ptyp_object (List.map (sub.object_field sub) list, o)
-    | Ttyp_class () -> Ptyp_class ()
     | Ttyp_alias (ct, s) -> Ptyp_alias (sub.typ sub ct, s)
     | Ttyp_variant (list, bool, labels) ->
       Ptyp_variant (List.map (sub.row_field sub) list, bool, labels)
diff --git a/compiler/syntax/src/res_ast_debugger.ml b/compiler/syntax/src/res_ast_debugger.ml
@@ -875,7 +875,6 @@ module SexpAst = struct
             closed_flag flag;
             Sexp.list (map_empty ~f:object_field fields);
           ]
-      | Ptyp_class () -> assert false
       | Ptyp_variant (fields, flag, opt_labels) ->
         Sexp.list
           [
diff --git a/compiler/syntax/src/res_printer.ml b/compiler/syntax/src/res_printer.ml
@@ -1766,7 +1766,6 @@ and print_typ_expr ~(state : State.t) (typ_expr : Parsetree.core_type) cmt_tbl =
     | Ptyp_package package_type ->
       print_package_type ~state ~print_module_keyword_and_parens:true
         package_type cmt_tbl
-    | Ptyp_class _ -> Doc.text "classes are not supported in types"
     | Ptyp_variant (row_fields, closed_flag, labels_opt) ->
       let force_break =
         typ_expr.ptyp_loc.Location.loc_start.pos_lnum

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ and translateCoreType_ ~config ~type_vars_gen`
`269`	`269`	`type_;`
`270`	`270`	`}`
`271`	`271`	`\| None -> {dependencies = []; type_ = unknown})`
`272`		`- \| Ttyp_any \| Ttyp_class _ -> {dependencies = []; type_ = unknown}`
	`272`	`+ \| Ttyp_any -> {dependencies = []; type_ = unknown}`
`273`	`273`
`274`	`274`	`and translateCoreTypes_ ~config ~type_vars_gen ~type_env type_exprs :`
`275`	`275`	`translation list =`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,6 @@ let rec core_type i ppf x =`
`150`	`150`	`line i ppf "Oinherit\n";`
`151`	`151`	`core_type (i + 1) ppf ct)`
`152`	`152`	`l`
`153`		`- \| Ptyp_class () -> ()`
`154`	`153`	`\| Ptyp_alias (ct, s) ->`
`155`	`154`	`line i ppf "Ptyp_alias \"%s\"\n" s;`
`156`	`155`	`core_type i ppf ct`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ let rec core_type i ppf x =`
`179`	`179`	`line i ppf "OTinherit\n";`
`180`	`180`	`core_type (i + 1) ppf ct)`
`181`	`181`	`l`
`182`		`- \| Ttyp_class () -> ()`
`183`	`182`	`\| Ttyp_alias (ct, s) ->`
`184`	`183`	`line i ppf "Ttyp_alias \"%s\"\n" s;`
`185`	`184`	`core_type i ppf ct`