Skip to content

Commit 711193f

Browse files
jonludlamjonludlam
committed
Remove ClassName and ClassTypeName
They are replaced by TypeName as they are little risk of mixing them.
1 parent 8973686 commit 711193f

25 files changed

+165
-180
lines changed

‎src/document/comment.ml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ module Reference = struct
5050
| `Exception (r, s) ->
5151
render_resolved (r :> t) ^ "." ^ ExceptionName.to_string s
5252
| `Value (r, s) -> render_resolved (r :> t) ^ "." ^ ValueName.to_string s
53-
| `Class (r, s) -> render_resolved (r :> t) ^ "." ^ ClassName.to_string s
54-
| `ClassType (r, s) ->
55-
render_resolved (r :> t) ^ "." ^ ClassTypeName.to_string s
53+
| `Class (r, s) -> render_resolved (r :> t) ^ "." ^ TypeName.to_string s
54+
| `ClassType (r, s) -> render_resolved (r :> t) ^ "." ^ TypeName.to_string s
5655
| `Method (r, s) ->
5756
(* CR trefis: do we really want to print anything more than [s] here? *)
5857
render_resolved (r :> t) ^ "." ^ MethodName.to_string s
@@ -94,9 +93,9 @@ module Reference = struct
9493
| `Exception (p, f) ->
9594
render_unresolved (p :> t) ^ "." ^ ExceptionName.to_string f
9695
| `Value (p, f) -> render_unresolved (p :> t) ^ "." ^ ValueName.to_string f
97-
| `Class (p, f) -> render_unresolved (p :> t) ^ "." ^ ClassName.to_string f
96+
| `Class (p, f) -> render_unresolved (p :> t) ^ "." ^ TypeName.to_string f
9897
| `ClassType (p, f) ->
99-
render_unresolved (p :> t) ^ "." ^ ClassTypeName.to_string f
98+
render_unresolved (p :> t) ^ "." ^ TypeName.to_string f
10099
| `Method (p, f) ->
101100
render_unresolved (p :> t) ^ "." ^ MethodName.to_string f
102101
| `InstanceVariable (p, f) ->

‎src/document/generator.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ module Make (Syntax : SYNTAX) = struct
162162
| `Module (`Root _, s) -> ModuleName.to_string s
163163
| `Module_type (`Root _, s) -> ModuleTypeName.to_string s
164164
| `Type (`Root _, s) -> TypeName.to_string s
165-
| `Class (`Root _, s) -> ClassName.to_string s
166-
| `ClassType (`Root _, s) -> ClassTypeName.to_string s
165+
| `Class (`Root _, s) -> TypeName.to_string s
166+
| `ClassType (`Root _, s) -> TypeName.to_string s
167167
| `Module (rr, s) ->
168168
dot (render_resolved_fragment (rr :> t)) (ModuleName.to_string s)
169169
| `Module_type (rr, s) ->
@@ -173,9 +173,9 @@ module Make (Syntax : SYNTAX) = struct
173173
| `Type (rr, s) ->
174174
dot (render_resolved_fragment (rr :> t)) (TypeName.to_string s)
175175
| `Class (rr, s) ->
176-
dot (render_resolved_fragment (rr :> t)) (ClassName.to_string s)
176+
dot (render_resolved_fragment (rr :> t)) (TypeName.to_string s)
177177
| `ClassType (rr, s) ->
178-
dot (render_resolved_fragment (rr :> t)) (ClassTypeName.to_string s)
178+
dot (render_resolved_fragment (rr :> t)) (TypeName.to_string s)
179179
| `OpaqueModule r -> render_resolved_fragment (r :> t)
180180

181181
let resolved_fragment_to_ir : Fragment.Resolved.leaf -> text =

