summaryrefslogtreecommitdiffstats
path: root/ocamldoc/odoc_types.mli
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2012-07-26 19:21:54 +0000
committerDamien Doligez <damien.doligez-inria.fr>2012-07-26 19:21:54 +0000
commit0c3a7de5079529bc99cbc9e68806f1a7021d94ef (patch)
tree3b973b6db6313c9bb2993b77c925c0dc8b457f7a /ocamldoc/odoc_types.mli
parent229044d83a940d855fd9590d9aa76596f8c1a8b9 (diff)
merge changes from 4.00 branching to 4.00.0 (part 1)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_types.mli')
-rw-r--r--ocamldoc/odoc_types.mli6
1 files changed, 4 insertions, 2 deletions
diff --git a/ocamldoc/odoc_types.mli b/ocamldoc/odoc_types.mli
index d4affb503..f6eca5d96 100644
--- a/ocamldoc/odoc_types.mli
+++ b/ocamldoc/odoc_types.mli
@@ -25,6 +25,8 @@ type ref_kind =
| RK_attribute
| RK_method
| RK_section of text
+ | RK_recfield
+ | RK_const
and text_element =
| Raw of string (** Raw text. *)
@@ -94,8 +96,8 @@ val dummy_info : info
(** Location of elements in implementation and interface files. *)
type location = {
- loc_impl : (string * int) option ; (** implementation file name and position *)
- loc_inter : (string * int) option ; (** interface file name and position *)
+ loc_impl : Location.t option ; (** implementation location *)
+ loc_inter : Location.t option ; (** interface location *)
}
(** A dummy location. *)