diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-05-28 11:04:11 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-05-28 11:04:11 +0000 |
| commit | 2b5ba03cf76dc69896586fdebb17d4e9cc64b5be (patch) | |
| tree | de3b88e992183aa8f9b9dad94882a386b97c1210 /ocamldoc/odoc_comments.ml | |
| parent | 0739ee7671413d687863b728e29d220a6d57db10 (diff) | |
get rid of deprecated operators (&) and (or)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13705 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_comments.ml')
| -rw-r--r-- | ocamldoc/odoc_comments.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ocamldoc/odoc_comments.ml b/ocamldoc/odoc_comments.ml index 161561a6f..ce96f2ad9 100644 --- a/ocamldoc/odoc_comments.ml +++ b/ocamldoc/odoc_comments.ml @@ -180,7 +180,7 @@ module Info_retriever = | (len, Some d) -> (* we check if the comment we got was really attached to the constructor, i.e. that there was no blank line or any special comment "(**" before *) - if (not strict) or (nothing_before_simple_comment s) then + if (not strict) || (nothing_before_simple_comment s) then (* ok, we attach the comment to the constructor *) (len, Some d) else @@ -260,7 +260,7 @@ module Info_retriever = (* if the special comment is the stop comment (**/**), then we must not associate it. *) let pos = Str.search_forward (Str.regexp_string "(**") s 0 in - if blank_line (String.sub s 0 pos) or + if blank_line (String.sub s 0 pos) || d.Odoc_types.i_desc = Some [Odoc_types.Raw "/*"] then (0, None) @@ -293,7 +293,7 @@ module Info_retriever = | h :: q -> if (blank_line_outside_simple file (String.sub s len ((String.length s) - len)) ) - or h.Odoc_types.i_desc = Some [Odoc_types.Raw "/*"] + || h.Odoc_types.i_desc = Some [Odoc_types.Raw "/*"] then (None, special_coms) else |