renaming fragment_type_parent to field_parent in resolved ref and id

since they are not used in resolved ref and id of cosntructor: for those, the
parent is a type.

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/loader/cmi.ml

@@ -632,7 +632,7 @@ let read_constructor_declaration env parent cd =
   let doc = Doc_attr.attached_no_tag container cd.cd_attributes in
   let args =
     read_constructor_declaration_arguments env
-      (parent :> Identifier.FragmentTypeParent.t) cd.cd_args
+      (parent :> Identifier.FieldParent.t) cd.cd_args
   in
   let res = opt_map (read_type_expr env) cd.cd_res in
     {id; doc; args; res}
@@ -652,7 +652,7 @@ let read_type_kind env parent =
     | Type_record(lbls, _) ->
         let lbls =
           List.map
-            (read_label_declaration env (parent :> Identifier.FragmentTypeParent.t))
+            (read_label_declaration env (parent :> Identifier.FieldParent.t))
             lbls
         in
           Some (Record lbls)
@@ -745,7 +745,7 @@ let read_extension_constructor env parent id ext =
   let doc = Doc_attr.attached_no_tag container ext.ext_attributes in
   let args =
     read_constructor_declaration_arguments env
-      (parent : Identifier.Signature.t :> Identifier.FragmentTypeParent.t) ext.ext_args
+      (parent : Identifier.Signature.t :> Identifier.FieldParent.t) ext.ext_args
   in
   let res = opt_map (read_type_expr env) ext.ext_ret_type in
   {id; locs; doc; args; res}
@@ -779,7 +779,7 @@ let read_exception env parent id ext =
     mark_exception ext;
     let args =
       read_constructor_declaration_arguments env
-        (parent : Identifier.Signature.t :> Identifier.FragmentTypeParent.t) ext.ext_args
+        (parent : Identifier.Signature.t :> Identifier.FieldParent.t) ext.ext_args
     in
     let res = opt_map (read_type_expr env) ext.ext_ret_type in
     {id; locs; doc; args; res}

src/loader/cmti.ml

@@ -214,7 +214,7 @@ let read_constructor_declaration_arguments env parent label_parent arg =
 let read_constructor_declaration env parent cd =
   let open TypeDecl.Constructor in
   let id = Ident_env.find_constructor_identifier env cd.cd_id in
-  let container = (parent :> Identifier.FragmentTypeParent.t) in
+  let container = (parent :> Identifier.FieldParent.t) in
   let label_container = (container :> Identifier.LabelParent.t) in
   let doc = Doc_attr.attached_no_tag label_container cd.cd_attributes in
   let args =
@@ -231,7 +231,7 @@ let read_type_kind env parent =
         let cstrs = List.map (read_constructor_declaration env parent) cstrs in
           Some (Variant cstrs)
     | Ttype_record lbls ->
-        let parent = (parent :> Identifier.FragmentTypeParent.t) in
+      let parent = (parent :> Identifier.FieldParent.t) in
       let label_parent = (parent :> Identifier.LabelParent.t) in
       let lbls =
         List.map (read_label_declaration env parent label_parent) lbls in
@@ -292,7 +292,7 @@ let read_extension_constructor env parent ext =
   let open Extension.Constructor in
   let id = Env.find_extension_identifier env ext.ext_id in
   let locs = None in
-  let container = (parent : Identifier.Signature.t :> Identifier.FragmentTypeParent.t) in
+  let container = (parent : Identifier.Signature.t :> Identifier.FieldParent.t) in
   let label_container = (container :> Identifier.LabelParent.t) in
   let doc = Doc_attr.attached_no_tag label_container ext.ext_attributes in
   match ext.ext_kind with
@@ -325,7 +325,7 @@ let read_exception env parent (ext : extension_constructor) =
   let open Exception in
   let id = Env.find_exception_identifier env ext.ext_id in
   let locs = None in
