summaryrefslogtreecommitdiff
path: root/ocamldoc/odoc_info.ml
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2014-05-04 23:08:45 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2014-05-04 23:08:45 +0000
commitb56dc4b3df8d022b54f40682a9d5d4168c690413 (patch)
treea83e174d531c9865aae84769e7bfbf0c1fa353d4 /ocamldoc/odoc_info.ml
parent0f1bb864df2b92d2ffc87d62a539d6cd2f1ab403 (diff)
downloadocaml-b56dc4b3df8d022b54f40682a9d5d4168c690413.tar.gz
PR#5584: merge open extensible types, extension-patch-4.0.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14737 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_info.ml')
-rw-r--r--ocamldoc/odoc_info.ml8
1 files changed, 8 insertions, 0 deletions
diff --git a/ocamldoc/odoc_info.ml b/ocamldoc/odoc_info.ml
index 4a6c214190..c576e1000b 100644
--- a/ocamldoc/odoc_info.ml
+++ b/ocamldoc/odoc_info.ml
@@ -19,6 +19,7 @@ type ref_kind = Odoc_types.ref_kind =
| RK_class_type
| RK_value
| RK_type
+ | RK_extension
| RK_exception
| RK_attribute
| RK_method
@@ -90,6 +91,7 @@ let dummy_loc = { loc_impl = None ; loc_inter = None }
module Name = Odoc_name
module Parameter = Odoc_parameter
+module Extension = Odoc_extension
module Exception = Odoc_exception
module Type = Odoc_type
module Value = Odoc_value
@@ -128,6 +130,8 @@ let string_of_type_list ?par sep type_list = Odoc_str.string_of_type_list ?par s
let string_of_type_param_list t = Odoc_str.string_of_type_param_list t
+let string_of_type_extension_param_list te = Odoc_str.string_of_type_extension_param_list te
+
let string_of_class_type_param_list l = Odoc_str.string_of_class_type_param_list l
let string_of_module_type = Odoc_print.string_of_module_type
@@ -140,6 +144,8 @@ let string_of_info i = Odoc_misc.string_of_info i
let string_of_type t = Odoc_str.string_of_type t
+let string_of_type_extension te = Odoc_str.string_of_type_extension te
+
let string_of_exception e = Odoc_str.string_of_exception e
let string_of_value v = Odoc_str.string_of_value v
@@ -290,6 +296,7 @@ module Search =
| Res_class_type of Class.t_class_type
| Res_value of Value.t_value
| Res_type of Type.t_type
+ | Res_extension of Extension.t_extension_constructor
| Res_exception of Exception.t_exception
| Res_attribute of Value.t_attribute
| Res_method of Value.t_method
@@ -302,6 +309,7 @@ module Search =
let search_by_name = Odoc_search.Search_by_name.search
let values = Odoc_search.values
+ let extensions = Odoc_search.extensions
let exceptions = Odoc_search.exceptions
let types = Odoc_search.types
let attributes = Odoc_search.attributes