Revert "Adding datatype and constructor to lang model"

This reverts commit 5826eb1.

Author: panglesd

src/document/url.ml

@@ -33,8 +33,6 @@ let render_path : Odoc_model.Paths.Path.t -> string =
     | `CanonicalModuleType (p, _) -> render_resolved (p :> t)
     | `CanonicalType (_, `Resolved p) -> render_resolved (p :> t)
     | `CanonicalType (p, _) -> render_resolved (p :> t)
-    | `CanonicalDataType (_, `Resolved p) -> render_resolved (p :> t)
-    | `CanonicalDataType (p, _) -> render_resolved (p :> t)
     | `Apply (rp, p) ->
         render_resolved (rp :> t)
         ^ "("
@@ -44,8 +42,6 @@ let render_path : Odoc_model.Paths.Path.t -> string =
         render_resolved (p :> t) ^ "." ^ ModuleTypeName.to_string s
     | `Type (p, s) -> render_resolved (p :> t) ^ "." ^ TypeName.to_string s
     | `Value (p, s) -> render_resolved (p :> t) ^ "." ^ ValueName.to_string s
-    | `Constructor (p, s) ->
-        render_resolved (p :> t) ^ "." ^ ConstructorName.to_string s
     | `Class (p, s) -> render_resolved (p :> t) ^ "." ^ ClassName.to_string s
     | `ClassType (p, s) ->
         render_resolved (p :> t) ^ "." ^ ClassTypeName.to_string s

src/model/paths.ml

@@ -424,22 +424,6 @@ module Identifier = struct
       let compare = compare
     end
 
-    module DataType = struct
-      type t = Id.path_datatype
-      type t_pv = Id.path_datatype_pv
-      let equal = equal
-      let hash = hash
-      let compare = compare
-    end
-
-    module Constructor = struct
-      type t = Id.path_constructor
-      type t_pv = Id.constructor_pv
-      let equal = equal
-      let hash = hash
-      let compare = compare
-    end
-
     module Value = struct
       type t = Id.path_value
       type t_pv = Id.value_pv
@@ -686,7 +670,6 @@ module Path = struct
       | `Type (p, _) -> inner (p : module_ :> any)
       | `Value (_, t) when Names.ValueName.is_internal t -> true
       | `Value (p, _) -> inner (p : module_ :> any)