-  let container = (parent : Identifier.Signature.t :> Identifier.FragmentTypeParent.t) in
+  let container = (parent : Identifier.Signature.t :> Identifier.FieldParent.t) in
   let label_container = (container :> Identifier.LabelParent.t) in
   let doc = Doc_attr.attached_no_tag label_container ext.ext_attributes in
   match ext.ext_kind with

src/model/paths.ml

@@ -166,7 +166,7 @@ module Identifier = struct
       | { iv = `Method (p, _); _ } | { iv = `InstanceVariable (p, _); _ } ->
           (p : class_signature :> label_parent)
       | { iv = `Constructor (p, _); _ } -> (p : datatype :> label_parent)
-      | { iv = `Field (p, _); _ } -> (p : fragment_type_parent :> label_parent)
+      | { iv = `Field (p, _); _ } -> (p : field_parent :> label_parent)
 
   let label_parent n = label_parent_aux (n :> Id.non_src)
 
@@ -217,9 +217,9 @@ module Identifier = struct
     type t_pv = Id.datatype_pv
   end
 
-  module FragmentTypeParent = struct
-    type t = Paths_types.Identifier.fragment_type_parent
-    type t_pv = Paths_types.Identifier.fragment_type_parent_pv
+  module FieldParent = struct
+    type t = Paths_types.Identifier.field_parent
+    type t_pv = Paths_types.Identifier.field_parent_pv
   end
 
   module LabelParent = struct
@@ -578,8 +578,8 @@ module Identifier = struct
           `Constructor (p, n))
 
     let field :
-        FragmentTypeParent.t * FieldName.t ->
-        [> `Field of FragmentTypeParent.t * FieldName.t ] id =
+        FieldParent.t * FieldName.t ->
+        [> `Field of FieldParent.t * FieldName.t ] id =
       mk_parent FieldName.to_string "fld" (fun (p, n) -> `Field (p, n))
 
     let extension :
@@ -992,14 +992,13 @@ module Reference = struct
       | `ClassType (sg, s) ->
           Identifier.Mk.class_type (parent_signature_identifier sg, s)
 
-    and parent_identifier :
-        fragment_type_parent -> Identifier.FragmentTypeParent.t = function
+    and field_parent_identifier : field_parent -> Identifier.FieldParent.t =
+      function
       | `Identifier id -> id
       | (`Hidden _ | `Alias _ | `AliasModuleType _ | `Module _ | `ModuleType _)
         as sg ->
-          (parent_signature_identifier sg :> Identifier.FragmentTypeParent.t)
-      | `Type _ as t ->
-          (parent_type_identifier t :> Identifier.FragmentTypeParent.t)
+          (parent_signature_identifier sg :> Identifier.FieldParent.t)
+      | `Type _ as t -> (parent_type_identifier t :> Identifier.FieldParent.t)
 
     and label_parent_identifier : label_parent -> Identifier.LabelParent.t =
       function
@@ -1008,14 +1007,14 @@ module Reference = struct
           (parent_class_signature_identifier c :> Identifier.LabelParent.t)
       | ( `Hidden _ | `Alias _ | `AliasModuleType _ | `Module _ | `ModuleType _
         | `Type _ ) as r ->
-          (parent_identifier r :> Identifier.LabelParent.t)
+          (field_parent_identifier r :> Identifier.LabelParent.t)
 
     and identifier : t -> Identifier.t = function
       | `Identifier id -> id
       | ( `Alias _ | `AliasModuleType _ | `Module _ | `Hidden _ | `Type _
         | `Class _ | `ClassType _ | `ModuleType _ ) as r ->
           (label_parent_identifier r :> Identifier.t)
-      | `Field (p, n) -> Identifier.Mk.field (parent_identifier p, n)
+      | `Field (p, n) -> Identifier.Mk.field (field_parent_identifier p, n)
       | `Constructor (s, n) ->
           Identifier.Mk.constructor
             ((parent_type_identifier s :> Identifier.DataType.t), n)
