1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018
|
(**************************************************************************)
(* *)
(* OCaml *)
(* *)
(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 2001 Institut National de Recherche en Informatique et *)
(* en Automatique. *)
(* *)
(* All rights reserved. This file is distributed under the terms of *)
(* the GNU Lesser General Public License version 2.1, with the *)
(* special exception on linking described in the file LICENSE. *)
(* *)
(**************************************************************************)
(** Merge of information from [.ml] and [.mli] for a module.*)
open Odoc_types
open Odoc_parameter
open Odoc_value
open Odoc_type
open Odoc_extension
open Odoc_exception
open Odoc_class
open Odoc_module
let merge_before_tags l =
let rec iter acc = function
[] -> List.rev acc
| (v, text) :: q ->
let (l1, l2) = List.partition
(fun (v2,_) -> v = v2) q
in
let acc =
let text =
List.fold_left
(fun acc t -> acc @ [Raw " "] @ t)
text (List.map snd l1)
in
(v, text) :: acc
in
iter acc l2
in
iter [] l
let version_separators = Str.regexp "[\\.\\+]"
let merge_opt cond x y merge = match x, y with
| None, None -> None
| Some _ as x, None | None, (Some _ as x) -> x
| Some x, Some y ->
if cond then
Some (merge x y)
else Some x
let merge_lists cond x y merge = match x, y with
| [], [] -> []
| _ :: _ as x, [] | [], ( _ :: _ as x) -> x
| _ :: _ as x, (_ :: _ as y) ->
if cond then
merge x y
else x
let merge_assoc l1 l2 =
let l_in_m1_and_m2, l_in_m2_only = List.partition
(fun (param2, _) -> List.mem_assoc param2 l1)
l2
in
let rec iter = function
[] -> []
| (param2, desc2) :: q ->
let desc1 = List.assoc param2 l1 in
(param2, desc1 @ (Newline :: desc2)) :: (iter q)
in
let l1_completed = iter l_in_m1_and_m2 in
l1_completed @ l_in_m2_only
(** Merge two Odoctypes.info structures, completing the information of
the first one with the information in the second one.
The merge treatment depends on a given merge_option list.
@return the new info structure.*)
let merge_info merge_options (m1 : info) (m2 : info) =
let new_desc_opt =
let merge d1 d2 = d1 @ (Newline :: d2) in
merge_opt (List.mem Merge_description merge_options) m1.i_desc m2.i_desc merge
in
let new_authors =
merge_lists (List.mem Merge_author merge_options) m1.i_authors m2.i_authors (@)
in
let new_version =
merge_opt (List.mem Merge_version merge_options) m1.i_version m2.i_version
(fun v1 v2 -> v1^" "^v2)
in
let new_sees =
merge_lists (List.mem Merge_see merge_options) m1.i_sees m2.i_sees (@)
in
let new_since =
merge_opt (List.mem Merge_since merge_options) m1.i_since m2.i_since (fun v1 v2 ->
v1^" "^v2
)
in
let new_before =
merge_lists (List.mem Merge_before merge_options) m1.i_before m2.i_before (fun b1 b2 ->
merge_before_tags (b1 @ b2)
)
in
let new_before = List.map (fun (v, t) -> (Str.split version_separators v, v, t)) new_before in
let new_before = List.sort Stdlib.compare new_before in
let new_before = List.map (fun (_, v, t) -> (v, t)) new_before in
let new_dep =
merge_opt (List.mem Merge_deprecated merge_options)
m1.i_deprecated m2.i_deprecated (fun t1 t2 -> t1 @ (Newline :: t2))
in
let new_params =
merge_lists (List.mem Merge_param merge_options) m1.i_params m2.i_params merge_assoc
in
let new_raised_exceptions =
merge_lists (List.mem Merge_raised_exception merge_options)
m1.i_raised_exceptions m2.i_raised_exceptions merge_assoc
in
let new_rv =
merge_opt (List.mem Merge_return_value merge_options)
m1.i_return_value m2.i_return_value (fun t1 t2 -> t1 @ (Newline :: t2))
in
let new_custom = merge_lists (List.mem Merge_custom merge_options)
m1.i_custom m2.i_custom (@)
in
(* When merging comments, alerts should always be added after the merge. When
merging modules, only alerts in the interface are kept. *)
let new_alerts = m1.i_alerts in
{
Odoc_types.i_desc = new_desc_opt ;
Odoc_types.i_authors = new_authors ;
Odoc_types.i_version = new_version ;
Odoc_types.i_sees = new_sees ;
Odoc_types.i_since = new_since ;
Odoc_types.i_before = new_before ;
Odoc_types.i_deprecated = new_dep ;
Odoc_types.i_params = new_params ;
Odoc_types.i_raised_exceptions = new_raised_exceptions ;
Odoc_types.i_return_value = new_rv ;
Odoc_types.i_custom = new_custom ;
Odoc_types.i_alerts = new_alerts ;
}
(** Merge of two optional info structures. *)
let merge_info_opt merge_options mli_opt ml_opt =
match mli_opt, ml_opt with
None, Some i ->
(* Be sure not to take alerts from an impl when an intf is present. *)
Some { i with i_alerts = [] }
| Some i, None -> Some i
| None, None -> None
| Some i1, Some i2 -> Some (merge_info merge_options i1 i2)
(** merge of two t_type, one for a .mli, another for the .ml.
The .mli type is completed with the information in the .ml type. *)
let merge_types merge_options mli ml =
mli.ty_info <- merge_info_opt merge_options mli.ty_info ml.ty_info;
mli.ty_loc <- { mli.ty_loc with loc_impl = ml.ty_loc.loc_impl } ;
mli.ty_code <- (match mli.ty_code with None -> ml.ty_code | _ -> mli.ty_code) ;
match mli.ty_kind, ml.ty_kind with
Type_abstract, _ ->
()
| Type_variant l1, Type_variant l2 ->
let f cons =
try
let cons2 = List.find
(fun c2 -> c2.vc_name = cons.vc_name)
l2
in
let new_desc =
match cons.vc_text, cons2.vc_text with
None, None -> None
| Some d, None
| None, Some d -> Some d
| Some d1, Some d2 ->
if List.mem Merge_description merge_options then
Some (merge_info merge_options d1 d2)
else
Some d1
in
cons.vc_text <- new_desc
with
Not_found ->
if !Odoc_global.inverse_merge_ml_mli then
()
else
raise (Failure (Odoc_messages.different_types mli.ty_name))
in
List.iter f l1
| Type_record l1, Type_record l2 ->
let f record =
try
let record2= List.find
(fun r -> r.rf_name = record.rf_name)
l2
in
let new_desc =
match record.rf_text, record2.rf_text with
None, None -> None
| Some d, None
| None, Some d -> Some d
| Some d1, Some d2 ->
if List.mem Merge_description merge_options then
Some (merge_info merge_options d1 d2)
else
Some d1
in
record.rf_text <- new_desc
with
Not_found ->
if !Odoc_global.inverse_merge_ml_mli then
()
else
raise (Failure (Odoc_messages.different_types mli.ty_name))
in
List.iter f l1
| Type_open, Type_open ->
()
| _ ->
if !Odoc_global.inverse_merge_ml_mli then
()
else
raise (Failure (Odoc_messages.different_types mli.ty_name))
(** merge of two t_type_extension, one for a .mli, another for the .ml.
The .mli type is completed with the information in the .ml type.
Information for the extension constructors is merged separately
by [merge_extension_constructor]. *)
let merge_type_extension merge_options mli ml =
mli.te_info <- merge_info_opt merge_options mli.te_info ml.te_info;
mli.te_loc <- { mli.te_loc with loc_impl = ml.te_loc.loc_impl } ;
mli.te_code <- (match mli.te_code with None -> ml.te_code | _ -> mli.te_code)
(** merge of two t_extension_constructor, one for a .mli, another for the .ml.
The .mli type is completed with the information in the .ml type. *)
let merge_extension_constructor merge_options mli ml =
let new_desc =
match mli.xt_text, ml.xt_text with
None, None -> None
| Some d, None
| None, Some d -> Some d
| Some d1, Some d2 ->
if List.mem Merge_description merge_options then
Some (merge_info merge_options d1 d2)
else
Some d1
in
mli.xt_text <- new_desc
(** Merge of two param_info, one from a .mli, one from a .ml.
The text fields are not handled but will be recreated from the
i_params field of the info structure.
Here, if a parameter in the .mli has no name, we take the one
from the .ml. When two parameters have two different forms,
we take the one from the .mli. *)
let rec merge_param_info pi_mli pi_ml =
match (pi_mli, pi_ml) with
(Simple_name sn_mli, Simple_name sn_ml) ->
if sn_mli.sn_name = "" then
Simple_name { sn_mli with sn_name = sn_ml.sn_name }
else
pi_mli
| (Simple_name _, Tuple _) ->
pi_mli
| (Tuple (_, t_mli), Simple_name sn_ml) ->
(* if we're here, then the tuple in the .mli has no parameter names ;
then we take the name of the parameter of the .ml and the type of the .mli. *)
Simple_name { sn_ml with sn_type = t_mli }
| (Tuple (l_mli, t_mli), Tuple (l_ml, _)) ->
(* if the two tuples have different lengths
(which should not occurs), we return the pi_mli,
without further investigation.*)
if (List.length l_mli) <> (List.length l_ml) then
pi_mli
else
let new_l = List.map2 merge_param_info l_mli l_ml in
Tuple (new_l, t_mli)
(** Merge of the parameters of two functions/methods/classes, one for a .mli, another for a .ml.
The parameters in the .mli are completed by the name in the .ml.*)
let rec merge_parameters param_mli param_ml =
match (param_mli, param_ml) with
([], []) -> []
| (l, []) | ([], l) -> l
| ((pi_mli :: li), (pi_ml :: l)) ->
(merge_param_info pi_mli pi_ml) :: merge_parameters li l
(** Merge of two t_class, one for a .mli, another for the .ml.
The .mli class is completed with the information in the .ml class. *)
let merge_classes merge_options mli ml =
mli.cl_info <- merge_info_opt merge_options mli.cl_info ml.cl_info;
mli.cl_loc <- { mli.cl_loc with loc_impl = ml.cl_loc.loc_impl } ;
mli.cl_parameters <- merge_parameters mli.cl_parameters ml.cl_parameters;
(* we must reassociate comments in @param to the corresponding
parameters because the associated comment of a parameter may have been changed by the merge.*)
Odoc_class.class_update_parameters_text mli;
(* merge values *)
List.iter
(fun a ->
try
let _ = List.find
(fun ele ->
match ele with
Class_attribute a2 ->
if a2.att_value.val_name = a.att_value.val_name then
(
a.att_value.val_info <- merge_info_opt merge_options
a.att_value.val_info a2.att_value.val_info;
a.att_value.val_loc <- { a.att_value.val_loc with loc_impl = a2.att_value.val_loc.loc_impl } ;
if !Odoc_global.keep_code then
a.att_value.val_code <- a2.att_value.val_code;
true
)
else
false
| _ ->
false
)
(* we look for the last attribute with this name defined in the implementation *)
(List.rev (Odoc_class.class_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_class.class_attributes mli);
(* merge methods *)
List.iter
(fun m ->
try
let _ = List.find
(fun ele ->
match ele with
Class_method m2 ->
if m2.met_value.val_name = m.met_value.val_name then
(
m.met_value.val_info <- merge_info_opt
merge_options m.met_value.val_info m2.met_value.val_info;
m.met_value.val_loc <- { m.met_value.val_loc with loc_impl = m2.met_value.val_loc.loc_impl } ;
(* merge the parameter names *)
m.met_value.val_parameters <- (merge_parameters
m.met_value.val_parameters
m2.met_value.val_parameters) ;
(* we must reassociate comments in @param to the corresponding
parameters because the associated comment of a parameter may have been changed by the merge.*)
Odoc_value.update_value_parameters_text m.met_value;
if !Odoc_global.keep_code then
m.met_value.val_code <- m2.met_value.val_code;
true
)
else
false
| _ ->
false
)
(* we look for the last method with this name defined in the implementation *)
(List.rev (Odoc_class.class_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_class.class_methods mli)
(** merge of two t_class_type, one for a .mli, another for the .ml.
The .mli class is completed with the information in the .ml class. *)
let merge_class_types merge_options mli ml =
mli.clt_info <- merge_info_opt merge_options mli.clt_info ml.clt_info;
mli.clt_loc <- { mli.clt_loc with loc_impl = ml.clt_loc.loc_impl } ;
(* merge values *)
List.iter
(fun a ->
try
let _ = List.find
(fun ele ->
match ele with
Class_attribute a2 ->
if a2.att_value.val_name = a.att_value.val_name then
(
a.att_value.val_info <- merge_info_opt merge_options
a.att_value.val_info a2.att_value.val_info;
a.att_value.val_loc <- { a.att_value.val_loc with loc_impl = a2.att_value.val_loc.loc_impl } ;
if !Odoc_global.keep_code then
a.att_value.val_code <- a2.att_value.val_code;
true
)
else
false
| _ ->
false
)
(* we look for the last attribute with this name defined in the implementation *)
(List.rev (Odoc_class.class_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_class.class_type_attributes mli);
(* merge methods *)
List.iter
(fun m ->
try
let _ = List.find
(fun ele ->
match ele with
Class_method m2 ->
if m2.met_value.val_name = m.met_value.val_name then
(
m.met_value.val_info <- merge_info_opt
merge_options m.met_value.val_info m2.met_value.val_info;
m.met_value.val_loc <- { m.met_value.val_loc with loc_impl = m2.met_value.val_loc.loc_impl } ;
m.met_value.val_parameters <- (merge_parameters
m.met_value.val_parameters
m2.met_value.val_parameters) ;
(* we must reassociate comments in @param to the corresponding
parameters because the associated comment of a parameter may have been changed by the merge.*)
Odoc_value.update_value_parameters_text m.met_value;
if !Odoc_global.keep_code then
m.met_value.val_code <- m2.met_value.val_code;
true
)
else
false
| _ ->
false
)
(* we look for the last method with this name defined in the implementation *)
(List.rev (Odoc_class.class_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_class.class_type_methods mli)
(** merge of two t_module_type, one for a .mli, another for the .ml.
The .mli module is completed with the information in the .ml module. *)
let rec merge_module_types merge_options mli ml =
mli.mt_info <- merge_info_opt merge_options mli.mt_info ml.mt_info;
mli.mt_loc <- { mli.mt_loc with loc_impl = ml.mt_loc.loc_impl } ;
(* merge type extensions *)
List.iter
(fun te ->
let rec f exts elems =
match exts, elems with
[], _
| _, [] -> ()
| _, (Element_type_extension te2 :: rest) ->
let merge_ext xt =
try
let xt2 =
List.find (fun xt2 -> xt.xt_name = xt2.xt_name)
te2.te_constructors
in
merge_extension_constructor merge_options xt xt2;
true
with Not_found -> false
in
let merged, unmerged = List.partition merge_ext exts in
if merged <> [] then merge_type_extension merge_options te te2;
f unmerged rest
| _, (_ :: rest) -> f exts rest
in
(* we look for the extensions in reverse order *)
f te.te_constructors (List.rev (Odoc_module.module_type_elements ml))
)
(Odoc_module.module_type_type_extensions mli);
(* merge exceptions *)
List.iter
(fun ex ->
try
let _ = List.find
(fun ele ->
match ele with
Element_exception ex2 ->
if ex2.ex_name = ex.ex_name then
(
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
false
| _ ->
false
)
(* we look for the last exception with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_exceptions mli);
(* merge types *)
List.iter
(fun ty ->
try
let _ = List.find
(fun ele ->
match ele with
Element_type ty2 ->
if ty2.ty_name = ty.ty_name then
(
merge_types merge_options ty ty2;
true
)
else
false
| _ ->
false
)
(* we look for the last type with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_types mli);
(* merge submodules *)
List.iter
(fun m ->
try
let _ = List.find
(fun ele ->
match ele with
Element_module m2 ->
if m2.m_name = m.m_name then
(
ignore (merge_modules merge_options m m2);
(*
m.m_info <- merge_info_opt merge_options m.m_info m2.m_info;
m.m_loc <- { m.m_loc with loc_impl = m2.m_loc.loc_impl } ;
*)
true
)
else
false
| _ ->
false
)
(* we look for the last module with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_modules mli);
(* merge module types *)
List.iter
(fun m ->
try
let _ = List.find
(fun ele ->
match ele with
Element_module_type m2 ->
if m2.mt_name = m.mt_name then
(
merge_module_types merge_options m m2;
true
)
else
false
| _ ->
false
)
(* we look for the last module with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_module_types mli);
(* A VOIR : merge included modules ? *)
(* merge values *)
List.iter
(fun v ->
try
let _ = List.find
(fun ele ->
match ele with
Element_value v2 ->
if v2.val_name = v.val_name then
(
v.val_info <- merge_info_opt merge_options v.val_info v2.val_info ;
v.val_loc <- { v.val_loc with loc_impl = v2.val_loc.loc_impl } ;
(* in the .mli we don't know any parameters so we add the ones in the .ml *)
v.val_parameters <- (merge_parameters
v.val_parameters
v2.val_parameters) ;
(* we must reassociate comments in @param to the corresponding
parameters because the associated comment of a parameter may have been changed by the merge.*)
Odoc_value.update_value_parameters_text v;
if !Odoc_global.keep_code then
v.val_code <- v2.val_code;
true
)
else
false
| _ ->
false
)
(* we look for the last value with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_values mli);
(* merge classes *)
List.iter
(fun c ->
try
let _ = List.find
(fun ele ->
match ele with
Element_class c2 ->
if c2.cl_name = c.cl_name then
(
merge_classes merge_options c c2;
true
)
else
false
| _ ->
false
)
(* we look for the last value with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_classes mli);
(* merge class types *)
List.iter
(fun c ->
try
let _ = List.find
(fun ele ->
match ele with
Element_class_type c2 ->
if c2.clt_name = c.clt_name then
(
merge_class_types merge_options c c2;
true
)
else
false
| _ ->
false
)
(* we look for the last value with this name defined in the implementation *)
(List.rev (Odoc_module.module_type_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_type_class_types mli)
(** merge of two t_module, one for a .mli, another for the .ml.
The .mli module is completed with the information in the .ml module. *)
and merge_modules merge_options mli ml =
mli.m_info <- merge_info_opt merge_options mli.m_info ml.m_info;
mli.m_loc <- { mli.m_loc with loc_impl = ml.m_loc.loc_impl } ;
let rec remove_doubles acc = function
[] -> acc
| h :: q ->
if List.mem h acc then remove_doubles acc q
else remove_doubles (h :: acc) q
in
mli.m_top_deps <- remove_doubles mli.m_top_deps ml.m_top_deps ;
let code =
if !Odoc_global.keep_code then
match mli.m_code, ml.m_code with
Some s, _ -> Some s
| _, Some s -> Some s
| _ -> None
else
None
in
let code_intf =
if !Odoc_global.keep_code then
match mli.m_code_intf, ml.m_code_intf with
Some s, _ -> Some s
| _, Some s -> Some s
| _ -> None
else
None
in
mli.m_code <- code;
mli.m_code_intf <- code_intf;
(* merge type extensions *)
List.iter
(fun te ->
let rec f exts elems =
match exts, elems with
[], _
| _, [] -> ()
| _, (Element_type_extension te2 :: rest) ->
let merge_ext xt =
try
let xt2 =
List.find (fun xt2 -> xt.xt_name = xt2.xt_name)
te2.te_constructors
in
merge_extension_constructor merge_options xt xt2;
true
with Not_found -> false
in
let merged, unmerged = List.partition merge_ext exts in
if merged <> [] then merge_type_extension merge_options te te2;
f unmerged rest
| _, (_ :: rest) -> f exts rest
in
(* we look for the extensions in reverse order *)
f te.te_constructors (List.rev (Odoc_module.module_elements ml))
)
(Odoc_module.module_type_extensions mli);
(* merge exceptions *)
List.iter
(fun ex ->
try
let _ = List.find
(fun ele ->
match ele with
Element_exception ex2 ->
if ex2.ex_name = ex.ex_name then
(
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
false
| _ ->
false
)
(* we look for the last exception with this name defined in the implementation *)
(List.rev (Odoc_module.module_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_exceptions mli);
(* merge types *)
List.iter
(fun ty ->
try
let _ = List.find
(fun ele ->
match ele with
Element_type ty2 ->
if ty2.ty_name = ty.ty_name then
(
merge_types merge_options ty ty2;
true
)
else
false
| _ ->
false
)
(* we look for the last type with this name defined in the implementation *)
(List.rev (Odoc_module.module_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_types mli);
(* merge submodules *)
List.iter
(fun m ->
try
let _ = List.find
(fun ele ->
match ele with
Element_module m2 ->
if m2.m_name = m.m_name then
(
ignore (merge_modules merge_options m m2);
(*
m.m_info <- merge_info_opt merge_options m.m_info m2.m_info;
m.m_loc <- { m.m_loc with loc_impl = m2.m_loc.loc_impl } ;
*)
true
)
else
false
| _ ->
false
)
(* we look for the last module with this name defined in the implementation *)
(List.rev (Odoc_module.module_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_modules mli);
(* merge module types *)
List.iter
(fun m ->
try
let _ = List.find
(fun ele ->
match ele with
Element_module_type m2 ->
if m2.mt_name = m.mt_name then
(
merge_module_types merge_options m m2;
true
)
else
false
| _ ->
false
)
(* we look for the last module with this name defined in the implementation *)
(List.rev (Odoc_module.module_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_module_types mli);
(* A VOIR : merge included modules ? *)
(* merge values *)
List.iter
(fun v ->
try
let _ = List.find
(fun v2 ->
if v2.val_name = v.val_name then
(
v.val_info <- merge_info_opt merge_options v.val_info v2.val_info ;
v.val_loc <- { v.val_loc with loc_impl = v2.val_loc.loc_impl } ;
(* in the .mli we don't know any parameters so we add the ones in the .ml *)
v.val_parameters <- (merge_parameters
v.val_parameters
v2.val_parameters) ;
(* we must reassociate comments in @param to the corresponding
parameters because the associated comment of a parameter may have been changed by the merge.*)
Odoc_value.update_value_parameters_text v;
if !Odoc_global.keep_code then
v.val_code <- v2.val_code;
true
)
else
false
)
(* we look for the last value with this name defined in the implementation *)
(List.rev (Odoc_module.module_values ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_values mli);
(* merge classes *)
List.iter
(fun c ->
try
let _ = List.find
(fun ele ->
match ele with
Element_class c2 ->
if c2.cl_name = c.cl_name then
(
merge_classes merge_options c c2;
true
)
else
false
| _ ->
false
)
(* we look for the last value with this name defined in the implementation *)
(List.rev (Odoc_module.module_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_classes mli);
(* merge class types *)
List.iter
(fun c ->
try
let _ = List.find
(fun ele ->
match ele with
Element_class_type c2 ->
if c2.clt_name = c.clt_name then
(
merge_class_types merge_options c c2;
true
)
else
false
| _ ->
false
)
(* we look for the last value with this name defined in the implementation *)
(List.rev (Odoc_module.module_elements ml))
in
()
with
Not_found ->
()
)
(Odoc_module.module_class_types mli);
mli
let merge merge_options modules_list =
let rec iter = function
[] -> []
| m :: q ->
(* look for another module with the same name *)
let (l_same, l_others) = List.partition
(fun m2 -> m.m_name = m2.m_name)
q
in
match l_same with
[] ->
(* no other module to merge with *)
m :: (iter l_others)
| m2 :: [] ->
(
(* we can merge m with m2 if there is an implementation
and an interface.*)
let f b = if !Odoc_global.inverse_merge_ml_mli then not b else b in
match f m.m_is_interface, f m2.m_is_interface with
true, false -> (merge_modules merge_options m m2) :: (iter l_others)
| false, true -> (merge_modules merge_options m2 m) :: (iter l_others)
| false, false ->
if !Odoc_global.inverse_merge_ml_mli then
(* two Module.ts for the .mli ! *)
raise (Failure (Odoc_messages.two_interfaces m.m_name))
else
(* two Module.t for the .ml ! *)
raise (Failure (Odoc_messages.two_implementations m.m_name))
| true, true ->
if !Odoc_global.inverse_merge_ml_mli then
(* two Module.t for the .ml ! *)
raise (Failure (Odoc_messages.two_implementations m.m_name))
else
(* two Module.ts for the .mli ! *)
raise (Failure (Odoc_messages.two_interfaces m.m_name))
)
| _ ->
(* too many Module.t ! *)
raise (Failure (Odoc_messages.too_many_module_objects m.m_name))
in
iter modules_list
|