Remove class_type and dead code.

Author: cristianoc

jscomp/frontend/bs_ast_mapper.ml

@@ -29,7 +29,6 @@ type mapper = {
   attributes: mapper -> attribute list -> attribute list;
   case: mapper -> case -> case;
   cases: mapper -> case list -> case list;
-  class_type: mapper -> class_type -> class_type;
   constructor_declaration:
     mapper -> constructor_declaration -> constructor_declaration;
   expr: mapper -> expression -> expression;
@@ -185,24 +184,6 @@ module T = struct
       ~attrs:(sub.attributes sub pext_attributes)
 end
 
-module CT = struct
-  (* Type expressions for the class language *)
-
-  let map sub {pcty_loc = loc; pcty_desc = desc; pcty_attributes = attrs} =
-    let open Cty in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcty_constr (lid, tys) ->
-      constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tys)
-    | Pcty_signature () -> assert false
-    | Pcty_arrow (lab, t, ct) ->
-      arrow ~loc ~attrs lab (sub.typ sub t) (sub.class_type sub ct)
-    | Pcty_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pcty_open (ovf, lid, ct) ->
-      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.class_type sub ct)
-end
-
 module MT = struct
   (* Type expressions for the module language *)
 
@@ -449,7 +430,6 @@ let default_mapper =
     signature_item = MT.map_signature_item;
     module_type = MT.map;
     with_constraint = MT.map_with_constraint;
-    class_type = CT.map;
     type_declaration = T.map_type_declaration;
     (* #if true then      *)
     type_declaration_list = T.map_type_declaration_list;

jscomp/frontend/bs_ast_mapper.mli

@@ -57,7 +57,6 @@ type mapper = {
   attributes: mapper -> attribute list -> attribute list;
   case: mapper -> case -> case;
   cases: mapper -> case list -> case list;
-  class_type: mapper -> class_type -> class_type;
   constructor_declaration:
     mapper -> constructor_declaration -> constructor_declaration;
   expr: mapper -> expression -> expression;

jscomp/ml/ast_helper.ml

@@ -271,23 +271,6 @@ module Str = struct
       f_txt
 end
 
-
-module Cty = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {
-     pcty_desc = d;
-     pcty_loc = loc;
-     pcty_attributes = attrs;
-    }
-  let attr d a = {d with pcty_attributes = d.pcty_attributes @ [a]}
-
-  let constr ?loc ?attrs a b = mk ?loc ?attrs (Pcty_constr (a, b))
-  let arrow ?loc ?attrs a b c = mk ?loc ?attrs (Pcty_arrow (a, b, c))
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pcty_extension a)
-  let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcty_open (a, b, c))
-end
-
-
 module Val = struct
   let mk ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs)
         ?(prim = []) name typ =

jscomp/ml/ast_helper.mli

@@ -332,20 +332,3 @@ module Vb:
     val mk: ?loc: loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
       pattern -> expression -> value_binding
   end
-
-
-(** {1 Class language} *)
-
-(** Class type expressions *)
-module Cty:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> class_type_desc -> class_type
-    val attr: class_type -> attribute -> class_type
-
-    val constr: ?loc:loc -> ?attrs:attrs -> lid -> core_type list -> class_type
-    val arrow: ?loc:loc -> ?attrs:attrs -> arg_label -> core_type ->
-      class_type -> class_type
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> class_type
-    val open_: ?loc:loc -> ?attrs:attrs -> override_flag -> lid -> class_type
-               -> class_type
-  end

jscomp/ml/ast_iterator.ml