-      | `Constructor (p, _) -> inner (p : datatype :> any)
       | `Class (p, _) -> inner (p : module_ :> any)
       | `ClassType (p, _) -> inner (p : module_ :> any)
       | `Alias (dest, `Resolved src) ->
@@ -701,8 +684,6 @@ module Path = struct
       | `CanonicalModuleType (x, _) -> inner (x : module_type :> any)
       | `CanonicalType (_, `Resolved _) -> false
       | `CanonicalType (x, _) -> inner (x : type_ :> any)
-      | `CanonicalDataType (_, `Resolved _) -> false
-      | `CanonicalDataType (x, _) -> inner (x : datatype :> any)
       | `OpaqueModule m -> inner (m :> any)
       | `OpaqueModuleType mt -> inner (mt :> any)
     in
@@ -756,14 +737,6 @@ module Path = struct
       | `Alias (dest, _src) -> parent_module_identifier dest
       | `OpaqueModule m -> parent_module_identifier m
 
-    and parent_datatype_identifier :
-        Paths_types.Resolved_path.datatype -> Identifier.DataType.t = function
-      | `Identifier id ->
-          (id : Identifier.Path.DataType.t :> Identifier.DataType.t)
-      | `CanonicalDataType (_, `Resolved p) -> parent_datatype_identifier p
-      | `CanonicalDataType (p, _) -> parent_datatype_identifier p
-      | `Type (m, n) -> Identifier.Mk.type_ (parent_module_identifier m, n)
-
     module Module = struct
       type t = Paths_types.Resolved_path.module_
 
@@ -779,14 +752,6 @@ module Path = struct
       type t = Paths_types.Resolved_path.type_
     end
 
-    module DataType = struct
-      type t = Paths_types.Resolved_path.datatype
-    end
-
-    module Constructor = struct
-      type t = Paths_types.Resolved_path.constructor
-    end
-
     module Value = struct
       type t = Paths_types.Resolved_path.value
     end
@@ -805,8 +770,6 @@ module Path = struct
       | `Apply (m, _) -> identifier (m :> t)
       | `Type (m, n) -> Identifier.Mk.type_ (parent_module_identifier m, n)
       | `Value (m, n) -> Identifier.Mk.value (parent_module_identifier m, n)
-      | `Constructor (m, n) ->
-          Identifier.Mk.constructor (parent_datatype_identifier m, n)
       | `ModuleType (m, n) ->
           Identifier.Mk.module_type (parent_module_identifier m, n)
       | `Class (m, n) -> Identifier.Mk.class_ (parent_module_identifier m, n)
@@ -826,8 +789,6 @@ module Path = struct
       | `CanonicalModuleType (p, _) -> identifier (p :> t)
       | `CanonicalType (_, `Resolved p) -> identifier (p :> t)
       | `CanonicalType (p, _) -> identifier (p :> t)
-      | `CanonicalDataType (_, `Resolved p) -> identifier (p :> t)
-      | `CanonicalDataType (p, _) -> identifier (p :> t)
       | `OpaqueModule m -> identifier (m :> t)
       | `OpaqueModuleType mt -> identifier (mt :> t)
 
@@ -846,14 +807,6 @@ module Path = struct
     type t = Paths_types.Path.type_
   end
 
-  module DataType = struct
-    type t = Paths_types.Path.datatype
-  end
-
-  module Constructor = struct
-    type t = Paths_types.Path.constructor
-  end
-
   module Value = struct
     type t = Paths_types.Path.value
   end

src/model/paths.mli

@@ -182,12 +182,6 @@ module Identifier : sig
     module Type :
       IdSig with type t = Id.path_type and type t_pv = Id.path_type_pv
 
-    module DataType :
-      IdSig with type t = Id.path_datatype and type t_pv = Id.path_datatype_pv
-
-    module Constructor :
-      IdSig with type t = Id.path_constructor and type t_pv = Id.constructor_pv
-
     module Value : IdSig with type t = Id.path_value and type t_pv = Id.value_pv
 
     module ClassType :
@@ -372,14 +366,6 @@ module rec Path : sig
       (* val identifier : t -> Identifier.Path.Type.t *)
     end
 
-    module DataType : sig
-      type t = Paths_types.Resolved_path.datatype
-    end
-
-    module Constructor : sig
-      type t = Paths_types.Resolved_path.constructor
-    end
-
     module Value : sig
       type t = Paths_types.Resolved_path.value
     end
@@ -413,14 +399,6 @@ module rec Path : sig
     type t = Paths_types.Path.type_
   end
 
-  module DataType : sig
-    type t = Paths_types.Path.datatype
-  end
-
-  module Constructor : sig
-    type t = Paths_types.Path.constructor
-  end
-
   module Value : sig
     type t = Paths_types.Path.value
   end

src/model/paths_types.ml

@@ -259,14 +259,6 @@ module Identifier = struct
   and path_type = path_type_pv id
   (** @canonical Odoc_model.Paths.Identifier.Path.Type.t *)
 
-  type path_datatype_pv = type_pv
-  (** @canonical Odoc_model.Paths.Identifier.Path.DataType.t_pv *)
-
-  and path_datatype = path_datatype_pv id
-  (** @canonical Odoc_model.Paths.Identifier.Path.DataType.t *)
-
-  type path_constructor = constructor
-
   type path_value = value
 
   type path_class_type_pv = [ class_pv | class_type_pv ]
@@ -342,16 +334,6 @@ module rec Path : sig
     | `Dot of module_ * string ]
   (** @canonical Odoc_model.Paths.Path.Type.t *)
 
-  type datatype =
-    [ `Resolved of Resolved_path.datatype
-    | `Identifier of Identifier.path_datatype * bool
-    | `Dot of module_ * string ]
-  (** @canonical Odoc_model.Paths.Path.DataType.t *)
-
-  type constructor =
-    [ `Resolved of Resolved_path.constructor | `Dot of datatype * string ]
-  (** @canonical Odoc_model.Paths.Path.Constructor.t *)
-
   type value =
     [ `Resolved of Resolved_path.value
     | `Identifier of Identifier.path_value * bool
@@ -404,15 +386,6 @@ and Resolved_path : sig
     | `ClassType of module_ * ClassTypeName.t ]
   (** @canonical Odoc_model.Paths.Path.Resolved.Type.t *)
 
-  type datatype =
-    [ `Identifier of Identifier.datatype
-    | `CanonicalDataType of datatype * Path.datatype
-    | `Type of module_ * TypeName.t ]
-  (** @canonical Odoc_model.Paths.Path.Resolved.DataType.t *)
-
-  type constructor = [ `Constructor of datatype * ConstructorName.t ]
-  (** @canonical Odoc_model.Paths.Path.Resolved.Constructor.t *)
-
   type value =
     [ `Identifier of Identifier.path_value | `Value of module_ * ValueName.t ]
   (** @canonical Odoc_model.Paths.Path.Resolved.Value.t *)
@@ -437,9 +410,7 @@ and Resolved_path : sig
     | `SubstT of module_type * module_type
     | `OpaqueModuleType of module_type
     | `CanonicalType of type_ * Path.type_
-    | `CanonicalDataType of datatype * Path.datatype
     | `Type of module_ * TypeName.t
-    | `Constructor of datatype * ConstructorName.t
     | `Class of module_ * ClassName.t
     | `ClassType of module_ * ClassTypeName.t
     | `Class of module_ * ClassName.t

src/model_desc/paths_desc.ml

@@ -262,21 +262,11 @@ module General_paths = struct
             ( "`CanonicalType",
               ((x1 :> rp), (x2 :> p)),
               Pair (resolved_path, path) )
-      | `CanonicalDataType (x1, x2) ->
-          C
-            ( "`CanonicalDataType",
-              ((x1 :> rp), (x2 :> p)),
-              Pair (resolved_path, path) )
       | `OpaqueModuleType x -> C ("`OpaqueModuleType", (x :> rp), resolved_path)
       | `Type (x1, x2) ->
           C ("`Type", ((x1 :> rp), x2), Pair (resolved_path, Names.typename))
       | `Value (x1, x2) ->
           C ("`Value", ((x1 :> rp), x2), Pair (resolved_path, Names.valuename))
-      | `Constructor (x1, x2) ->
-          C
-            ( "`Constructor",
-              ((x1 :> rp), x2),
-              Pair (resolved_path, Names.constructorname) )
       | `Class (x1, x2) ->
           C ("`Class", ((x1 :> rp), x2), Pair (resolved_path, Names.classname))
       | `ClassType (x1, x2) ->

test/xref2/lib/common.cppo.ml

@@ -565,13 +565,11 @@ module LangUtils = struct
             | `ModuleType (p, mt) -> Format.fprintf ppf "%a.%s" resolved_path (cast p) (Odoc_model.Names.ModuleTypeName.to_string mt)
             | `Type (p, t) -> Format.fprintf ppf "%a.%s" resolved_path (cast p) (Odoc_model.Names.TypeName.to_string t)
             | `Value (p, t) -> Format.fprintf ppf "%a.%s" resolved_path (cast p) (Odoc_model.Names.ValueName.to_string t)
-            | `Constructor (p, t) -> Format.fprintf ppf "%a.%s" resolved_path (cast p) (Odoc_model.Names.ConstructorName.to_string t)
             | `OpaqueModule m -> Format.fprintf ppf "opaquemodule(%a)" resolved_path (cast m)
             | `OpaqueModuleType m -> Format.fprintf ppf "opaquemoduletype(%a)" resolved_path (cast m)
             | `SubstT (_, _)
             | `CanonicalModuleType (_, _)
             | `CanonicalType (_, _)
-            | `CanonicalDataType (_, _)
             | `Class (_, _)
             | `ClassType (_, _)
             | `Hidden _