summaryrefslogtreecommitdiffstats
path: root/ocamldoc/odoc_merge.ml
diff options
context:
space:
mode:
authorMaxence Guesdon <maxence.guesdon@inria.fr>2003-07-04 11:39:50 +0000
committerMaxence Guesdon <maxence.guesdon@inria.fr>2003-07-04 11:39:50 +0000
commit62e030d764506fc1c76d0e459f2e86f6eb7ef139 (patch)
treef4211cc3e3de6d635fb5462fe5433ce658a210b8 /ocamldoc/odoc_merge.ml
parente64970f29dbbce99f28e1d29028854b95ee69f53 (diff)
added field ex_code to exceptions
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5657 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_merge.ml')
-rw-r--r--ocamldoc/odoc_merge.ml2
1 files changed, 2 insertions, 0 deletions
diff --git a/ocamldoc/odoc_merge.ml b/ocamldoc/odoc_merge.ml
index bd30da274..a04e4ba8b 100644
--- a/ocamldoc/odoc_merge.ml
+++ b/ocamldoc/odoc_merge.ml
@@ -474,6 +474,7 @@ let rec merge_module_types merge_options mli ml =
(
ex.ex_info <- merge_info_opt merge_options ex.ex_info ex2.ex_info;
ex.ex_loc <- { ex.ex_loc with loc_impl = ex2.ex_loc.loc_impl } ;
+ ex.ex_code <- (match ex.ex_code with None -> ex2.ex_code | _ -> ex.ex_code) ;
true
)
else
@@ -694,6 +695,7 @@ and merge_modules merge_options mli ml =
(
ex.ex_info <- merge_info_opt merge_options ex.ex_info ex2.ex_info;
ex.ex_loc <- { ex.ex_loc with loc_impl = ex.ex_loc.loc_impl } ;
+ ex.ex_code <- (match ex.ex_code with None -> ex2.ex_code | _ -> ex.ex_code) ;
true
)
else