Remove class_field.

Author: cristianoc

jscomp/frontend/bs_ast_mapper.ml

@@ -458,7 +458,6 @@ module P = struct
     | Ppat_extension x -> extension ~loc ~attrs (sub.extension sub x)
 end
 
-
 (* Now, a generic AST mapper, to be extended to cover all kinds and
    cases of the OCaml grammar.  The default behavior of the mapper is
    the identity. *)

jscomp/ml/ast_helper.ml

@@ -313,34 +313,6 @@ module Ctf = struct
 
 end
 
-module Cf = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) d =
-    {
-     pcf_desc = d;
-     pcf_loc = loc;
-     pcf_attributes = add_docs_attrs docs attrs;
-    }
-
-  
-  let val_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcf_val (a, b, c))
-  let method_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcf_method (a, b, c))
-  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pcf_constraint (a, b))
-  let initializer_ ?loc ?attrs a = mk ?loc ?attrs (Pcf_initializer a)
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pcf_extension a)
-  let attribute ?loc a = mk ?loc (Pcf_attribute a)
-  let text txt =
-    let f_txt = Ext_list.filter txt (fun ds -> docstring_body ds <> "")in
-    List.map
-      (fun ds -> attribute ~loc:(docstring_loc ds) (text_attr ds))
-      f_txt
-
-  let virtual_ ct = Cfk_virtual ct
-  let concrete o e = Cfk_concrete (o, e)
-
-  let attr d a = {d with pcf_attributes = d.pcf_attributes @ [a]}
-
-end
 
 module Val = struct
   let mk ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs)

jscomp/ml/ast_helper.mli

@@ -370,29 +370,6 @@ module Ctf:
     val text: text -> class_type_field list
   end
 
-(** Class fields *)
-module Cf:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> class_field_desc ->
-      class_field
-    val attr: class_field -> attribute -> class_field
-
-    val val_: ?loc:loc -> ?attrs:attrs -> str -> mutable_flag ->
-      class_field_kind -> class_field
-    val method_: ?loc:loc -> ?attrs:attrs -> str -> private_flag ->
-      class_field_kind -> class_field
-    val constraint_: ?loc:loc -> ?attrs:attrs -> core_type -> core_type ->
-      class_field
-    val initializer_: ?loc:loc -> ?attrs:attrs -> expression -> class_field
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> class_field
-    val attribute: ?loc:loc -> attribute -> class_field
-    val text: text -> class_field list
-
-    val virtual_: core_type -> class_field_kind
-    val concrete: override_flag -> expression -> class_field_kind
-
-  end
-
 (** Classes *)
 module Ci:
   sig

jscomp/ml/parser.ml

@@ -139,8 +139,7 @@ let mkstr d = Str.mk ~loc:(symbol_rloc()) d
 let mkcty ?attrs d = Cty.mk ~loc:(symbol_rloc()) ?attrs d
 let mkctf ?attrs ?docs d =
   Ctf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
-let mkcf ?attrs ?docs d =
-  Cf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
+let mkcf ?attrs ?docs _d = let _ = (attrs, docs) in assert false
 
 let mkrhs rhs pos = mkloc rhs (rhs_loc pos)
 
@@ -346,7 +345,7 @@ let mksig_ext d ext =
 
 let text_str pos = Str.text (rhs_text pos)
 let text_sig pos = Sig.text (rhs_text pos)
-let text_cstr pos = Cf.text (rhs_text pos)
+let text_cstr _pos = assert false
 let text_csig pos = Ctf.text (rhs_text pos)
 
 

jscomp/ml/parser.mly

@@ -33,8 +33,7 @@ let mkstr d = Str.mk ~loc:(symbol_rloc()) d
 let mkcty ?attrs d = Cty.mk ~loc:(symbol_rloc()) ?attrs d
 let mkctf ?attrs ?docs d =
   Ctf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
-let mkcf ?attrs ?docs d =
-  Cf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
+let mkcf ?attrs ?docs d = assert false
 
 let mkrhs rhs pos = mkloc rhs (rhs_loc pos)
 
@@ -240,7 +239,7 @@ let mksig_ext d ext =
 
 let text_str pos = Str.text (rhs_text pos)
 let text_sig pos = Sig.text (rhs_text pos)
-let text_cstr pos = Cf.text (rhs_text pos)
+let text_cstr pos = assert false
 let text_csig pos = Ctf.text (rhs_text pos)
 
 

jscomp/ml/parsetree.ml

@@ -564,17 +564,6 @@ and class_type_declaration = class_type class_infos
 (* Value expressions for the class language *)
 
 
-(* object(selfpat) ... end
-   object ... end           (self = Ppat_any)
- *)
-
-and class_field =
-    {
-     pcf_desc: class_field_desc;
-     pcf_loc: Location.t;
-     pcf_attributes: attributes; (* ... [@@id1] [@@id2] *)
-    }
-
 and class_field_desc =
   | Pcf_inherit of unit
         (* inherit CE