@@ -29,7 +29,6 @@ type iterator = {
   attributes: iterator -> attribute list -> unit;
   case: iterator -> case -> unit;
   cases: iterator -> case list -> unit;
-  class_type: iterator -> class_type -> unit;
   constructor_declaration: iterator -> constructor_declaration -> unit;
   expr: iterator -> expression -> unit;
   extension: iterator -> extension -> unit;
@@ -165,22 +164,6 @@ module T = struct
 
 end
 
-module CT = struct
-  (* Type expressions for the class language *)
-
-  let iter sub {pcty_loc = loc; pcty_desc = desc; pcty_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pcty_constr (lid, tys) ->
-        iter_loc sub lid; List.iter (sub.typ sub) tys
-    | Pcty_signature () -> assert false
-    | Pcty_arrow (_lab, t, ct) ->
-        sub.typ sub t; sub.class_type sub ct
-    | Pcty_extension x -> sub.extension sub x
-    | Pcty_open (_ovf, lid, e) ->
-        iter_loc sub lid; sub.class_type sub e
-end
 
 module MT = struct
   (* Type expressions for the module language *)
@@ -397,7 +380,6 @@ let default_iterator =
     signature_item = MT.iter_signature_item;
     module_type = MT.iter;
     with_constraint = MT.iter_with_constraint;
-    class_type = CT.iter;
     type_declaration = T.iter_type_declaration;
     type_kind = T.iter_type_kind;
     typ = T.iter;

jscomp/ml/ast_iterator.mli

@@ -26,7 +26,6 @@ type iterator = {
   attributes: iterator -> attribute list -> unit;
   case: iterator -> case -> unit;
   cases: iterator -> case list -> unit;
-  class_type: iterator -> class_type -> unit;
   constructor_declaration: iterator -> constructor_declaration -> unit;
   expr: iterator -> expression -> unit;
   extension: iterator -> extension -> unit;

jscomp/ml/ast_mapper.ml

@@ -30,7 +30,6 @@ type mapper = {
   attributes: mapper -> attribute list -> attribute list;
   case: mapper -> case -> case;
   cases: mapper -> case list -> case list;
-  class_type: mapper -> class_type -> class_type;
   constructor_declaration: mapper -> constructor_declaration
                            -> constructor_declaration;
   expr: mapper -> expression -> expression;
@@ -172,24 +171,6 @@ module T = struct
 
 end
 
-module CT = struct
-  (* Type expressions for the class language *)
-
-  let map sub {pcty_loc = loc; pcty_desc = desc; pcty_attributes = attrs} =
-    let open Cty in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcty_constr (lid, tys) ->
-        constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tys)
-    | Pcty_signature () -> assert false
-    | Pcty_arrow (lab, t, ct) ->
-        arrow ~loc ~attrs lab (sub.typ sub t) (sub.class_type sub ct)
-    | Pcty_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pcty_open (ovf, lid, ct) ->
-        open_ ~loc ~attrs ovf (map_loc sub lid) (sub.class_type sub ct)
-end
-
 module MT = struct
   (* Type expressions for the module language *)
 
@@ -414,7 +395,6 @@ let default_mapper =
     signature_item = MT.map_signature_item;
     module_type = MT.map;
     with_constraint = MT.map_with_constraint;
-    class_type = CT.map;
     type_declaration = T.map_type_declaration;
     type_kind = T.map_type_kind;
     typ = T.map;

jscomp/ml/ast_mapper.mli

@@ -57,7 +57,6 @@ type mapper = {
   attributes: mapper -> attribute list -> attribute list;
   case: mapper -> case -> case;
   cases: mapper -> case list -> case list;
-  class_type: mapper -> class_type -> class_type;
   constructor_declaration: mapper -> constructor_declaration
                            -> constructor_declaration;
   expr: mapper -> expression -> expression;

jscomp/ml/parser.ml

@@ -136,7 +136,7 @@ let mkmty ?attrs d = Mty.mk ~loc:(symbol_rloc()) ?attrs d
 let mksig d = Sig.mk ~loc:(symbol_rloc()) d
 let mkmod ?attrs d = Mod.mk ~loc:(symbol_rloc()) ?attrs d
 let mkstr d = Str.mk ~loc:(symbol_rloc()) d
-let mkcty ?attrs d = Cty.mk ~loc:(symbol_rloc()) ?attrs d
+let mkcty ?attrs _d = let _ = attrs in assert false
 let mkctf ?attrs ?docs _d = let _ = (attrs, docs) in assert false
 let mkcf ?attrs ?docs _d = let _ = (attrs, docs) in assert false
 
@@ -319,8 +319,7 @@ let wrap_pat_attrs pat (ext, attrs) =
 let mkpat_attrs d attrs =
   wrap_pat_attrs (mkpat d) attrs
 
-let wrap_class_type_attrs body attrs =
-  {body with pcty_attributes = attrs @ body.pcty_attributes}
+let wrap_class_type_attrs _body _attrs = assert false
 let wrap_mod_attrs body attrs =
   {body with pmod_attributes = attrs @ body.pmod_attributes}
 let wrap_mty_attrs body attrs =
@@ -7394,22 +7393,22 @@ let yyact = [|
     let _4 = (Parsing.peek_val __caml_parser_env 0 : 'clty_longident) in
     Obj.repr(
 # 965 "ml/parser.mly"
-      ( mkcty(Pcty_constr (mkloc _4 (rhs_loc 4), List.rev _2)) )
+      ( mkcty(assert false) )
 # 7403 "ml/parser.ml"
                : 'class_signature))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 0 : 'clty_longident) in
     Obj.repr(
 # 967 "ml/parser.mly"
-      ( mkcty(Pcty_constr (mkrhs _1 1, [])) )
+      ( mkcty(assert false) )
 # 7410 "ml/parser.ml"
                : 'class_signature))
 ; (fun __caml_parser_env ->
     let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
     let _3 = (Parsing.peek_val __caml_parser_env 1 : 'class_sig_body) in
     Obj.repr(
 # 969 "ml/parser.mly"
-      ( mkcty ~attrs:_2 (Pcty_signature _3) )
+      ( mkcty ~attrs:_2 (assert false) )
 # 7418 "ml/parser.ml"
                : 'class_signature))
 ; (fun __caml_parser_env ->
@@ -7425,14 +7424,14 @@ let yyact = [|
     let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
     Obj.repr(
 # 973 "ml/parser.mly"
-      ( Cty.attr _1 _2 )
+      ( assert false )
 # 7434 "ml/parser.ml"
                : 'class_signature))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
     Obj.repr(
 # 975 "ml/parser.mly"
-      ( mkcty(Pcty_extension _1) )
+      ( mkcty(assert false) )
 # 7441 "ml/parser.ml"
                : 'class_signature))
 ; (fun __caml_parser_env ->
@@ -7442,7 +7441,7 @@ let yyact = [|
     let _7 = (Parsing.peek_val __caml_parser_env 0 : 'class_signature) in
     Obj.repr(
 # 977 "ml/parser.mly"
-      ( wrap_class_type_attrs (mkcty(Pcty_open(_3, mkrhs _5 5, _7))) _4 )
+      ( wrap_class_type_attrs (mkcty(assert false)) _4 )
 # 7451 "ml/parser.ml"
                : 'class_signature))
 ; (fun __caml_parser_env ->

jscomp/ml/parser.mly

@@ -30,7 +30,7 @@ let mkmty ?attrs d = Mty.mk ~loc:(symbol_rloc()) ?attrs d
 let mksig d = Sig.mk ~loc:(symbol_rloc()) d
 let mkmod ?attrs d = Mod.mk ~loc:(symbol_rloc()) ?attrs d
 let mkstr d = Str.mk ~loc:(symbol_rloc()) d
-let mkcty ?attrs d = Cty.mk ~loc:(symbol_rloc()) ?attrs d
+let mkcty ?attrs _d = let _ = attrs in assert false
 let mkctf ?attrs ?docs d = let _ = (attrs, docs) in assert false
 let mkcf ?attrs ?docs d = assert false
 
@@ -213,8 +213,7 @@ let wrap_pat_attrs pat (ext, attrs) =
 let mkpat_attrs d attrs =
   wrap_pat_attrs (mkpat d) attrs
 
-let wrap_class_type_attrs body attrs =
-  {body with pcty_attributes = attrs @ body.pcty_attributes}
+let wrap_class_type_attrs _body _attrs = assert false
 let wrap_mod_attrs body attrs =
   {body with pmod_attributes = attrs @ body.pmod_attributes}
 let wrap_mty_attrs body attrs =
@@ -966,7 +965,7 @@ class_signature:
   | OBJECT attributes class_sig_body error
       { unclosed "object" 1 "end" 4 }
   | class_signature attribute
-      { Cty.attr $1 $2 }
+      { assert false }
   | extension
       { mkcty(Pcty_extension $1) }
   | LET OPEN override_flag attributes mod_longident IN class_signature

jscomp/ml/parsetree.ml

@@ -481,32 +481,6 @@ and extension_constructor_kind =
          | C = D
        *)
 
-(** {1 Class language} *)
-
-(* Type expressions for the class language *)
-
-and class_type =
-    {
-     pcty_desc: class_type_desc;
-     pcty_loc: Location.t;
-     pcty_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and class_type_desc =
-  | Pcty_constr of Longident.t loc * core_type list
-        (* c
-           ['a1, ..., 'an] c *)
-  | Pcty_signature of unit
-        (* dummy AST node *)
-  | Pcty_arrow of arg_label * core_type * class_type
-        (* T -> CT       Simple
-           ~l:T -> CT    Labelled l
-           ?l:T -> CT    Optional l
-         *)
-  | Pcty_extension of extension
-        (* [%id] *)
-  | Pcty_open of override_flag * Longident.t loc * class_type
-        (* let open M in CT *)
 
 (** {1 Module language} *)
 

jscomp/ml/untypeast.ml

@@ -25,7 +25,6 @@ type mapper = {
   attributes: mapper -> T.attribute list -> attribute list;
   case: mapper -> T.case -> case;
   cases: mapper -> T.case list -> case list;
-  class_type: mapper -> T.class_type -> class_type;
   constructor_declaration: mapper -> T.constructor_declaration
                            -> constructor_declaration;
   expr: mapper -> T.expression -> expression;
@@ -571,22 +570,6 @@ let module_expr sub mexpr =
         Mod.mk ~loc ~attrs desc
 
 
-
-let class_type sub ct =
-  let loc = sub.location sub ct.cltyp_loc in
-  let attrs = sub.attributes sub ct.cltyp_attributes in
-  let desc = match ct.cltyp_desc with
-      Tcty_signature _ -> assert false
-    | Tcty_constr (_path, lid, list) ->
-        Pcty_constr (map_loc sub lid, List.map (sub.typ sub) list)
-    | Tcty_arrow (label, ct, cl) ->
-        Pcty_arrow (label, sub.typ sub ct, sub.class_type sub cl)
-    | Tcty_open (ovf, _p, lid, _env, e) ->
-        Pcty_open (ovf, lid, sub.class_type sub e)
-  in
-  Cty.mk ~loc ~attrs desc
-
-
 let core_type sub ct =
   let loc = sub.location sub ct.ctyp_loc in
   let attrs = sub.attributes sub ct.ctyp_attributes in
@@ -643,7 +626,6 @@ let default_mapper =
     signature_item = signature_item;
     module_type = module_type;
     with_constraint = with_constraint;
-    class_type = class_type;
     type_declaration = type_declaration;
     type_kind = type_kind;
     typ = core_type;

jscomp/ml/untypeast.mli

@@ -22,7 +22,6 @@ type mapper = {
   attributes: mapper -> Typedtree.attribute list -> attribute list;
   case: mapper -> Typedtree.case -> case;
   cases: mapper -> Typedtree.case list -> case list;
-  class_type: mapper -> Typedtree.class_type -> class_type;
   constructor_declaration: mapper -> Typedtree.constructor_declaration
                            -> constructor_declaration;
   expr: mapper -> Typedtree.expression -> expression;