‎src/document/url.ml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ let render_path : Odoc_model.Paths.Path.t -> string =
4545
render_resolved (p :> t) ^ "." ^ ModuleTypeName.to_string s
4646
| `Type (p, s) -> render_resolved (p :> t) ^ "." ^ TypeName.to_string s
4747
| `Value (p, s) -> render_resolved (p :> t) ^ "." ^ ValueName.to_string s
48-
| `Class (p, s) -> render_resolved (p :> t) ^ "." ^ ClassName.to_string s
49-
| `ClassType (p, s) ->
50-
render_resolved (p :> t) ^ "." ^ ClassTypeName.to_string s
48+
| `Class (p, s) -> render_resolved (p :> t) ^ "." ^ TypeName.to_string s
49+
| `ClassType (p, s) -> render_resolved (p :> t) ^ "." ^ TypeName.to_string s
5150
and render_path : Odoc_model.Paths.Path.t -> string =
5251
fun x ->
5352
match x with
@@ -172,12 +171,12 @@ module Path = struct
172171
| { iv = `Class (parent, name); _ } ->
173172
let parent = from_identifier (parent :> any) in
174173
let kind = `Class in
175-
let name = ClassName.to_string name in
174+
let name = TypeName.to_string name in
176175
mk ~parent kind name
177176
| { iv = `ClassType (parent, name); _ } ->
178177
let parent = from_identifier (parent :> any) in
179178
let kind = `ClassType in
180-
let name = ClassTypeName.to_string name in
179+
let name = TypeName.to_string name in
181180
mk ~parent kind name
182181
| { iv = `Result p; _ } -> from_identifier (p :> any)
183182
| { iv = `SourceDir (parent, name); _ } ->

‎src/loader/ident_env.cppo.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,8 @@ let add_items : Id.Signature.t -> item list -> t -> t = fun parent items env ->
522522
in
523523
let identifier, shadowed =
524524
if is_shadowed
525-
then Mk.class_(parent, ClassName.shadowed_of_string name), class_types @ env.shadowed
526-
else Mk.class_(parent, (if is_hidden_item then ClassName.hidden_of_string else ClassName.make_std) name), env.shadowed
525+
then Mk.class_(parent, TypeName.shadowed_of_string name), class_types @ env.shadowed
526+
else Mk.class_(parent, (if is_hidden_item then TypeName.hidden_of_string else TypeName.make_std) name), env.shadowed
527527
in
528528

529529
let classes =
@@ -543,8 +543,8 @@ let add_items : Id.Signature.t -> item list -> t -> t = fun parent items env ->
543543
in
544544
let identifier, shadowed =
545545
if is_shadowed
546-
then Mk.class_type(parent, ClassTypeName.shadowed_of_string name), class_types @ env.shadowed
547-
else Mk.class_type(parent, (if is_hidden_item then ClassTypeName.hidden_of_string else ClassTypeName.make_std) name), env.shadowed
546+
then Mk.class_type(parent, TypeName.shadowed_of_string name), class_types @ env.shadowed
547+
else Mk.class_type(parent, (if is_hidden_item then TypeName.hidden_of_string else TypeName.make_std) name), env.shadowed
548548
in
549549
let class_types =
550550
List.fold_right (fun id class_types -> Ident.add id identifier class_types)

‎src/loader/implementation.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,14 @@ let anchor_of_identifier id =
220220
let anchor = anchor `Exception (ExceptionName.to_string name) in
221221
continue anchor parent
222222
| `Class (parent, name) ->
223-
let anchor = anchor `Class (ClassName.to_string name) in
223+
let anchor = anchor `Class (TypeName.to_string name) in
224224
continue anchor parent
225225
| `Page _ -> assert false
226226
| `LeafPage _ -> assert false
227227
| `CoreType _ -> assert false
228228
| `SourceLocation _ -> assert false
229229
| `ClassType (parent, name) ->
230-
let anchor = anchor `ClassType (ClassTypeName.to_string name) in
230+
let anchor = anchor `ClassType (TypeName.to_string name) in
231231
continue anchor parent
232232
| `SourcePage _ -> assert false
233233
| `Value (parent, name) ->

‎src/model/lang.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ and Include : sig
179179
s_module_types : (string * Names.ModuleTypeName.t) list;
180180
s_values : (string * Names.ValueName.t) list;
181181
s_types : (string * Names.TypeName.t) list;
182-
s_classes : (string * Names.ClassName.t) list;
183-
s_class_types : (string * Names.ClassTypeName.t) list;
182+
s_classes : (string * Names.TypeName.t) list;
183+
s_class_types : (string * Names.TypeName.t) list;
184184
}
185185

186186
type expansion = { shadowed : shadowed; content : Signature.t }

‎src/model/names.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ module FieldName = SimpleName
153153
module ExtensionName = SimpleName
154154
module ExceptionName = SimpleName
155155
module ValueName = Name
156-
module ClassName = Name
157-
module ClassTypeName = Name
158156
module MethodName = SimpleName
159157
module InstanceVariableName = SimpleName
160158
module LabelName = SimpleName

‎src/model/names.mli

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ module ExceptionName : SimpleName
8989

9090
module ValueName : Name
9191

92-
module ClassName : Name
93-
94-
module ClassTypeName : Name
95-
9692
module MethodName : SimpleName
9793

9894
module InstanceVariableName : SimpleName

‎src/model/paths.ml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ module Identifier = struct
4747
| `Exception (_, name) -> ExceptionName.to_string name
4848
| `CoreException name -> ExceptionName.to_string name
4949
| `Value (_, name) -> ValueName.to_string name
50-
| `Class (_, name) -> ClassName.to_string name
51-
| `ClassType (_, name) -> ClassTypeName.to_string name
50+
| `Class (_, name) -> TypeName.to_string name
51+
| `ClassType (_, name) -> TypeName.to_string name
5252
| `Method (_, name) -> MethodName.to_string name
5353
| `InstanceVariable (_, name) -> InstanceVariableName.to_string name
5454
| `Label (_, name) -> LabelName.to_string name
@@ -82,8 +82,8 @@ module Identifier = struct
8282
| `Exception (parent, _) -> is_hidden (parent :> t)
8383
| `CoreException _ -> false
8484
| `Value (_, name) -> ValueName.is_hidden name
85-
| `Class (_, name) -> ClassName.is_hidden name
86-
| `ClassType (_, name) -> ClassTypeName.is_hidden name
85+
| `Class (_, name) -> TypeName.is_hidden name
86+
| `ClassType (_, name) -> TypeName.is_hidden name
8787
| `Method (parent, _) -> is_hidden (parent :> t)
8888
| `InstanceVariable (parent, _) -> is_hidden (parent :> t)
8989
| `Label (parent, _) -> is_hidden (parent :> t)
@@ -127,9 +127,9 @@ module Identifier = struct
127127
| `Value (parent, name) ->
128128
ValueName.to_string name :: full_name_aux (parent :> t)
129129
| `Class (parent, name) ->
130-
ClassName.to_string name :: full_name_aux (parent :> t)
130+
TypeName.to_string name :: full_name_aux (parent :> t)
131131
| `ClassType (parent, name) ->
132-
ClassTypeName.to_string name :: full_name_aux (parent :> t)
132+
TypeName.to_string name :: full_name_aux (parent :> t)
133133
| `Method (parent, name) ->
134134
MethodName.to_string name :: full_name_aux (parent :> t)
135135
| `InstanceVariable (parent, name) ->
@@ -553,14 +553,13 @@ module Identifier = struct
553553
mk_parent ModuleTypeName.to_string "mt" (fun (p, n) -> `ModuleType (p, n))
554554

555555
let class_ :
556-
Signature.t * ClassName.t -> [> `Class of Signature.t * ClassName.t ] id
557-
=
558-
mk_parent ClassName.to_string "c" (fun (p, n) -> `Class (p, n))
556+
Signature.t * TypeName.t -> [> `Class of Signature.t * TypeName.t ] id =
557+
mk_parent TypeName.to_string "c" (fun (p, n) -> `Class (p, n))
559558

560559
let class_type :
561-
Signature.t * ClassTypeName.t ->
562-
[> `ClassType of Signature.t * ClassTypeName.t ] id =
563-
mk_parent ClassTypeName.to_string "ct" (fun (p, n) -> `ClassType (p, n))
560+
Signature.t * TypeName.t ->
561+
[> `ClassType of Signature.t * TypeName.t ] id =
562+
mk_parent TypeName.to_string "ct" (fun (p, n) -> `ClassType (p, n))
564563

565564
let type_ :
566565
Signature.t * TypeName.t -> [> `Type of Signature.t * TypeName.t ] id =

‎src/model/paths.mli

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,10 @@ module Identifier : sig
276276
[> `ModuleType of Signature.t * ModuleTypeName.t ] id
277277

278278
val class_ :
279-
Signature.t * ClassName.t -> [> `Class of Signature.t * ClassName.t ] id
279+
Signature.t * TypeName.t -> [> `Class of Signature.t * TypeName.t ] id
280280

281281
val class_type :
282-
Signature.t * ClassTypeName.t ->
283-
[> `ClassType of Signature.t * ClassTypeName.t ] id
282+
Signature.t * TypeName.t -> [> `ClassType of Signature.t * TypeName.t ] id
284283

285284
val type_ :
286285
Signature.t * TypeName.t -> [> `Type of Signature.t * TypeName.t ] id

0 commit comments

Comments
 (0)