summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ocamldoc/odoc.ml4
-rw-r--r--ocamldoc/odoc_comments.ml6
-rw-r--r--ocamldoc/odoc_cross.ml8
-rw-r--r--ocamldoc/odoc_dot.ml2
-rw-r--r--ocamldoc/odoc_name.ml8
-rw-r--r--ocamldoc/odoc_text_lexer.mll114
6 files changed, 71 insertions, 71 deletions
diff --git a/ocamldoc/odoc.ml b/ocamldoc/odoc.ml
index 029443aa7..483db75fe 100644
--- a/ocamldoc/odoc.ml
+++ b/ocamldoc/odoc.ml
@@ -29,8 +29,8 @@ let (plugins, paths) =
let rec iter (files, incs) = function
[] | _ :: [] -> (List.rev files, List.rev incs)
| "-g" :: file :: q when
- ((Filename.check_suffix file "cmo") or
- (Filename.check_suffix file "cma") or
+ ((Filename.check_suffix file "cmo") ||
+ (Filename.check_suffix file "cma") ||
(Filename.check_suffix file "cmxs")) ->
iter (file :: files, incs) q
| "-i" :: dir :: q ->
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
diff --git a/ocamldoc/odoc_cross.ml b/ocamldoc/odoc_cross.ml
index 96bc109d7..fcd60dc3b 100644
--- a/ocamldoc/odoc_cross.ml
+++ b/ocamldoc/odoc_cross.ml
@@ -327,7 +327,7 @@ let rec associate_in_module module_list (acc_b_modif, acc_incomplete_top_module_
None -> (acc_b, (Name.head m.m_name) :: acc_inc,
(* we don't want to output warning messages for
"sig ... end" or "struct ... end" modules not found *)
- (if ma.ma_name = Odoc_messages.struct_end or
+ (if ma.ma_name = Odoc_messages.struct_end ||
ma.ma_name = Odoc_messages.sig_end then
acc_names
else
@@ -375,7 +375,7 @@ let rec associate_in_module module_list (acc_b_modif, acc_incomplete_top_module_
None -> (acc_b, (Name.head m.m_name) :: acc_inc,
(* we don't want to output warning messages for
"sig ... end" or "struct ... end" modules not found *)
- (if mta.mta_name = Odoc_messages.struct_end or
+ (if mta.mta_name = Odoc_messages.struct_end ||
mta.mta_name = Odoc_messages.sig_end then
acc_names
else
@@ -417,7 +417,7 @@ and associate_in_module_type module_list (acc_b_modif, acc_incomplete_top_module
None -> (acc_b, (Name.head mt.mt_name) :: acc_inc,
(* we don't want to output warning messages for
"sig ... end" or "struct ... end" modules not found *)
- (if mta.mta_name = Odoc_messages.struct_end or
+ (if mta.mta_name = Odoc_messages.struct_end ||
mta.mta_name = Odoc_messages.sig_end then
acc_names
else
@@ -453,7 +453,7 @@ and associate_in_module_element module_list m_name (acc_b_modif, acc_incomplete_
None -> (acc_b_modif, (Name.head m_name) :: acc_incomplete_top_module_names,
(* we don't want to output warning messages for
"sig ... end" or "struct ... end" modules not found *)
- (if im.im_name = Odoc_messages.struct_end or
+ (if im.im_name = Odoc_messages.struct_end ||
im.im_name = Odoc_messages.sig_end then
acc_names_not_found
else
diff --git a/ocamldoc/odoc_dot.ml b/ocamldoc/odoc_dot.ml
index fc5af0475..60d6cd7e9 100644
--- a/ocamldoc/odoc_dot.ml
+++ b/ocamldoc/odoc_dot.ml
@@ -83,7 +83,7 @@ class dot =
method generate_for_module fmt m =
let l = List.filter
(fun n ->
- !dot_include_all or
+ !dot_include_all ||
(List.exists (fun m -> m.Module.m_name = n) modules))
m.Module.m_top_deps
in
diff --git a/ocamldoc/odoc_name.ml b/ocamldoc/odoc_name.ml
index 41c91dc10..bdb1f58c4 100644
--- a/ocamldoc/odoc_name.ml
+++ b/ocamldoc/odoc_name.ml
@@ -150,10 +150,10 @@ let depth name =
_ -> 1
let prefix n1 n2 =
- (n1 <> n2) &
+ (n1 <> n2) &&
(try
let len1 = String.length n1 in
- ((String.sub n2 0 len1) = n1) &
+ ((String.sub n2 0 len1) = n1) &&
(n2.[len1] = '.')
with _ -> false)
@@ -161,10 +161,10 @@ let rec get_relative_raw n1 n2 =
let (f1,s1) = head_and_tail n1 in
let (f2,s2) = head_and_tail n2 in
if f1 = f2 then
- if f2 = s2 or s2 = "" then
+ if f2 = s2 || s2 = "" then
s2
else
- if f1 = s1 or s1 = "" then
+ if f1 = s1 || s1 = "" then
s2
else
get_relative_raw s1 s2
diff --git a/ocamldoc/odoc_text_lexer.mll b/ocamldoc/odoc_text_lexer.mll
index b253ee57e..aaaff1057 100644
--- a/ocamldoc/odoc_text_lexer.mll
+++ b/ocamldoc/odoc_text_lexer.mll
@@ -186,7 +186,7 @@ rule main = parse
{
print_DEBUG "end";
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
+ if !verb_mode || !target_mode || !code_pre_mode ||
(!open_brackets >= 1) then
Char (Lexing.lexeme lexbuf)
else
@@ -200,8 +200,8 @@ rule main = parse
{
print_DEBUG "begin_title";
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
let s = Lexing.lexeme lexbuf in
@@ -229,8 +229,8 @@ rule main = parse
| begin_bold
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
BOLD
@@ -238,8 +238,8 @@ rule main = parse
| begin_italic
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
ITALIC
@@ -247,8 +247,8 @@ rule main = parse
| begin_link
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
LINK
@@ -256,8 +256,8 @@ rule main = parse
| begin_emp
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
EMP
@@ -265,8 +265,8 @@ rule main = parse
| begin_superscript
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
SUPERSCRIPT
@@ -274,8 +274,8 @@ rule main = parse
| begin_subscript
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
SUBSCRIPT
@@ -283,8 +283,8 @@ rule main = parse
| begin_center
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
CENTER
@@ -292,8 +292,8 @@ rule main = parse
| begin_left
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
LEFT
@@ -301,8 +301,8 @@ rule main = parse
| begin_right
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode
- or (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode
+ || (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
RIGHT
@@ -311,8 +311,8 @@ rule main = parse
{
print_DEBUG "LIST";
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
LIST
@@ -320,8 +320,8 @@ rule main = parse
| begin_enum
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
ENUM
@@ -330,8 +330,8 @@ rule main = parse
{
print_DEBUG "ITEM";
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
ITEM
@@ -339,8 +339,8 @@ rule main = parse
| begin_target
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
(
@@ -357,8 +357,8 @@ rule main = parse
| begin_latex
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
(
@@ -369,7 +369,7 @@ rule main = parse
| end_target
{
incr_cpts lexbuf ;
- if !verb_mode or (!open_brackets >= 1) or !code_pre_mode or
+ if !verb_mode || (!open_brackets >= 1) || !code_pre_mode ||
!ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
@@ -387,7 +387,7 @@ rule main = parse
| begin_code
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
if !open_brackets <= 0 then
@@ -404,7 +404,7 @@ rule main = parse
| end_code
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
if !open_brackets > 1 then
@@ -428,7 +428,7 @@ rule main = parse
| begin_code_pre
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
(
@@ -439,7 +439,7 @@ rule main = parse
| end_code_pre
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !ele_ref_mode then
+ if !verb_mode || !target_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
if !open_brackets >= 1 then
@@ -480,7 +480,7 @@ rule main = parse
| begin_ele_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -498,7 +498,7 @@ rule main = parse
| begin_val_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -515,7 +515,7 @@ rule main = parse
| begin_typ_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -532,7 +532,7 @@ rule main = parse
| begin_exc_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -549,7 +549,7 @@ rule main = parse
| begin_mod_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -566,7 +566,7 @@ rule main = parse
| begin_modt_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -583,7 +583,7 @@ rule main = parse
| begin_cla_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -600,7 +600,7 @@ rule main = parse
| begin_clt_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -617,7 +617,7 @@ rule main = parse
| begin_att_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -634,7 +634,7 @@ rule main = parse
| begin_met_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -651,7 +651,7 @@ rule main = parse
| begin_sec_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -667,7 +667,7 @@ rule main = parse
| begin_recf_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -683,7 +683,7 @@ rule main = parse
| begin_const_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -699,7 +699,7 @@ rule main = parse
| begin_mod_list_ref
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -716,7 +716,7 @@ rule main = parse
| index_list
{
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or !open_brackets >= 1 then
+ if !verb_mode || !target_mode || !code_pre_mode || !open_brackets >= 1 then
Char (Lexing.lexeme lexbuf)
else
if not !ele_ref_mode then
@@ -728,7 +728,7 @@ rule main = parse
| begin_verb
{
incr_cpts lexbuf ;
- if !target_mode or (!open_brackets >= 1) or !code_pre_mode or !ele_ref_mode then
+ if !target_mode || (!open_brackets >= 1) || !code_pre_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
(
@@ -739,7 +739,7 @@ rule main = parse
| end_verb
{
incr_cpts lexbuf ;
- if !target_mode or (!open_brackets >= 1) or !code_pre_mode or !ele_ref_mode then
+ if !target_mode || (!open_brackets >= 1) || !code_pre_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
(
@@ -797,7 +797,7 @@ rule main = parse
END_SHORTCUT_LIST
)
else
- if !target_mode or (!open_brackets >= 1) or !code_pre_mode or !ele_ref_mode or !verb_mode then
+ if !target_mode || (!open_brackets >= 1) || !code_pre_mode || !ele_ref_mode || !verb_mode then
Char (Lexing.lexeme lexbuf)
else
BLANK_LINE
@@ -809,8 +809,8 @@ rule main = parse
{
print_DEBUG "begin_custom";
incr_cpts lexbuf ;
- if !verb_mode or !target_mode or !code_pre_mode or
- (!open_brackets >= 1) or !ele_ref_mode then
+ if !verb_mode || !target_mode || !code_pre_mode ||
+ (!open_brackets >= 1) || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
let s = Lexing.lexeme lexbuf in
@@ -823,7 +823,7 @@ rule main = parse
| "{"
{
incr_cpts lexbuf ;
- if !target_mode or (!open_brackets >= 1) or !code_pre_mode or !ele_ref_mode then
+ if !target_mode || (!open_brackets >= 1) || !code_pre_mode || !ele_ref_mode then
Char (Lexing.lexeme lexbuf)
else
LBRACE
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-26 00:08:35 +0000