Skip to content

Commit 8aa5f8d

Browse files
committed
Remove class_infos and resulting dead code.
1 parent 9982437 commit 8aa5f8d

File tree

5 files changed

+5
-50
lines changed

5 files changed

+5
-50
lines changed

jscomp/ml/ast_helper.ml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -369,21 +369,6 @@ module Vb = struct
369369
}
370370
end
371371

372-
module Ci = struct
373-
let mk ?(loc = !default_loc) ?(attrs = [])
374-
?(docs = empty_docs) ?(text = [])
375-
?(virt = Concrete) ?(params = []) name expr =
376-
{
377-
pci_virt = virt;
378-
pci_params = params;
379-
pci_name = name;
380-
pci_expr = expr;
381-
pci_attributes =
382-
add_text_attrs text (add_docs_attrs docs attrs);
383-
pci_loc = loc;
384-
}
385-
end
386-
387372
module Type = struct
388373
let mk ?(loc = !default_loc) ?(attrs = [])
389374
?(docs = empty_docs) ?(text = [])

jscomp/ml/ast_helper.mli

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,3 @@ module Cty:
349349
val open_: ?loc:loc -> ?attrs:attrs -> override_flag -> lid -> class_type
350350
-> class_type
351351
end
352-
353-
(** Classes *)
354-
module Ci:
355-
sig
356-
val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
357-
?virt:virtual_flag -> ?params:(core_type * variance) list ->
358-
str -> 'a -> 'a class_infos
359-
end

jscomp/ml/parser.ml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7603,9 +7603,8 @@ let yyact = [|
76037603
let _9 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
76047604
Obj.repr(
76057605
# 1035 "ml/parser.mly"
7606-
( let (ext, attrs) = _3 in
7607-
Ci.mk (mkrhs _6 6) _8 ~virt:_4 ~params:_5 ~attrs:(attrs@_9)
7608-
~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
7606+
( let (ext, _attrs) = _3 in
7607+
assert false
76097608
, ext)
76107609
# 7615 "ml/parser.ml"
76117610
: 'class_type_declaration))
@@ -7618,9 +7617,7 @@ let yyact = [|
76187617
let _8 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
76197618
Obj.repr(
76207619
# 1043 "ml/parser.mly"
7621-
( Ci.mk (mkrhs _5 5) _7 ~virt:_3 ~params:_4
7622-
~attrs:(_2@_8) ~loc:(symbol_rloc ())
7623-
~text:(symbol_text ()) ~docs:(symbol_docs ()) )
7620+
( assert false )
76247621
# 7629 "ml/parser.ml"
76257622
: 'and_class_type_declaration))
76267623
; (fun __caml_parser_env ->

jscomp/ml/parser.mly

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,16 +1029,13 @@ class_type_declaration:
10291029
CLASS TYPE ext_attributes virtual_flag class_type_parameters LIDENT EQUAL
10301030
class_signature post_item_attributes
10311031
{ let (ext, attrs) = $3 in
1032-
Ci.mk (mkrhs $6 6) $8 ~virt:$4 ~params:$5 ~attrs:(attrs@$9)
1033-
~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
1032+
assert false
10341033
, ext}
10351034
;
10361035
and_class_type_declaration:
10371036
AND attributes virtual_flag class_type_parameters LIDENT EQUAL
10381037
class_signature post_item_attributes
1039-
{ Ci.mk (mkrhs $5 5) $7 ~virt:$3 ~params:$4
1040-
~attrs:($2@$8) ~loc:(symbol_rloc ())
1041-
~text:(symbol_text ()) ~docs:(symbol_docs ()) }
1038+
{ assert false }
10421039
;
10431040

10441041
/* Core expressions */

jscomp/ml/parsetree.ml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -508,22 +508,6 @@ and class_type_desc =
508508
| Pcty_open of override_flag * Longident.t loc * class_type
509509
(* let open M in CT *)
510510

511-
and 'a class_infos =
512-
{
513-
pci_virt: virtual_flag;
514-
pci_params: (core_type * variance) list;
515-
pci_name: string loc;
516-
pci_expr: 'a;
517-
pci_loc: Location.t;
518-
pci_attributes: attributes; (* ... [@@id1] [@@id2] *)
519-
}
520-
(* class c = ...
521-
class ['a1,...,'an] c = ...
522-
class virtual c = ...
523-
524-
Also used for "class type" declaration.
525-
*)
526-
527511
(** {1 Module language} *)
528512

529513
(* Type expressions for the module language *)

0 commit comments

Comments
 (0)