@@ -1045,8 +1044,8 @@ module Reference = struct
       type t = Paths_types.Resolved_reference.datatype
     end
 
-    module FragmentTypeParent = struct
-      type t = Paths_types.Resolved_reference.fragment_type_parent
+    module FieldParent = struct
+      type t = Paths_types.Resolved_reference.field_parent
     end
 
     module LabelParent = struct

src/model/paths.mli

@@ -79,9 +79,9 @@ module Identifier : sig
     type t = Id.datatype
     type t_pv = Id.datatype_pv
   end
-  module FragmentTypeParent : sig
-    type t = Id.fragment_type_parent
-    type t_pv = Id.fragment_type_parent_pv
+  module FieldParent : sig
+    type t = Id.field_parent
+    type t_pv = Id.field_parent_pv
   end
 
   module FunctorResult : sig
@@ -294,8 +294,8 @@ module Identifier : sig
       [> `Constructor of DataType.t * ConstructorName.t ] id
 
     val field :
-      FragmentTypeParent.t * FieldName.t ->
-      [> `Field of FragmentTypeParent.t * FieldName.t ] id
+      FieldParent.t * FieldName.t ->
+      [> `Field of FieldParent.t * FieldName.t ] id
 
     val extension :
       Signature.t * ExtensionName.t ->
@@ -508,8 +508,8 @@ module rec Reference : sig
       type t = Paths_types.Resolved_reference.datatype
     end
 
-    module FragmentTypeParent : sig
-      type t = Paths_types.Resolved_reference.fragment_type_parent
+    module FieldParent : sig
+      type t = Paths_types.Resolved_reference.field_parent
     end
 
     module LabelParent : sig

src/model/paths_types.ml

@@ -81,17 +81,16 @@ module Identifier = struct
   and datatype = datatype_pv id
   (** @canonical Odoc_model.Paths.Identifier.DataType.t *)
 
-  type fragment_type_parent_pv = [ signature_pv | datatype_pv ]
-  (** @canonical Odoc_model.Paths.Identifier.FragmentTypeParent.t_pv *)
+  type field_parent_pv = [ signature_pv | datatype_pv ]
+  (** @canonical Odoc_model.Paths.Identifier.FieldParent.t_pv *)
 
   (* fragment_type_parent in identifiers is for record fields parent. It’s type
      (for usual record fields) or [signature] for fields of inline records of
      extension constructor. *)
-  and fragment_type_parent = fragment_type_parent_pv id
-  (** @canonical Odoc_model.Paths.Identifier.FragmentTypeParent.t *)
+  and field_parent = field_parent_pv id
+  (** @canonical Odoc_model.Paths.Identifier.FieldParent.t *)
 
-  type label_parent_pv =
-    [ fragment_type_parent_pv | page_pv | class_signature_pv ]
+  type label_parent_pv = [ field_parent_pv | page_pv | class_signature_pv ]
   (** @canonical Odoc_model.Paths.Identifier.LabelParent.t_pv *)
 
   and label_parent = label_parent_pv id
@@ -142,7 +141,7 @@ module Identifier = struct
   and constructor = constructor_pv id
   (** @canonical Odoc_model.Paths.Identifier.Constructor.t *)
 
-  type field_pv = [ `Field of fragment_type_parent * FieldName.t ]
+  type field_pv = [ `Field of field_parent * FieldName.t ]
   (** @canonical Odoc_model.Paths.Identifier.Field.t_pv *)
 
   and field = field_pv id
@@ -210,7 +209,7 @@ module Identifier = struct
     [ signature_pv
     | class_signature_pv
     | datatype_pv
-    | fragment_type_parent_pv
+    | field_parent_pv
     | label_parent_pv
     | module_pv
     | functor_parameter_pv
@@ -623,7 +622,7 @@ module rec Reference : sig
 
   (* Parent of fields and constructor. Can be either a type or [signature] *)
   and fragment_type_parent =
-    [ `Resolved of Resolved_reference.fragment_type_parent
+    [ `Resolved of Resolved_reference.field_parent
     | `Root of string * tag_parent
     | `Dot of label_parent * string
     | `Module of signature * ModuleName.t
@@ -811,8 +810,8 @@ and Resolved_reference : sig
   (* fragment_type_parent in resolved references is for record fields parent.
      It’s type (for usual record fields) or [signature] for fields of inline
      records of extension constructor. *)
-  and fragment_type_parent =
-    [ `Identifier of Identifier.fragment_type_parent
+  and field_parent =
+    [ `Identifier of Identifier.field_parent
     | `Alias of Resolved_path.module_ * module_
     | `AliasModuleType of Resolved_path.module_type * module_type
     | `Module of signature * ModuleName.t
@@ -857,7 +856,7 @@ and Resolved_reference : sig
 
   type field =
     [ `Identifier of Identifier.reference_field
-    | `Field of fragment_type_parent * FieldName.t ]
+    | `Field of field_parent * FieldName.t ]
   (** @canonical Odoc_model.Paths.Reference.Resolved.Field.t *)
 
   type extension =
@@ -924,7 +923,7 @@ and Resolved_reference : sig
     | `ModuleType of signature * ModuleTypeName.t
     | `Type of signature * TypeName.t
     | `Constructor of datatype * ConstructorName.t
-    | `Field of fragment_type_parent * FieldName.t
+    | `Field of field_parent * FieldName.t
     | `Extension of signature * ExtensionName.t
     | `ExtensionDecl of signature * ExtensionName.t * ExtensionName.t
     | `Exception of signature * ExceptionName.t

src/xref2/env.ml

@@ -301,7 +301,7 @@ let add_type (identifier : Identifier.Type.t) t env =
     and add_field env (field : TypeDecl.Field.t) =
       let ident =
         Paths.Identifier.Mk.field
-          ( (identifier :> Paths.Identifier.FragmentTypeParent.t),
+          ( (identifier :> Paths.Identifier.FieldParent.t),
             FieldName.make_std field.name )
       in
       add_to_elts Kind_Field ident (`Field (ident, field)) env

src/xref2/ident.ml

@@ -141,7 +141,7 @@ module Of_Identifier = struct
     | `Type (_, n) -> `LType (n, i)
     | `CoreType _n -> failwith "Bad"
 
-  let parent : FragmentTypeParent.t -> parent =
+  let field_parent : FieldParent.t -> parent =
    fun p ->
     match p with
     | { iv = #Signature.t_pv; _ } as s -> (signature s :> parent)
@@ -152,7 +152,7 @@ module Of_Identifier = struct
     match p with
     | { iv = #ClassSignature.t_pv; _ } as s ->
         (class_signature s :> label_parent)
-    | { iv = #FragmentTypeParent.t_pv; _ } as s -> (parent s :> label_parent)
+    | { iv = #FieldParent.t_pv; _ } as s -> (field_parent s :> label_parent)
     | { iv = `Page (_, n); _ } -> `LPage (n, fresh_int ())
     | { iv = `LeafPage (_, n); _ } -> `LLeafPage (n, fresh_int ())
 

src/xref2/lang_of.ml

@@ -712,7 +712,7 @@ and extension_constructor map parent c =
     doc = docs (parent :> Identifier.LabelParent.t) c.doc;
     args =
       type_decl_constructor_argument map
-        (parent :> Identifier.FragmentTypeParent.t)
+        (parent :> Identifier.FieldParent.t)
         c.args;
     res = Opt.map (type_expr map (parent :> Identifier.LabelParent.t)) c.res;
   }
@@ -769,15 +769,11 @@ and mty_substitution map identifier = function
   | TypeEq (frag, eqn) ->
       TypeEq
         ( Path.type_fragment map frag,
-          type_decl_equation map
-            (identifier :> Identifier.FragmentTypeParent.t)
-            eqn )
+          type_decl_equation map (identifier :> Identifier.FieldParent.t) eqn )
   | TypeSubst (frag, eqn) ->
       TypeSubst
         ( Path.type_fragment map frag,
-          type_decl_equation map
-            (identifier :> Identifier.FragmentTypeParent.t)
-            eqn )
+          type_decl_equation map (identifier :> Identifier.FieldParent.t) eqn )
   | ModuleTypeEq (frag, eqn) ->
       ModuleTypeEq
         (Path.module_type_fragment map frag, module_type_expr map identifier eqn)
@@ -894,7 +890,7 @@ and module_type_substitution :
 
 and type_decl_constructor_argument :
     maps ->
-    Paths.Identifier.FragmentTypeParent.t ->
+    Paths.Identifier.FieldParent.t ->
     Component.TypeDecl.Constructor.argument ->
     Odoc_model.Lang.TypeDecl.Constructor.argument =
  fun map parent a ->
@@ -903,13 +899,11 @@ and type_decl_constructor_argument :
       Tuple (List.map (type_expr map (parent :> Identifier.LabelParent.t)) ls)
   | Record fs ->
       Record
-        (List.map
-           (type_decl_field map (parent :> Identifier.FragmentTypeParent.t))
-           fs)
+        (List.map (type_decl_field map (parent :> Identifier.FieldParent.t)) fs)
 
 and type_decl_field :
     maps ->
-    Identifier.FragmentTypeParent.t ->
+    Identifier.FieldParent.t ->
     Component.TypeDecl.Field.t ->
     Odoc_model.Lang.TypeDecl.Field.t =
  fun map parent f ->
@@ -921,7 +915,7 @@ and type_decl_field :
     type_ = type_expr map (parent :> Identifier.LabelParent.t) f.type_;
   }
 
-and type_decl_equation map (parent : Identifier.FragmentTypeParent.t)
+and type_decl_equation map (parent : Identifier.FieldParent.t)
     (eqn : Component.TypeDecl.Equation.t) : Odoc_model.Lang.TypeDecl.Equation.t
     =
   let parent = (parent :> Identifier.LabelParent.t) in
@@ -942,9 +936,7 @@ and type_decl map parent id (t : Component.TypeDecl.t) :
     id = identifier;
     locs = t.locs;
     equation =
-      type_decl_equation map
-        (parent :> Identifier.FragmentTypeParent.t)
-        t.equation;
+      type_decl_equation map (parent :> Identifier.FieldParent.t) t.equation;
     doc = docs (parent :> Identifier.LabelParent.t) t.doc;
     canonical = t.canonical;
     representation =
@@ -960,7 +952,7 @@ and type_decl_representation map id (t : Component.TypeDecl.Representation.t) :
       Record
         (List.map
            (type_decl_field map
-              (id :> Odoc_model.Paths.Identifier.FragmentTypeParent.t))
+              (id :> Odoc_model.Paths.Identifier.FieldParent.t))
            fs)
 
 and type_decl_constructor :
@@ -977,9 +969,7 @@ and type_decl_constructor :
     id = identifier;
     doc = docs parent t.doc;
     args =
-      type_decl_constructor_argument map
-        (id :> Identifier.FragmentTypeParent.t)
-        t.args;
+      type_decl_constructor_argument map (id :> Identifier.FieldParent.t) t.args;
     res = Opt.map (type_expr map parent) t.res;
   }
 
@@ -1072,7 +1062,7 @@ and exception_ map parent id (e : Component.Exception.t) :
     doc = docs (parent :> Identifier.LabelParent.t) e.doc;
     args =
       type_decl_constructor_argument map
-        (parent :> Identifier.FragmentTypeParent.t)
+        (parent :> Identifier.FieldParent.t)
         e.args;
     res = Opt.map (type_expr map (parent :> Identifier.LabelParent.t)) e.res;
   }