diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2012-07-26 19:21:54 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2012-07-26 19:21:54 +0000 |
| commit | 0c3a7de5079529bc99cbc9e68806f1a7021d94ef (patch) | |
| tree | 3b973b6db6313c9bb2993b77c925c0dc8b457f7a /ocamldoc/odoc_info.ml | |
| parent | 229044d83a940d855fd9590d9aa76596f8c1a8b9 (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_info.ml')
| -rw-r--r-- | ocamldoc/odoc_info.ml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ocamldoc/odoc_info.ml b/ocamldoc/odoc_info.ml index 047fa2b5b..769aade9c 100644 --- a/ocamldoc/odoc_info.ml +++ b/ocamldoc/odoc_info.ml @@ -24,6 +24,8 @@ type ref_kind = Odoc_types.ref_kind = | RK_attribute | RK_method | RK_section of text + | RK_recfield + | RK_const and text_element = Odoc_types.text_element = | Raw of string @@ -81,8 +83,8 @@ type info = Odoc_types.info = { } type location = Odoc_types.location = { - loc_impl : (string * int) option ; - loc_inter : (string * int) option ; + loc_impl : Location.t option ; + loc_inter : Location.t option ; } let dummy_loc = { loc_impl = None ; loc_inter = None } @@ -293,6 +295,8 @@ module Search = | Res_attribute of Value.t_attribute | Res_method of Value.t_method | Res_section of string * text + | Res_recfield of Type.t_type * Type.record_field + | Res_const of Type.t_type * Type.variant_constructor type search_result = result_element list |